|
From: Garvin H. <gar...@us...> - 2004-07-19 08:51:37
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20399 Modified Files: NEWS comment.php serendipity_admin_installer.inc.php serendipity_admin_plugins.inc.php serendipity_admin_upgrader.inc.php serendipity_functions.inc.php serendipity_functions_images.inc.php Log Message: Remove nasty hardcoded font colors, which look ugly in darker themes. Index: serendipity_admin_installer.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- serendipity_admin_installer.inc.php 14 Jul 2004 01:39:07 -0000 1.70 +++ serendipity_admin_installer.inc.php 19 Jul 2004 08:50:54 -0000 1.71 @@ -23,7 +23,7 @@ if (is_array($res)) { echo DIAGNOSTIC_ERROR . '<br /><br />'; - echo '<span style="color: #FF0000">- ' . implode('<br />', $res) . '</span><br /><br />'; + echo '<span class="serendipity_msg_important">- ' . implode('<br />', $res) . '</span><br /><br />'; serendipity_printConfigTemplate(serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE), $_POST, false, true, true); die(); } @@ -37,14 +37,14 @@ if ($res !== false) { echo ' ' . DATABASE_DONE . '<br />'; } else { - echo '<span style="color: #FF0000">- ' . DATABASE_ALREADY_INSTALLED . '</span><br />'; + echo '<span class="serendipity_msg_important">- ' . DATABASE_ALREADY_INSTALLED . '</span><br />'; } /* Next are the files, .htaccess */ printf(ATTEMPT_WRITE_FILE, '.htaccess'); $res = serendipity_installFiles(); if (is_array($res)) { - echo '<span style="color: #FF0000">- ' . implode('<br />', $res) . '</span><br /><br />'; + echo '<span class="serendipity_msg_important">- ' . implode('<br />', $res) . '</span><br /><br />'; die(); } else { echo DONE . '<br />'; @@ -86,7 +86,7 @@ $res = serendipity_updateConfiguration(); if (is_array($res)) { echo DIAGNOSTIC_ERROR; - echo '<span style="color: #FF0000">- ' . implode('<br />', $res) . '</span><br /><br />'; + echo '<span class="serendipity_msg_important">- ' . implode('<br />', $res) . '</span><br /><br />'; } else { /* If we have new rewrite rules, then install them */ if (isset($_POST['rewrite']) && $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN && $oldRewrite != $_POST['rewrite']) { @@ -112,7 +112,7 @@ /* Do check for required PHP version */ if (version_compare(PHP_VERSION, VERSION_REQUIRED) == -1) { - echo '<br /><font color="#FF0000">WARNING!<br />You are using PHP version '. PHP_VERSION .'! Serendipity requires version '. VERSION_REQUIRED .'</font>'; + echo '<br /><span class="serendipity_msg_important">WARNING!<br />You are using PHP version ' . PHP_VERSION . '! Serendipity requires version ' . VERSION_REQUIRED . '</span>'; } $from = false; } Index: serendipity_functions_images.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- serendipity_functions_images.inc.php 19 Jul 2004 08:16:26 -0000 1.20 +++ serendipity_functions_images.inc.php 19 Jul 2004 08:50:55 -0000 1.21 @@ -290,7 +290,7 @@ $returnsize = serendipity_makeThumbnail($filename, false, $file['authorid'], '', false); printf(RESIZE_BLAHBLAH, $filename . ': ' . $returnsize[0] . 'x' . $returnsize[1]); if (!file_exists($newThumb)) { - printf('<span style="color: #ff0000">' . THUMBNAIL_FAILED_COPY . '</span><br />', $filename); + printf('<span class="serendipity_msg_important">' . THUMBNAIL_FAILED_COPY . '</span><br />', $filename); } else { $update = true; } @@ -300,7 +300,7 @@ printf(THUMBNAIL_USING_OWN . '<br />', $filename); $update = true; } else { - printf('<span style="color: #ff0000">' . THUMBNAIL_FAILED_COPY . '</span><br />', $filename); + printf('<span class="serendipity_msg_important">' . THUMBNAIL_FAILED_COPY . '</span><br />', $filename); } } Index: serendipity_admin_plugins.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- serendipity_admin_plugins.inc.php 8 Jul 2004 21:17:18 -0000 1.35 +++ serendipity_admin_plugins.inc.php 19 Jul 2004 08:50:54 -0000 1.36 @@ -318,7 +318,7 @@ } $plugin->cleanup(); - $statusMsg = sprintf(SETTINGS_SAVED_AT, strftime('%T')); + $statusMsg = sprintf(SETTINGS_SAVED_AT, strftime('%T')); } ?> <form method="post" name="serendipityPluginConfigure"> @@ -499,7 +499,7 @@ </form> <?php if (isset($_POST['SAVECONF'])) { - echo '<strong><span style="color: green">'. DONE .':</span></strong> '. $statusMsg; + echo '<strong><span class="serendipity_msg_notice">' . DONE . ':</span></strong> '. $statusMsg; } } else { /* show general plugin list */ Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.177 retrieving revision 1.178 diff -u -d -r1.177 -r1.178 --- NEWS 16 Jul 2004 23:06:08 -0000 1.177 +++ NEWS 19 Jul 2004 08:50:54 -0000 1.178 @@ -3,13 +3,16 @@ Version 0.7 () ------------------------------------------------------------------------ + * New CSS classes 'serendipity_msg_notice' and + 'serendipity_msg_important'. (garvinhicking) + * Changed 'View extended entry' to 'Continue reading "[title]"' (tomsommer) - * Make the non-WYSIWYG link-insertion and text-formatters work in + * Make the non-WYSIWYG link-insertion and text-formatters work in the extended entry textarea (tomsommer) - * Allow authors to toggle the extended entry textarea in the entry + * Allow authors to toggle the extended entry textarea in the entry composer when using the non-WYSIWYG editor (tomsommer) * Better handling of unsubscriptions from entries, only show message Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.346 retrieving revision 1.347 diff -u -d -r1.346 -r1.347 --- serendipity_functions.inc.php 18 Jul 2004 19:43:13 -0000 1.346 +++ serendipity_functions.inc.php 19 Jul 2004 08:50:54 -0000 1.347 @@ -82,7 +82,7 @@ <?php if ( isset($serendipity['POST']['action']) && !serendipity_userLoggedIn() ) { ?> - <div class="serendipity_center" style="color: #FF0000; font-weight: bold;"><?php echo WRONG_USERNAME_OR_PASSWORD; ?></div> + <div class="serendipity_center serendipity_msg_important"><?php echo WRONG_USERNAME_OR_PASSWORD; ?></div> <?php } ?> @@ -282,7 +282,7 @@ if ($moderate_comments==true) { ?> <tr> - <td colspan="2"><div style="color: #FF0000; font-size: 8pt"><?php echo COMMENTS_WILL_BE_MODERATED ?></div></td> + <td class="serendipity_commentsValue serendipity_msg_important" colspan="2"><?php echo COMMENTS_WILL_BE_MODERATED ?></td> </tr> <?php } @@ -1275,15 +1275,15 @@ <div class="serendipity_commentsTitle"><?php echo COMMENTS; ?></div> <?php if (defined('DATA_UNSUBSCRIBED')) { - echo '<div class="serendipity_center" style="color: red; font-weight: bold;">'. sprintf(UNSUBSCRIBE_OK, DATA_UNSUBSCRIBED) .'</div><br />'; + echo '<div class="serendipity_center serendipity_msg_notice">'. sprintf(UNSUBSCRIBE_OK, DATA_UNSUBSCRIBED) .'</div><br />'; } if (defined('DATA_COMMENT_DELETED')) { - echo '<div class="serendipity_center" style="color: red; font-weight: bold;">'. sprintf(COMMENT_DELETED, DATA_COMMENT_DELETED) .'</div><br />'; + echo '<div class="serendipity_center serendipity_msg_notice">'. sprintf(COMMENT_DELETED, DATA_COMMENT_DELETED) .'</div><br />'; } if (defined('DATA_COMMENT_APPROVED')) { - echo '<div class="serendipity_center" style="color: green; font-weight: bold;">'. sprintf(COMMENT_APPROVED, DATA_COMMENT_APPROVED) .'</div><br />'; + echo '<div class="serendipity_center serendipity_msg_notice">'. sprintf(COMMENT_APPROVED, DATA_COMMENT_APPROVED) .'</div><br />'; } @@ -1317,12 +1317,12 @@ if (isset($serendipity['GET']['csuccess']) && $serendipity['GET']['csuccess'] == 'true') { ?> <br /> - <div class="serendipity_center" style="color: green"><?php echo COMMENT_ADDED; ?></div> + <div class="serendipity_center serendipity_msg_notice"><?php echo COMMENT_ADDED; ?></div> <?php } elseif (!serendipity_db_bool($entry['allow_comments'])) { ?> <br /> - <div class="serendipity_center" style="color: #FF0000"><?php echo COMMENTS_CLOSED; ?></div> + <div class="serendipity_center serendipity_msg_important"><?php echo COMMENTS_CLOSED; ?></div> <?php } else { ?> @@ -2709,7 +2709,7 @@ $hidden .= ' <input type="hidden" name="serendipity[timestamp]" value="' . (isset($entry['timestamp']) ? $entry['timestamp'] : '') . '" />' . $n; $hidden .= ' <input type="hidden" name="serendipity[preview]" value="false" />'; ?> - <span style="color: #FF0000;"><?php echo $errMsg; ?></span> + <span class="serendipity_msg_important"><?php echo $errMsg; ?></span> <form action="<?php echo $targetURL; ?>" method="post" <?php echo ($serendipity['XHTML11'] ? 'id' : 'name'); ?>="serendipityEntry" style="margin-top: 0px; margin-bottom: 0px; padding-top: 0px; padding-bottom: 0px"> <?php echo $hidden; ?> Index: comment.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/comment.php,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- comment.php 18 Jul 2004 19:43:14 -0000 1.41 +++ comment.php 19 Jul 2004 08:50:54 -0000 1.42 @@ -152,7 +152,7 @@ <?php serendipity_displayCommentForm($id, '?', $comments, $serendipity['POST'], true, serendipity_db_bool($ca['moderate_comments'])); } elseif (!serendipity_db_bool($ca['allow_comments'])) { ?> - <div class="serendipity_center" style="color: #FF0000"><?php echo COMMENTS_CLOSED; ?></div> + <div class="serendipity_center serendipity_msg_important""><?php echo COMMENTS_CLOSED; ?></div> <?php } } Index: serendipity_admin_upgrader.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_upgrader.inc.php,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- serendipity_admin_upgrader.inc.php 17 Jul 2004 12:18:53 -0000 1.17 +++ serendipity_admin_upgrader.inc.php 19 Jul 2004 08:50:54 -0000 1.18 @@ -67,7 +67,7 @@ if (is_array($errors)) { echo DIAGNOSTIC_ERROR . '<br /><br />'; - echo '<span style="color: #FF0000">- ' . implode('<br />', $errors) . '</span><br /><br />'; + echo '<span class="serendipity_msg_important">- ' . implode('<br />', $errors) . '</span><br /><br />'; } } |
