diff --git a/wp-admin/css/dashboard.css b/wp-admin/css/dashboard.css index 0a24dc90c..4410fdf3d 100644 --- a/wp-admin/css/dashboard.css +++ b/wp-admin/css/dashboard.css @@ -91,6 +91,112 @@ div.postbox div.inside { padding: 0; } +/* Right Now */ + +#dashboard_right_now p.sub, #dashboard_right_now .table, #dashboard_right_now .versions { + margin: -10px; +} + +#dashboard_right_now .inside { + font-family: Georgia, serif; + font-size: 14px; +} + +#dashboard_right_now p.sub { + font-style: italic; + padding: 5px 10px 15px; + color: #777; +} + +#dashboard_right_now .table { + background: #f9f9f9; + border-top: #ececec 1px solid; + border-bottom: #ececec 1px solid; + margin: 0 -9px 10px; + padding: 0 10px; +} + +#dashboard_right_now table { + width: 100%; +} + +#dashboard_right_now table td { + border-top: #ececec 1px solid; + padding: 3px 0; + white-space: nowrap; +} + +#dashboard_right_now table tr.first td { + border-top: none; +} + +#dashboard_right_now a { + text-decoration: none; +} + +#dashboard_right_now .b, #dashboard_right_now .b a { + color: #2583ad; +} + +#dashboard_right_now td.b { + padding-right: 6px; + text-align: right; + font-family: Georgia, "Times New Roman", Times, serif; + font-size: 14px; +} + +#dashboard_right_now td.b a { + font-size: 18px; +} + +#dashboard_right_now .t { + font-size: 12px; + padding-right: 12px; + color: #777; +} + +#dashboard_right_now td.first, +#dashboard_right_now td.last { + width: 1px; +} + +#dashboard_right_now .spam { + color: red; +} + +#dashboard_right_now .waiting { + color: orange; +} + +#dashboard_right_now .approved { + color: green; +} + +#dashboard_right_now .versions { + line-height: 2.5em; + padding: 10px; +} + +#dashboard_right_now .versions { + font-style: italic; + font-size: 12px; +} + +#dashboard_right_now .versions a, #dashboard_right_now .versions .b { + font-style: normal; + font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;; + font-weight: bold; +} + +#dashboard_right_now a.button { + font-weight: normal; + float: right; + clear: right; + position: relative; + top: -5px; + +} + /* Recent Comments */ #the-comment-list { diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php index 43cba708b..0b4d54d26 100644 --- a/wp-admin/includes/dashboard.php +++ b/wp-admin/includes/dashboard.php @@ -163,16 +163,16 @@ function wp_dashboard_right_now() { $num_comm = get_comment_count( ); - echo '

' . __('At a Glance') . '

'; - echo ''; - echo ''; + echo "\n\t".'

' . __('At a Glance') . '

'; + echo "\n\t".'
'."\n\t".'
'; + echo "\n\t".''; // Posts $num = number_format_i18n( $num_posts->publish ); if ( current_user_can( 'edit_posts' ) ) $num = "$num"; - echo ""; - echo ''; + echo ''; + echo ''; /* TODO: Show status breakdown on hover if ( $can_edit_pages && !empty($num_pages->publish) ) { // how many pages is not exposed in feeds. Don't show if !current_user_can $post_type_texts[] = ''.sprintf( __ngettext( '%s page', '%s pages', $num_pages->publish ), number_format_i18n( $num_pages->publish ) ).''; @@ -194,8 +194,8 @@ function wp_dashboard_right_now() { $num = number_format_i18n($num_comm['total_comments']); if ( current_user_can( 'moderate_comments' ) ) $num = "$num"; - echo ""; - echo ''; + echo ''; + echo ''; echo ''; @@ -203,65 +203,69 @@ function wp_dashboard_right_now() { $num = number_format_i18n( $num_pages->publish ); if ( current_user_can( 'edit_pages' ) ) $num = "$num"; - echo ""; - echo ''; + echo ''; + echo ''; // Approved Comments $num = number_format_i18n($num_comm['approved']); if ( current_user_can( 'moderate_comments' ) ) $num = "$num"; - echo ""; - echo ''; + echo ''; + echo ''; - echo ''; + echo "\n\t"; // Categories $num = number_format_i18n( $num_cats ); if ( current_user_can( 'manage_categories' ) ) - $num = "$num"; - echo ""; - echo ''; + $num = "$num"; + echo ''; + echo ''; // Spam Comments $num = number_format_i18n($num_comm['spam']); if ( current_user_can( 'moderate_comments' ) ) $num = "$num"; - echo ""; - echo ''; + echo ''; + echo ''; - echo ''; + echo "\n\t"; // Tags $num = number_format_i18n( $num_tags ); if ( current_user_can( 'manage_categories' ) ) $num = "$num"; - echo ""; - echo ''; + echo ''; + echo ''; // Pending Comments $num = number_format_i18n($num_comm['awaiting_moderation']); if ( current_user_can( 'moderate_comments' ) ) $num = "$num"; - echo ""; - echo ''; - - echo '
$num' . __ngettext( 'Post', 'Posts', $num_posts->publish ) . ''.$num.'' . __ngettext( 'Post', 'Posts', $num_posts->publish ) . '$num' . __ngettext( 'Comment', 'Comments', $num_comm['total_comments'] ) . ''.$num.'' . __ngettext( 'Comment', 'Comments', $num_comm['total_comments'] ) . '
$num' . __ngettext( 'Page', 'Pages', $num_pages->publish ) . ''.$num.'' . __ngettext( 'Page', 'Pages', $num_pages->publish ) . '$num' . __ngettext( 'Approved', 'Approved', $num_comm['approved'] ) . ''.$num.'' . __ngettext( 'Approved', 'Approved', $num_comm['approved'] ) . '
$num' . __ngettext( 'Category', 'Categories', $num_cats ) . ''.$num.'' . __ngettext( 'Category', 'Categories', $num_cats ) . '$num' . __ngettext( 'Spam', 'Spam', $num_comm['spam'] ) . ''.$num.'' . __ngettext( 'Spam', 'Spam', $num_comm['spam'] ) . '
$num' . __ngettext( 'Tag', 'Tags', $num_tags ) . ''.$num.'' . __ngettext( 'Tag', 'Tags', $num_tags ) . '$num' . __ngettext( 'Pending', 'Pending', $num_comm['awaiting_moderation'] ) . '
'; + echo ''.$num.''; + echo '' . __ngettext( 'Awaiting Moderation', 'Awaiting Moderation', $num_comm['awaiting_moderation'] ) . ''; + echo "\n\t\n\t"; + + echo "\n\t".'
'; $ct = current_theme_info(); $sidebars_widgets = wp_get_sidebars_widgets(); $num_widgets = array_reduce( $sidebars_widgets, create_function( '$prev, $curr', 'return $prev+count($curr);' ), 0 ); $num = number_format_i18n( $num_widgets ); - if ( $can_switch_themes = current_user_can( 'switch_themes' ) ) - $num = "$num"; - echo '

'; - printf(__ngettext('Theme %1$s with %2$s Widget', 'Theme %1$s with %2$s Widgets', $num_widgets), $ct->title, $num); - if ( $can_switch_themes ) - echo ' ' . __('Change Theme') . ''; + echo "\n\t

"; + if ( current_user_can( 'switch_themes' ) ) { + echo '' . __('Change Theme') . ''; + printf(__ngettext('Theme %1$s with %2$s Widget', 'Theme %1$s with %2$s Widgets', $num_widgets), $ct->title, $num); + } else { + printf(__ngettext('Theme %1$s with %2$s Widget', 'Theme %1$s with %2$s Widgets', $num_widgets), $ct->title, $num); + } + echo '

'; update_right_now_message(); + echo "\n\t".'
'; do_action( 'rightnow_end' ); do_action( 'activity_box_end' ); } diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php index 1429d8126..4343c6c1b 100644 --- a/wp-admin/includes/update.php +++ b/wp-admin/includes/update.php @@ -57,9 +57,9 @@ function update_nag() { function update_right_now_message() { $cur = get_option( 'update_core' ); - $msg = sprintf( __('This is WordPress version %s.'), $GLOBALS['wp_version'] ); + $msg = sprintf( __('You are using WordPress %s.'), $GLOBALS['wp_version'] ); if ( isset( $cur->response ) && $cur->response == 'upgrade' && current_user_can('manage_options') ) - $msg .= " " . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . ''; + $msg .= " " . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . ''; echo "$msg"; } diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 652a1f18c..d415efdf9 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -330,7 +330,7 @@ function wp_default_styles( &$styles ) { $styles->add( 'global', '/wp-admin/css/global.css', array(), '20081029' ); $styles->add( 'media', '/wp-admin/css/media.css', array(), '20080709' ); $styles->add( 'widgets', '/wp-admin/css/widgets.css' ); - $styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '20081008' ); + $styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '20081030' ); $styles->add( 'install', '/wp-admin/css/install.css', array(), '20080708' ); $styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css' ); $styles->add( 'press-this', '/wp-admin/css/press-this.css', array(), '20080922' );