Ticket #12202: 12202.1.diff

wp-admin/includes/dashboard.php

@@ -212 +212 @@
 
         $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".'<caption>' . __('Content') . '</caption>';
         echo "\n\t".'<tr class="first">';
 
         // Posts
@@ -225 +225 @@
         }
         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
                 $post_type_texts[] = '<a href="edit-pages.php">'.sprintf( _n( '%s page', '%s pages', $num_pages->publish ), number_format_i18n( $num_pages->publish ) ).'</a>';
@@ -241 +243 @@
                 $pending_text = '';
         }
         */
+        
+        // Pages
+        $num = number_format_i18n( $num_pages->publish );
+        $text = _n( 'Page', 'Pages', $num_pages->publish );
+        if ( current_user_can( 'edit_pages' ) ) {
+                $num = "<a href='edit.php?post_type=page'>$num</a>";
+                $text = "<a href='edit.php?post_type=page'>$text</a>";
+        }
+        echo '<td class="first b b_pages">' . $num . '</td>';
+        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='categories.php'>$num</a>";
+                $text = "<a href='categories.php'>$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".'<caption>' . __('Discussion') . '</caption>';
+        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 );
@@ -254 +297 @@
 
         echo '</tr><tr>';
 
-        // Pages
-        $num = number_format_i18n( $num_pages->publish );
-        $text = _n( 'Page', 'Pages', $num_pages->publish );
-        if ( current_user_can( 'edit_pages' ) ) {
-                $num = "<a href='edit.php?post_type=page'>$num</a>";
-                $text = "<a href='edit.php?post_type=page'>$text</a>";
-        }
-        echo '<td class="first b b_pages">' . $num . '</td>';
-        echo '<td class="t pages">' . $text . '</td>';
-
         // Approved Comments
         $num = '<span class="approved-count">' . number_format_i18n($num_comm->approved) . '</span>';
         $text = _nx( 'Approved', 'Approved', $num_comm->approved, 'Right Now' );
@@ -276 +309 @@
 
         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>';
         $text = _n( 'Pending', 'Pending', $num_comm->moderated );
@@ -298 +321 @@
 
         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
         $num = number_format_i18n($num_comm->spam);
         $text = _n( 'Spam', 'Spam', $num_comm->spam );
@@ -321 +334 @@
         echo "</tr>";
         do_action('right_now_table_end');
         echo "\n\t</table>\n\t</div>";
-
+        
         echo "\n\t".'<div class="versions">';
         $ct = current_theme_info();
 
@@ -418 +431 @@
                 <p class="submit">
                         <input type="hidden" name="action" id="quickpost-action" value="post-quickpress-save" />
                         <input type="hidden" name="quickpress_post_ID" value="<?php echo (int) $post->ID; ?>" />
-                        <input type="hidden" name="post_type" value="post" />
                         <?php wp_nonce_field('add-post'); ?>
                         <input type="submit" name="save" id="save-post" class="button" tabindex="4" value="<?php esc_attr_e('Save Draft'); ?>" />
                         <input type="reset" value="<?php esc_attr_e( 'Reset' ); ?>" class="button" />
@@ -995 +1007 @@
  */
 function wp_dashboard_empty() {}
 
-?>
+?>
+ No newline at end of file

wp-admin/css/dashboard.dev.css

@@ -91 +91 @@
 
 #dashboard_right_now .inside {
         font-size: 12px;
+        padding-top: 20px;
 }
 
-#dashboard_right_now p.sub {
+#dashboard_right_now caption {
         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: -26px;
+        left: 3px;
 }
 
 #dashboard_right_now .table {
+        width: 45%;
+        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;
+        position: relative;
 }
 
-#dashboard_right_now table {
-        width: 100%;
+#dashboard_right_now .table_content {
+        float: left;
+        border-right: #ececec 1px solid;
 }
 
+#dashboard_right_now .table_discussion {
+        float: right;
+        border-left: #ececec 1px solid;
+}
+
 #dashboard_right_now table  td {
         border-top: #ececec 1px solid;
         padding: 3px 0;
@@ -128 +140 @@
         text-align: right;
         font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
         font-size: 14px;
+        width: 1%;
 }
 
 #dashboard_right_now td.b a {
@@ -149 +162 @@
         white-space: nowrap;
 }
 
-#dashboard_right_now td.first,
-#dashboard_right_now td.last {
-        width: 1%;
-}
-
 #dashboard_right_now .spam {
         color: red;
 }
@@ -168 +176 @@
 
 #dashboard_right_now .versions {
         padding: 6px 10px 12px;
+        clear: left;
 }
 
 #dashboard_right_now .versions .b {
@@ -396 +405 @@
 .dashboard-comment-wrap {
         overflow: hidden;
         word-wrap: break-word;
-}
-
+}
+ No newline at end of file