diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index 9c1693ca3..6ef00608d 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -29,6 +29,18 @@ div.dashboard-widget, border-color: #ccc; } +#poststuff .inside .spam { + color: red; +} + +#poststuff .inside .waiting { + color: orange; +} + +#poststuff .inside .approved { + color: green; +} + .widefat { border-color: #dfdfdf; } diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php index a4ef89513..8857ab1fe 100644 --- a/wp-admin/edit-form-comment.php +++ b/wp-admin/edit-form-comment.php @@ -33,40 +33,46 @@ $url = attribute_escape( $comment->comment_author_url );

Save

- +
-
- -
-
-

-
-
- +
+
+
+
+

+
+
+
- -
+
+
comment_ID&_wp_original_http_referer=" . wp_get_referer(), 'delete-comment_' . $comment->comment_ID) . "' onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n 'Cancel' to stop, 'OK' to delete.")) . "') ) { return true;}return false;\">" . __('Delete comment') . ""; ?> -
- -comment_date); -$time = mysql2date(get_option('time_format'), $comment->comment_date); +$datef = _c( 'M j, Y \a\t G:i|Publish box date format'); +$stamp = __('Submitted on:
%1$s'); +$date = date_i18n( $datef, strtotime( $comment->comment_date ) ); ?> -
  -
- +  +
- -

- +

+
+
-

- +
+
+ +
+
diff --git a/wp-admin/js/comment.js b/wp-admin/js/comment.js index 301192054..70ffee093 100644 --- a/wp-admin/js/comment.js +++ b/wp-admin/js/comment.js @@ -35,6 +35,7 @@ jQuery(document).ready( function($) { $('#timestampdiv').slideUp("normal"); $('.edit-timestamp').show(); $('#timestamp').html( + commentL10n.submittedOn + '
' + $( '#mm option[value=' + $('#mm').val() + ']' ).text() + ' ' + $('#jj').val() + ', ' + $('#aa').val() + ' @ ' + diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index d27695a1f..38ed28e6d 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -213,14 +213,10 @@ table#availablethemes td.bottom { min-height: 70px; } -#side-sortables #misc-publishing-actions { +#side-info-column #misc-publishing-actions { max-width: 170px; } -#side-sortable #minor-publishing-actions { - max-width: 108px; -} - .misc-pub-section { padding: 6px; border-bottom: 1px solid #ddd; @@ -230,22 +226,22 @@ table#availablethemes td.bottom { min-height: 18px; } -#normal-sortables .misc-pub-section-1-last, +#post-body .misc-pub-section-1-last, .misc-pub-section-2-last { border-bottom: 0; } -#normal-sortables #misc-pub-block-1, -#normal-sortables #misc-pub-block-2 { +#post-body #misc-pub-block-1, +#post-body #misc-pub-block-2 { float: left; min-height: 70px; } -#normal-sortables #misc-pub-block-1 { +#post-body #misc-pub-block-1 { border-right: 1px solid #ddd; } -#normal-sortables #misc-pub-block-2 { +#post-body #misc-pub-block-2 { border-left: 1px solid #ddd; margin-left: -1px; } @@ -290,13 +286,11 @@ table#availablethemes td.bottom { vertical-align: middle; text-align: left; float: left; - width: 30%; } #publishing-action { text-align: right; float: right; - width: 70%; } .side-info { diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 747cb7761..d49ec6d08 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -211,10 +211,11 @@ function wp_default_scripts( &$scripts ) { 'saveDraft' => __('Save Draft') ) ); $scripts->add( 'link', '/wp-admin/js/link.js', array('jquery-ui-tabs', 'wp-lists', 'postbox', 'settings-box'), '20080925' ); - $scripts->add( 'comment', '/wp-admin/js/comment.js', array('jquery'), '20080219' ); + $scripts->add( 'comment', '/wp-admin/js/comment.js', array('jquery'), '20081030' ); $scripts->localize( 'comment', 'commentL10n', array( 'cancel' => __('Cancel'), 'edit' => __('Edit'), + 'submittedOn' => __('Submitted on:') ) ); $scripts->add( 'admin-gallery', '/wp-admin/js/gallery.js', array( 'jquery-ui-sortable' ), '20080709' ); $scripts->add( 'media-upload', '/wp-admin/js/media-upload.js', array( 'thickbox' ), '20081016' ); @@ -327,14 +328,14 @@ function wp_default_styles( &$styles ) { $rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'press-this-ie' ); - $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081030' ); + $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081030b' ); $styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' ); $styles->add( 'ie', '/wp-admin/css/ie.css' ); $styles->add_data( 'ie', 'conditional', 'gte IE 6' ); $styles->add( 'colors', true ); // Register "meta" stylesheet for admin colors - $styles->add( 'colors-fresh', '/wp-admin/css/colors-fresh.css', array(), '20081028'); // for login.php. Is there a better way? + $styles->add( 'colors-fresh', '/wp-admin/css/colors-fresh.css', array(), '20081030'); // for login.php. Is there a better way? $styles->add_data( 'colors-fresh', 'rtl', true ); $styles->add( 'global', '/wp-admin/css/global.css', array(), '20081030' );