From a3f03a40af12a779dfb2a41c5b5acb740bf2430c Mon Sep 17 00:00:00 2001 From: Ian Date: Wed, 23 May 2012 19:23:41 +0200 Subject: [PATCH] forward thinking - added error / success / notice classes and removed their img inline styles to default/admin/style.css --- include/admin/comments.inc.php | 2 +- include/admin/importers/movabletype.inc.php | 4 +-- include/admin/tpl/category.inc.tpl | 20 ++++++------- include/admin/tpl/comments.inc.tpl | 4 +-- include/admin/tpl/configuration.inc.tpl | 8 ++--- include/admin/tpl/entries.inc.tpl | 10 +++---- include/admin/tpl/groups.inc.tpl | 6 ++-- include/admin/tpl/installer.inc.tpl | 12 ++++---- include/admin/tpl/personal.inc.tpl | 8 ++--- include/admin/tpl/plugins.inc.tpl | 14 ++++----- include/admin/tpl/templates.inc.tpl | 14 ++++----- include/admin/tpl/upgrader.inc.tpl | 9 +++--- include/admin/tpl/users.inc.tpl | 30 +++++++++---------- include/functions_config.inc.php | 4 +-- include/functions_entries_admin.inc.php | 2 +- include/functions_images.inc.php | 12 ++++---- .../serendipity_event_karma.php | 2 +- .../serendipity_event_nl2br.php | 6 ++-- .../serendipity_event_spartacus.php | 8 ++--- serendipity_admin.php | 8 ++--- templates/default/admin/entries.tpl | 2 +- templates/default/admin/index.tpl | 2 +- templates/default/admin/style.css | 8 ++++- 23 files changed, 101 insertions(+), 94 deletions(-) diff --git a/include/admin/comments.inc.php b/include/admin/comments.inc.php index 96136b34..02664d1c 100644 --- a/include/admin/comments.inc.php +++ b/include/admin/comments.inc.php @@ -62,7 +62,7 @@ if (isset($serendipity['GET']['adminAction']) && $serendipity['GET']['adminActio if (!empty($comment['comment'])) { if (serendipity_saveComment($serendipity['POST']['entry_id'], $comment, 'NORMAL')) { echo ''; - echo ''; + echo ''; return true; } else { $errormsg .= COMMENT_NOT_ADDED; diff --git a/include/admin/importers/movabletype.inc.php b/include/admin/importers/movabletype.inc.php index 6215de77..4bee5108 100644 --- a/include/admin/importers/movabletype.inc.php +++ b/include/admin/importers/movabletype.inc.php @@ -446,7 +446,7 @@ class Serendipity_Import_MovableType extends Serendipity_Import { unset($entry['s9y_comments']); if ( !is_int($r = serendipity_updertEntry($entry)) ) { - echo '
' . $r . '
'; + echo '
' . $r . '
'; } else { $this->debug('Saved entry ' . $r . ' (' . $entry['title'] . ')'); $entry['id'] = $r; @@ -456,7 +456,7 @@ class Serendipity_Import_MovableType extends Serendipity_Import { $cid = serendipity_db_insert_id('comments', 'id'); serendipity_approveComment($cid, $entry['id'], true); } else { - echo '
' . $rc . '
'; + echo '
' . $rc . '
'; } } // Let the plugins do some additional stuff. Here it's used with diff --git a/include/admin/tpl/category.inc.tpl b/include/admin/tpl/category.inc.tpl index ccc3c916..98f2a5ce 100644 --- a/include/admin/tpl/category.inc.tpl +++ b/include/admin/tpl/category.inc.tpl @@ -1,22 +1,22 @@ {if $post_save} {if $new} -
- +
+ {$CONST.CATEGORY_SAVED}
{/if} {if $edit} {if isset($editPermission) && $editPermission == false} -
- +
+ {$CONST.PERM_DENIED}
{else} {if $subcat} {$subcat} {else} -
- +
+ {$CONST.CATEGORY_SAVED}
{/if} @@ -26,8 +26,8 @@ {if $doDelete} {if $deleteSuccess} -
- +
+ {if $remainingCat} {$CONST.CATEGORY_DELETED_ARTICLES_MOVED|sprintf:$remainingCat:$cid} {else} @@ -35,8 +35,8 @@ {/if}
{else} -
- +
+ {$CONST.INVALID_CATEGORY}
{/if} diff --git a/include/admin/tpl/comments.inc.tpl b/include/admin/tpl/comments.inc.tpl index 21a6f224..954a1c59 100644 --- a/include/admin/tpl/comments.inc.tpl +++ b/include/admin/tpl/comments.inc.tpl @@ -1,5 +1,5 @@ {if !empty($errormsg)} -

{$errormsg}

+

{$errormsg}

{/if} '; } $entrylink = serendipity_archiveURL($res, $entry['title'], 'serendipityHTTPPath', true, array('timestamp' => $entry['timestamp'])); - echo '
' . ENTRY_SAVED . ' (' . VIEW . ')
'; + echo '
' . ENTRY_SAVED . ' (' . VIEW . ')
'; } echo '
'; @@ -1999,7 +1999,7 @@ function serendipity_reportXSRF($type = 0, $reset = true, $use_config = false) { // Set this in your serendipity_config_local.inc.php if you want HTTP Referrer blocking: // $serendipity['referrerXSRF'] = true; - $string = '
' . ERROR_XSRF . '
'; + $string = '
' . ERROR_XSRF . '
'; if ($reset) { // Config key "referrerXSRF" can be set to enable blocking based on HTTP Referrer. Recommended for Paranoia. if (($use_config && isset($serendipity['referrerXSRF']) && $serendipity['referrerXSRF']) || $use_config === false) { diff --git a/include/functions_entries_admin.inc.php b/include/functions_entries_admin.inc.php index a163d50b..2c1faa6a 100644 --- a/include/functions_entries_admin.inc.php +++ b/include/functions_entries_admin.inc.php @@ -187,7 +187,7 @@ function serendipity_printEntryForm($targetURL, $hiddens = array(), $entry = arr /* HTML CODE BELOW IS FOR FALLBACK PORTABILITY ONLY - MODIFY CODE IN TEMPLATE ADMIN/ENTRIES.TPL INSTEAD! */ if (!empty($errMsg)) { ?> -
+
action="" method="post" id="serendipityEntry" style="margin-top: 0px; margin-bottom: 0px; padding-top: 0px; padding-bottom: 0px"> diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php index 5e2a55c5..11d28a6b 100644 --- a/include/functions_images.inc.php +++ b/include/functions_images.inc.php @@ -668,7 +668,7 @@ function serendipity_makeThumbnail($file, $directory = '', $size = false, $thumb } exec($cmd, $output, $result); if ($result != 0) { - echo '
' . sprintf(IMAGICK_EXEC_ERROR, $cmd, $output[0], $result) .'
'; + echo '
' . sprintf(IMAGICK_EXEC_ERROR, $cmd, $output[0], $result) .'
'; $r = false; // return failure } else { touch($outfile); @@ -712,7 +712,7 @@ function serendipity_scaleImg($id, $width, $height) { $cmd = escapeshellcmd($serendipity['convert']) . ' -scale ' . serendipity_escapeshellarg($width . 'x' . $height) . ' ' . serendipity_escapeshellarg($infile) . ' ' . serendipity_escapeshellarg($outfile); exec($cmd, $output, $result); if ( $result != 0 ) { - echo '
' . sprintf(IMAGICK_EXEC_ERROR, $cmd, $output[0], $result) .'
'; + echo '
' . sprintf(IMAGICK_EXEC_ERROR, $cmd, $output[0], $result) .'
'; } unset($output, $result); } @@ -759,7 +759,7 @@ function serendipity_rotateImg($id, $degrees) { $cmd = escapeshellcmd($serendipity['convert']) . ' -rotate ' . serendipity_escapeshellarg($degrees) . ' ' . serendipity_escapeshellarg($infile) . ' ' . serendipity_escapeshellarg($outfile); exec($cmd, $output, $result); if ( $result != 0 ) { - echo '
' . sprintf(IMAGICK_EXEC_ERROR, $cmd, $output[0], $result) .'
'; + echo '
' . sprintf(IMAGICK_EXEC_ERROR, $cmd, $output[0], $result) .'
'; } unset($output, $result); @@ -767,7 +767,7 @@ function serendipity_rotateImg($id, $degrees) { $cmd = escapeshellcmd($serendipity['convert']) . ' -rotate ' . serendipity_escapeshellarg($degrees) . ' ' . serendipity_escapeshellarg($infileThumb) . ' ' . serendipity_escapeshellarg($outfileThumb); exec($cmd, $output, $result); if ( $result != 0 ) { - echo '
'. sprintf(IMAGICK_EXEC_ERROR, $cmd, $output[0], $result) .'
'; + echo '
'. sprintf(IMAGICK_EXEC_ERROR, $cmd, $output[0], $result) .'
'; } unset($output, $result); @@ -827,7 +827,7 @@ function serendipity_generateThumbs() { } echo '
  • ' . $sThumb . ': ' . $returnsize[0] . 'x' . $returnsize[1] . "
    • \n"; if (!file_exists($newThumb)) { - printf('
  • ' . THUMBNAIL_FAILED_COPY . '
    • ' . "\n", $sThumb); + printf('
  • ' . THUMBNAIL_FAILED_COPY . '
    • ' . "\n", $sThumb); } else { $update = true; } @@ -843,7 +843,7 @@ function serendipity_generateThumbs() { printf('
  • ' . THUMBNAIL_USING_OWN . '
    • ' . "\n", $sThumb); $update = true; } else { - printf('
  • ' . THUMBNAIL_FAILED_COPY . '
    • ' . "\n", $sThumb); + printf('
  • ' . THUMBNAIL_FAILED_COPY . '
    • ' . "\n", $sThumb); } } diff --git a/plugins/serendipity_event_karma/serendipity_event_karma.php b/plugins/serendipity_event_karma/serendipity_event_karma.php index 73bbe564..382d17be 100644 --- a/plugins/serendipity_event_karma/serendipity_event_karma.php +++ b/plugins/serendipity_event_karma/serendipity_event_karma.php @@ -1727,7 +1727,7 @@ function invertSelection() { "); } else { print(" -
    No entries to display.
    +
    No entries to display.
    "); } diff --git a/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php b/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php index da433490..a79ba22a 100644 --- a/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php +++ b/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php @@ -63,13 +63,13 @@ class serendipity_event_nl2br extends serendipity_event if ( serendipity_db_bool($this->get_config('isobr')) === true ) { if( serendipity_db_bool($this->get_config('clean_tags')) === true ) { $this->set_config('clean_tags', false); - echo '
    '; + echo '
    '; echo sprintf(PLUGIN_EVENT_NL2BR_CONFIG_ERROR, 'clean_tags', 'ISOBR') . '
    '; return false; } if ( serendipity_db_bool($this->get_config('p_tags')) === true ) { $this->set_config('p_tags', false); - echo '
    '; + echo '
    '; echo sprintf(PLUGIN_EVENT_NL2BR_CONFIG_ERROR, 'p_tags', 'ISOBR') . '
    '; return false; } @@ -77,7 +77,7 @@ class serendipity_event_nl2br extends serendipity_event /* check possible config mismatch setting in combination with P_TAGS */ if ( serendipity_db_bool($this->get_config('p_tags')) === true && serendipity_db_bool($this->get_config('clean_tags')) === true ) { $this->set_config('clean_tags', false); - echo '
    '; + echo '
    '; echo sprintf(PLUGIN_EVENT_NL2BR_CONFIG_ERROR, 'clean_tags', 'P_TAGS') . '
    '; return false; } diff --git a/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php b/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php index 8fe0b719..8ce6aa3d 100644 --- a/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php +++ b/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php @@ -352,16 +352,16 @@ class serendipity_event_spartacus extends serendipity_event function outputMSG($status, $msg) { switch($status) { case 'notice': - echo '
    ' . $msg . '
    ' . "\n"; + echo '
    ' . $msg . '
    ' . "\n"; break; case 'error': - echo '
    ' . $msg . '
    ' . "\n"; + echo '
    ' . $msg . '
    ' . "\n"; break; default: case 'success': - echo '
    ' . $msg . '
    ' . "\n"; + echo '
    ' . $msg . '
    ' . "\n"; break; } } @@ -1089,7 +1089,7 @@ class serendipity_event_spartacus extends serendipity_event case 'backend_pluginlisting_header': if (serendipity_db_bool($this->get_config('enable_plugins'))) { - echo '
    '; + echo '
    '; diff --git a/serendipity_admin.php b/serendipity_admin.php index a52e1c77..6d674042 100644 --- a/serendipity_admin.php +++ b/serendipity_admin.php @@ -237,16 +237,16 @@ if (!$use_installer && $is_logged_in) { echo '
    ' . INTEGRITY . '
    '; $badsums = array(); if (!is_readable(S9Y_INCLUDE_PATH . 'checksums.inc.php')) { - echo '' . CHECKSUMS_NOT_FOUND . ''; + echo '' . CHECKSUMS_NOT_FOUND . ''; break; } $badsums = serendipity_verifyFTPChecksums(); if (count($badsums) == 0) { - echo '' . CHECKSUMS_PASS . ''; + echo '' . CHECKSUMS_PASS . ''; } else { echo '
      '; foreach ($badsums as $rpath => $calcsum) { - echo '
    • ' . sprintf(CHECKSUM_FAILED, $rpath) . '
      • '; + echo '
    • ' . sprintf(CHECKSUM_FAILED, $rpath) . '
      • '; } echo '
    '; } @@ -372,7 +372,7 @@ if ($use_installer) {

    -
    +
    diff --git a/templates/default/admin/entries.tpl b/templates/default/admin/entries.tpl index f34944cd..93c44cb2 100644 --- a/templates/default/admin/entries.tpl +++ b/templates/default/admin/entries.tpl @@ -1,7 +1,7 @@ {*** POSSIBLE ERROR MESSAGES START ***} {if $entry_vars.errMsg} -
    {$entry_vars.errMsg}
    +
    {$entry_vars.errMsg}
    {/if} {*** POSSIBLE ERROR MESSAGES END ***} {*** MAIN ENTRY FORM START ***} diff --git a/templates/default/admin/index.tpl b/templates/default/admin/index.tpl index a2ff82fe..f8321d56 100644 --- a/templates/default/admin/index.tpl +++ b/templates/default/admin/index.tpl @@ -85,7 +85,7 @@ {$admin_vars.out.header}
    {if $admin_vars.post_action != '' AND NOT $admin_vars.is_logged_in} -
    {$CONST.WRONG_USERNAME_OR_PASSWORD}
    +
    {$CONST.WRONG_USERNAME_OR_PASSWORD}
    {/if} diff --git a/templates/default/admin/style.css b/templates/default/admin/style.css index a2da7c9a..caf7c247 100644 --- a/templates/default/admin/style.css +++ b/templates/default/admin/style.css @@ -130,7 +130,13 @@ body { margin: 10px; } - +.img_error { + width: 22px; + height: 22px; + border: 0px; + padding-right: 4px; + vertical-align: middle; +} td, th { font-size: 0.8em;