Changes from branches/2.7/wp-admin/includes/dashboard.php at r10299 to trunk/wp-admin/includes/dashboard.php at r10154

File:

• trunk/wp-admin/includes/dashboard.php (modified) (6 diffs)

trunk/wp-admin/includes/dashboard.php

@@ -182 +182 @@
     // Posts
     $num = number_format_i18n( $num_posts->publish );
-    $text = __ngettext( 'Post', 'Posts', intval($num_posts->publish) );
-    if ( current_user_can( 'edit_posts' ) ) {
-        $num = "<a href='edit.php'>$num</a>";
-        $text = "<a href='edit.php'>$text</a>";
-    }
-    echo '<td class="first b b-posts">' . $num . '</td>';
-    echo '<td class="t posts">' . $text . '</td>';
+    if ( current_user_can( 'edit_posts' ) )
+        $text = "<a href='edit.php'>$num</a>";
+    else
+        $text = $num;
+    echo '<td class="first b b-posts">' . $text . '</td>';
+    echo '<td class="t posts">' . __ngettext( 'Post', 'Posts', intval($num_posts->publish) ) . '</td>';
     /* 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
@@ -208 +207 @@
     // Total Comments
     $num = number_format_i18n($num_comm->total_comments);
-    $text = __ngettext( 'Comment', 'Comments', $num_comm->total_comments );
-    if ( current_user_can( 'moderate_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 '<td class="b b-comments">'.$num.'</td>';
+    echo '<td class="last t comments">' . __ngettext( 'Comment', 'Comments', $num_comm->total_comments ) . '</td>';
 
     echo '</tr><tr>';
@@ -220 +216 @@
     // Pages
     $num = number_format_i18n( $num_pages->publish );
-    $text = __ngettext( 'Page', 'Pages', $num_pages->publish );
-    if ( current_user_can( 'edit_pages' ) ) {
+    if ( current_user_can( 'edit_pages' ) )
         $num = "<a href='edit-pages.php'>$num</a>";
-        $text = "<a href='edit-pages.php'>$text</a>";
-    }
-    echo '<td class="first b b_pages">' . $num . '</td>';
-    echo '<td class="t pages">' . $text . '</td>';
+    echo '<td class="first b b_pages">'.$num.'</td>';
+    echo '<td class="t pages">' . __ngettext( 'Page', 'Pages', $num_pages->publish ) . '</td>';
 
     // Approved Comments
     $num = number_format_i18n($num_comm->approved);
-    $text = __ngettext( 'Approved', 'Approved', $num_comm->approved );
-    if ( current_user_can( 'moderate_comments' ) ) {
+    if ( current_user_can( 'moderate_comments' ) )
         $num = "<a href='edit-comments.php?comment_status=approved'>$num</a>";
-        $text = "<a class='approved' href='edit-comments.php?comment_status=approved'>$text</a>";
-    }
-    echo '<td class="b b_approved">' . $num . '</td>';
-    echo '<td class="last t">' . $text . '</td>';
+    echo '<td class="b b_approved">'.$num.'</td>';
+    echo '<td class="last t approved">' . __ngettext( 'Approved', 'Approved', $num_comm->approved ) . '</td>';
 
     echo "</tr>\n\t<tr>";
@@ -242 +232 @@
     // Categories
     $num = number_format_i18n( $num_cats );
-    $text = __ngettext( 'Category', 'Categories', $num_cats );
-    if ( current_user_can( 'manage_categories' ) ) {
+    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 '<td class="first b b-cats">'.$num.'</td>';
+    echo '<td class="t cats">' . __ngettext( 'Category', 'Categories', $num_cats ) . '</td>';
 
     // Pending Comments
     $num = number_format_i18n($num_comm->moderated);
-    $text = __ngettext( 'Pending', 'Pending', $num_comm->moderated );
-    if ( current_user_can( 'moderate_comments' ) ) {
+    if ( current_user_can( 'moderate_comments' ) )
         $num = "<a href='edit-comments.php?comment_status=moderated'><span class='pending-count'>$num</span></a>";
-        $text = "<a class='waiting' href='edit-comments.php?comment_status=moderated'>$text</a>";
-    }
-    echo '<td class="b b-waiting">' . $num . '</td>';
-    echo '<td class="last t">' . $text . '</td>';
+    echo '<td class="b b-waiting">'.$num.'</td>';
+    echo '<td class="last t waiting">' . __ngettext( 'Pending', 'Pending', $num_comm->moderated ) . '</td>';
 
     echo "</tr>\n\t<tr>";
@@ -264 +248 @@
     // Tags
     $num = number_format_i18n( $num_tags );
-    $text = __ngettext( 'Tag', 'Tags', $num_tags );
-    if ( current_user_can( 'manage_categories' ) ) {
+    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 '<td class="first b b-tags">'.$num.'</td>';
+    echo '<td class="t tags">' . __ngettext( 'Tag', 'Tags', $num_tags ) . '</td>';
 
     // Spam Comments
     $num = number_format_i18n($num_comm->spam);
-    $text = __ngettext( 'Spam', 'Spam', $num_comm->spam );
-    if ( current_user_can( 'moderate_comments' ) ) {
+    if ( current_user_can( 'moderate_comments' ) )
         $num = "<a href='edit-comments.php?comment_status=spam'><span class='spam-count'>$num</span></a>";
-        $text = "<a class='spam' href='edit-comments.php?comment_status=spam'>$text</a>";
-    }
-    echo '<td class="b b-spam">' . $num . '</td>';
-    echo '<td class="last t">' . $text . '</td>';
+    echo '<td class="b b-spam">'.$num.'</td>';
+    echo '<td class="last t spam">' . __ngettext( 'Spam', 'Spam', $num_comm->spam ) . '</td>';
 
     echo "</tr>";
@@ -304 +282 @@
     update_right_now_message();
 
-    echo "\n\t".'<br class="clear" /></div>';
+    echo "\n\t".'</div>';
     do_action( 'rightnow_end' );
     do_action( 'activity_box_end' );