Changeset 13531

Timestamp:

03/01/2010 12:32:00 PM (16 years ago)

Author:

dd32

Message:

Split Right Now widget into Content | Discussion. Props matveb. Fixes #12202

Location:

trunk

Files:

• wp-admin/css/dashboard.css (modified) (1 diff)
• wp-admin/css/dashboard.dev.css (modified) (6 diffs)
• wp-admin/css/ms.css (modified) (1 diff)
• wp-admin/css/ms.dev.css (modified) (1 diff)
• wp-admin/includes/dashboard.php (modified) (6 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/css/dashboard.css

@@ -1 @@
-.postbox p,.postbox ul,.postbox ol,.postbox blockquote,#wp-version-message{font-size:11px;}.edit-box{display:none;}h3:hover .edit-box{display:inline;}form .input-text-wrap{border-style:solid;border-width:1px;padding:2px 3px;border-color:#ccc;}#dashboard-widgets form .input-text-wrap input{border:0 none;outline:none;margin:0;padding:0;width:99%;color:#333;}form .textarea-wrap{border-style:solid;border-width:1px;padding:2px;border-color:#ccc;}#dashboard-widgets form .textarea-wrap textarea{border:0 none;padding:0;outline:none;width:99%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;}#dashboard-widgets .postbox form .submit{float:none;margin:.5em 0 0;padding:0;border:none;}#dashboard-widgets-wrap #dashboard-widgets .postbox form .submit input{margin:0;}#dashboard-widgets-wrap #dashboard-widgets .postbox form .submit #publish{min-width:0;}div.postbox div.inside{margin:10px;position:relative;}#dashboard-widgets a{text-decoration:none;}#dashboard-widgets h3 a{text-decoration:underline;}#dashboard-widgets h3 .postbox-title-action{position:absolute;right:30px;padding:0;}#dashboard-widgets h4{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-size:13px;margin:0 0 .2em;padding:0;}#dashboard_right_now p.sub,#dashboard_right_now .table,#dashboard_right_now .versions{margin:-12px;}#dashboard_right_now .inside{font-size:12px;}#dashboard_right_now p.sub{font-style:italic;font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;padding:5px 10px 15px;color:#777;font-size:13px;}#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 td.b{padding-right:6px;text-align:right;font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-size:14px;}#dashboard_right_now td.b a{font-size:18px;}#dashboard_right_now td.b a:hover{color:#d54e21;}#dashboard_right_now .t{font-size:12px;padding-right:12px;padding-top:6px;color:#777;}#dashboard_right_now .t a{white-space:nowrap;}#dashboard_right_now td.first,#dashboard_right_now td.last{width:1%;}#dashboard_right_now .spam{color:red;}#dashboard_right_now .waiting{color:#e66f00;}#dashboard_right_now .approved{color:green;}#dashboard_right_now .versions{padding:6px 10px 12px;}#dashboard_right_now .versions .b{font-weight:bold;}#dashboard_right_now a.button{float:right;clear:right;position:relative;top:-5px;}#dashboard_recent_comments h3{margin-bottom:0;}#dashboard_recent_comments .inside{margin-top:0;}#dashboard_recent_comments .comment-meta .approve{font-style:italic;font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;font-size:10px;}#the-comment-list{position:relative;}#the-comment-list .comment-item{padding:1em 10px;border-top:1px solid;}#the-comment-list .pingback{padding-left:9px!important;}#the-comment-list .comment-item,#the-comment-list #replyrow{margin:0 -10px;}#the-comment-list .comment-item:first-child{border-top:none;}#the-comment-list .comment-item .avatar{float:left;margin:0 10px 5px 0;}#the-comment-list .comment-item h4{line-height:1.4;margin-top:-.2em;font-weight:normal;color:#999;}#the-comment-list .comment-item h4 cite{font-style:normal;font-weight:normal;}#the-comment-list .comment-item blockquote,#the-comment-list .comment-item blockquote p{margin:0;padding:0;display:inline;}#dashboard_recent_comments #the-comment-list .trackback blockquote,#dashboard_recent_comments #the-comment-list .pingback blockquote{display:block;}#the-comment-list .comment-item p.row-actions{margin:3px 0 0;padding:0;font-size:10px;}#dashboard_quick_press h4{font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;float:left;width:5.5em;clear:both;font-weight:normal;text-align:right;padding-top:5px;font-size:12px;}#dashboard_quick_press h4 label{margin-right:10px;}#dashboard_quick_press .input-text-wrap,#dashboard_quick_press .textarea-wrap{margin:0 0 1em 5em;}#dashboard_quick_press #media-buttons{margin:0 0 .5em 5em;padding:0 0 0 10px;font-size:11px;}#dashboard_quick_press #media-buttons a{vertical-align:bottom;}#dashboard-widgets #dashboard_quick_press form p.submit{margin-left:4.6em;}#dashboard-widgets #dashboard_quick_press form p.submit input{float:left;}#dashboard-widgets #dashboard_quick_press form p.submit #save-post{margin:0 1em 0 10px;}#dashboard-widgets #dashboard_quick_press form p.submit #publish{float:right;}#dashboard-widgets #dashboard_quick_press form p.submit img.waiting{vertical-align:middle;visibility:hidden;margin:4px 6px 0 0;}#dashboard_recent_drafts ul{margin:0;padding:0;list-style:none;}#dashboard_recent_drafts ul li{margin-bottom:.6em;}#dashboard_recent_drafts h4{font-weight:normal;}#dashboard_recent_drafts h4 abbr{font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;font-size:11px;color:#999;margin-left:3px;}#dashboard_recent_drafts p{margin:0;padding:0;}.rss-widget ul{margin:0;padding:0;list-style:none;}a.rsswidget{font-size:13px;font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;line-height:1.7em;}.rss-widget ul li{line-height:1.5em;margin-bottom:12px;}.rss-widget span.rss-date{margin-left:3px;}.rss-widget cite{display:block;text-align:right;margin:0 0 1em;padding:0;}.rss-widget cite:before{content:'\2014';}#dashboard_plugins h4{font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;}#dashboard_plugins h5{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-size:13px!important;margin:0;display:inline;line-height:1.4em;}#dashboard_plugins h5 a{font-weight:normal;line-height:1.7em;}#dashboard_plugins p{margin:0 0 1.4em;line-height:1.4em;}.dashboard-comment-wrap{overflow:hidden;word-wrap:break-word;}
+.postbox p,.postbox ul,.postbox ol,.postbox blockquote,#wp-version-message{font-size:11px;}.edit-box{display:none;}h3:hover .edit-box{display:inline;}form .input-text-wrap{border-style:solid;border-width:1px;padding:2px 3px;border-color:#ccc;}#dashboard-widgets form .input-text-wrap input{border:0 none;outline:none;margin:0;padding:0;width:99%;color:#333;}form .textarea-wrap{border-style:solid;border-width:1px;padding:2px;border-color:#ccc;}#dashboard-widgets form .textarea-wrap textarea{border:0 none;padding:0;outline:none;width:99%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;}#dashboard-widgets .postbox form .submit{float:none;margin:.5em 0 0;padding:0;border:none;}#dashboard-widgets-wrap #dashboard-widgets .postbox form .submit input{margin:0;}#dashboard-widgets-wrap #dashboard-widgets .postbox form .submit #publish{min-width:0;}div.postbox div.inside{margin:10px;position:relative;}#dashboard-widgets a{text-decoration:none;}#dashboard-widgets h3 a{text-decoration:underline;}#dashboard-widgets h3 .postbox-title-action{position:absolute;right:30px;padding:0;}#dashboard-widgets h4{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-size:13px;margin:0 0 .2em;padding:0;}#dashboard_right_now p.sub,#dashboard_right_now .table,#dashboard_right_now .versions{margin:-12px;}#dashboard_right_now .inside{font-size:12px;padding-top:20px;}#dashboard_right_now p.sub{font-style:italic;font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;padding:5px 10px 15px;color:#777;font-size:13px;position:absolute;top:-17px;left:15px;}#dashboard_right_now .table{margin:0 -9px;padding:0 10px;background:#f9f9f9;border-top:#ececec 1px solid;border-bottom:#ececec 1px solid;position:relative;}#dashboard_right_now .table_content{float:left;border-right:#ececec 1px solid;width:45%;}#dashboard_right_now .table_discussion{float:right;border-left:#ececec 1px solid;width:45%;}#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 td.b{padding-right:6px;text-align:right;font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-size:14px;width:1%;}#dashboard_right_now td.b a{font-size:18px;}#dashboard_right_now td.b a:hover{color:#d54e21;}#dashboard_right_now .t{font-size:12px;padding-right:12px;padding-top:6px;color:#777;}#dashboard_right_now .t a{white-space:nowrap;}#dashboard_right_now .spam{color:red;}#dashboard_right_now .waiting{color:#e66f00;}#dashboard_right_now .approved{color:green;}#dashboard_right_now .versions{padding:6px 10px 12px;clear:left;}#dashboard_right_now .versions .b{font-weight:bold;}#dashboard_right_now a.button{float:right;clear:right;position:relative;top:-5px;}#dashboard_recent_comments h3{margin-bottom:0;}#dashboard_recent_comments .inside{margin-top:0;}#dashboard_recent_comments .comment-meta .approve{font-style:italic;font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;font-size:10px;}#the-comment-list{position:relative;}#the-comment-list .comment-item{padding:1em 10px;border-top:1px solid;}#the-comment-list .pingback{padding-left:9px!important;}#the-comment-list .comment-item,#the-comment-list #replyrow{margin:0 -10px;}#the-comment-list .comment-item:first-child{border-top:none;}#the-comment-list .comment-item .avatar{float:left;margin:0 10px 5px 0;}#the-comment-list .comment-item h4{line-height:1.4;margin-top:-.2em;font-weight:normal;color:#999;}#the-comment-list .comment-item h4 cite{font-style:normal;font-weight:normal;}#the-comment-list .comment-item blockquote,#the-comment-list .comment-item blockquote p{margin:0;padding:0;display:inline;}#dashboard_recent_comments #the-comment-list .trackback blockquote,#dashboard_recent_comments #the-comment-list .pingback blockquote{display:block;}#the-comment-list .comment-item p.row-actions{margin:3px 0 0;padding:0;font-size:10px;}#dashboard_quick_press h4{font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;float:left;width:5.5em;clear:both;font-weight:normal;text-align:right;padding-top:5px;font-size:12px;}#dashboard_quick_press h4 label{margin-right:10px;}#dashboard_quick_press .input-text-wrap,#dashboard_quick_press .textarea-wrap{margin:0 0 1em 5em;}#dashboard_quick_press #media-buttons{margin:0 0 .5em 5em;padding:0 0 0 10px;font-size:11px;}#dashboard_quick_press #media-buttons a{vertical-align:bottom;}#dashboard-widgets #dashboard_quick_press form p.submit{margin-left:4.6em;}#dashboard-widgets #dashboard_quick_press form p.submit input{float:left;}#dashboard-widgets #dashboard_quick_press form p.submit #save-post{margin:0 1em 0 10px;}#dashboard-widgets #dashboard_quick_press form p.submit #publish{float:right;}#dashboard-widgets #dashboard_quick_press form p.submit img.waiting{vertical-align:middle;visibility:hidden;margin:4px 6px 0 0;}#dashboard_recent_drafts ul{margin:0;padding:0;list-style:none;}#dashboard_recent_drafts ul li{margin-bottom:.6em;}#dashboard_recent_drafts h4{font-weight:normal;}#dashboard_recent_drafts h4 abbr{font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;font-size:11px;color:#999;margin-left:3px;}#dashboard_recent_drafts p{margin:0;padding:0;}.rss-widget ul{margin:0;padding:0;list-style:none;}a.rsswidget{font-size:13px;font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;line-height:1.7em;}.rss-widget ul li{line-height:1.5em;margin-bottom:12px;}.rss-widget span.rss-date{margin-left:3px;}.rss-widget cite{display:block;text-align:right;margin:0 0 1em;padding:0;}.rss-widget cite:before{content:'\2014';}#dashboard_plugins h4{font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;}#dashboard_plugins h5{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-size:13px!important;margin:0;display:inline;line-height:1.4em;}#dashboard_plugins h5 a{font-weight:normal;line-height:1.7em;}#dashboard_plugins p{margin:0 0 1.4em;line-height:1.4em;}.dashboard-comment-wrap{overflow:hidden;word-wrap:break-word;}

trunk/wp-admin/css/dashboard.dev.css

@@ -92 +92 @@
 #dashboard_right_now .inside {
     font-size: 12px;
+    padding-top: 20px;
 }
 
@@ -100 +101 @@
     color: #777;
     font-size: 13px;
+    position: absolute;
+    top: -17px;
+    left: 15px;
 }
 
 #dashboard_right_now .table {
+    margin: 0 -9px;
+    padding: 0 10px;
     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%;
+    position: relative;
+}
+
+#dashboard_right_now .table_content {
+    float: left;
+    border-right: #ececec 1px solid;
+    width: 45%;
+}
+
+#dashboard_right_now .table_discussion {
+    float: right;
+    border-left: #ececec 1px solid;
+    width: 45%;
 }
 
@@ -129 +142 @@
     font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
     font-size: 14px;
+    width: 1%;
 }
 
@@ -150 +164 @@
 }
 
-#dashboard_right_now td.first,
-#dashboard_right_now td.last {
-    width: 1%;
-}
-
 #dashboard_right_now .spam {
     color: red;
@@ -169 +178 @@
 #dashboard_right_now .versions {
     padding: 6px 10px 12px;
+    clear: left;
 }
 
@@ -398 +408 @@
     word-wrap: break-word;
 }
-

trunk/wp-admin/css/ms.css

@@ -1 @@
-#all-my-blogs-tab a.current{position:relative;padding-bottom:10px;}#all-my-blogs{position:absolute;top:30px;left:0;right:0;_width:100%;margin:4px 7px;padding:6px 10px;font-size:12px;}#all-my-blogs *{margin:0;}form#all-my-blogs p,form#all-my-blogs p *{vertical-align:middle;}#all-my-blogs a{font-size:10px;text-decoration:underline;margin:0 14px;}#all-my-blogs a:hover,#all-my-blogs a:active{text-decoration:none;}form#wpmu-search{position:absolute;right:0;top:0;}#adminmenu #menu-site div.wp-menu-image{background:transparent url("../images/site-admin.png") no-repeat scroll 0 -33px;}#adminmenu #menu-site:hover div.wp-menu-image{background:transparent url("../images/site-admin.png") no-repeat scroll 0 -1px;}#dashboard_right_now p.musub{margin-top:12px;border-top:1px solid #ececec;}#dashboard_right_now td.b a.musublink{font-size:16px;}tr.site-deleted{background:#f55;}tr.site-spammed{background:#faa;}tr.site-archived{background:#fee;}
+#all-my-blogs-tab a.current{position:relative;padding-bottom:10px;}#all-my-blogs{position:absolute;top:30px;left:0;right:0;_width:100%;margin:4px 7px;padding:6px 10px;font-size:12px;}#all-my-blogs *{margin:0;}form#all-my-blogs p,form#all-my-blogs p *{vertical-align:middle;}#all-my-blogs a{font-size:10px;text-decoration:underline;margin:0 14px;}#all-my-blogs a:hover,#all-my-blogs a:active{text-decoration:none;}form#wpmu-search{position:absolute;right:0;top:0;}#adminmenu #menu-site div.wp-menu-image{background:transparent url("../images/site-admin.png") no-repeat scroll 0 -33px;}#adminmenu #menu-site:hover div.wp-menu-image{background:transparent url("../images/site-admin.png") no-repeat scroll 0 -1px;}#dashboard_right_now p.musub{margin-top:12px;border-top:1px solid #ececec;position:static;}#dashboard_right_now td.b a.musublink{font-size:16px;}tr.site-deleted{background:#f55;}tr.site-spammed{background:#faa;}tr.site-archived{background:#fee;}

trunk/wp-admin/css/ms.dev.css

@@ -54 +54 @@
     margin-top: 12px;
     border-top: 1px solid #ececec;
+    position: static;
 }
 

trunk/wp-admin/includes/dashboard.php

@@ -213 +213 @@
     $num_comm = wp_count_comments( );
 
-    echo "\n\t".'<p class="sub">' . __('At a Glance') . '</p>';
-    echo "\n\t".'<div class="table">'."\n\t".'<table>';
+    echo "\n\t".'<div class="table table_content">'."\n\t".'<table>';
+    echo "\n\t".'<p class="sub">' . __('Content') . '</p>';
     echo "\n\t".'<tr class="first">';
 
@@ -226 +226 @@
     echo '<td class="first b b-posts">' . $num . '</td>';
     echo '<td class="t posts">' . $text . '</td>';
+
+    echo '</tr><tr>';
     /* 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
@@ -242 +244 @@
     }
     */
-
-    // Total Comments
-    $num = '<span class="total-count">' . number_format_i18n($num_comm->total_comments) . '</span>';
-    $text = _n( 'Comment', 'Comments', $num_comm->total_comments );
-    if ( current_user_can( 'moderate_comments' ) ) {
-        $num = "<a href='edit-comments.php'>$num</a>";
-        $text = "<a href='edit-comments.php'>$text</a>";
-    }
-    echo '<td class="b b-comments">' . $num . '</td>';
-    echo '<td class="last t comments">' . $text . '</td>';
-
-    echo '</tr><tr>';
 
     // Pages
@@ -265 +255 @@
     echo '<td class="t pages">' . $text . '</td>';
 
+    echo '</tr><tr>';
+
+    // Categories
+    $num = number_format_i18n( $num_cats );
+    $text = _n( 'Category', 'Categories', $num_cats );
+    if ( current_user_can( 'manage_categories' ) ) {
+        $num = "<a href='edit-tags.php?taxonomy=category'>$num</a>";
+        $text = "<a href='edit-tags.php?taxonomy=category'>$text</a>";
+    }
+    echo '<td class="first b b-cats">' . $num . '</td>';
+    echo '<td class="t cats">' . $text . '</td>';
+
+    echo '</tr><tr>';
+
+    // Tags
+    $num = number_format_i18n( $num_tags );
+    $text = _n( 'Tag', 'Tags', $num_tags );
+    if ( current_user_can( 'manage_categories' ) ) {
+        $num = "<a href='edit-tags.php'>$num</a>";
+        $text = "<a href='edit-tags.php'>$text</a>";
+    }
+    echo '<td class="first b b-tags">' . $num . '</td>';
+    echo '<td class="t tags">' . $text . '</td>';
+
+    echo "</tr>";
+    echo "\n\t</table>\n\t</div>";
+
+
+    echo "\n\t".'<div class="table table_discussion">'."\n\t".'<table>';
+    echo "\n\t".'<p class="sub">' . __('Discussion') . '</p>';
+    echo "\n\t".'<tr class="first">';
+
+    // Total Comments
+    $num = '<span class="total-count">' . number_format_i18n($num_comm->total_comments) . '</span>';
+    $text = _n( 'Comment', 'Comments', $num_comm->total_comments );
+    echo '<td class="b b-comments"><a href="edit-comments.php">' . $num . '</a></td>';
+    echo '<td class="last t comments"><a href="edit-comments.php">' . $text . '</a></td>';
+
+    echo '</tr><tr>';
+
     // Approved Comments
     $num = '<span class="approved-count">' . number_format_i18n($num_comm->approved) . '</span>';
@@ -277 +307 @@
     echo "</tr>\n\t<tr>";
 
-    // Categories
-    $num = number_format_i18n( $num_cats );
-    $text = _n( 'Category', 'Categories', $num_cats );
-    if ( current_user_can( 'manage_categories' ) ) {
-        $num = "<a href='edit-tags.php?taxonomy=category'>$num</a>";
-        $text = "<a href='edit-tags.php?taxonomy=category'>$text</a>";
-    }
-    echo '<td class="first b b-cats">' . $num . '</td>';
-    echo '<td class="t cats">' . $text . '</td>';
-
     // Pending Comments
     $num = '<span class="pending-count">' . number_format_i18n($num_comm->moderated) . '</span>';
@@ -298 +318 @@
 
     echo "</tr>\n\t<tr>";
-
-    // Tags
-    $num = number_format_i18n( $num_tags );
-    $text = _n( 'Tag', 'Tags', $num_tags );
-    if ( current_user_can( 'manage_categories' ) ) {
-        $num = "<a href='edit-tags.php'>$num</a>";
-        $text = "<a href='edit-tags.php'>$text</a>";
-    }
-    echo '<td class="first b b-tags">' . $num . '</td>';
-    echo '<td class="t tags">' . $text . '</td>';
 
     // Spam Comments

trunk/wp-includes/script-loader.php

@@ -462 +462 @@
     $styles->add_data( 'colors-classic', 'rtl', true );
 
-    $styles->add( 'ms', "/wp-admin/css/ms$suffix.css", array(), '20100219' );
+    $styles->add( 'ms', "/wp-admin/css/ms$suffix.css", array(), '20100301' );
     $styles->add( 'global', "/wp-admin/css/global$suffix.css", array(), '20100108' );
     $styles->add( 'media', "/wp-admin/css/media$suffix.css", array(), '20091029' );
     $styles->add( 'widgets', "/wp-admin/css/widgets$suffix.css", array(), '20091118' );
-    $styles->add( 'dashboard', "/wp-admin/css/dashboard$suffix.css", array(), '20100213' );
+    $styles->add( 'dashboard', "/wp-admin/css/dashboard$suffix.css", array(), '20100301' );
     $styles->add( 'install', "/wp-admin/css/install$suffix.css", array(), '20100228' ); // Readme as well
     $styles->add( 'theme-editor', "/wp-admin/css/theme-editor$suffix.css", array(), '20090625' );