Changeset 18696 for trunk/wp-includes/admin-bar.php

Timestamp:

09/17/2011 01:11:52 AM (14 years ago)

Author:

koopersmith

Message:

Improve comments item in admin bar. see #18197.

File:

• trunk/wp-includes/admin-bar.php (modified) (3 diffs)

trunk/wp-includes/admin-bar.php

@@ -191 +191 @@
         // Add blog links
         $blue_wp_logo_url = includes_url('images/wpmini-blue.png');
-    
+
         foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
             // Skip the current blog (unless we're in the network/user admin).
@@ -197 +197 @@
                 continue;
             }
-    
+
             // @todo Replace with some favicon lookup.
             //$blavatar = '<img src="' . esc_url( blavatar_url( blavatar_domain( $blog->siteurl ), 'img', 16, $blue_wp_logo_url ) ) . '" alt="Blavatar" width="16" height="16" />';
             $blavatar = '<img src="' . esc_url($blue_wp_logo_url) . '" alt="' . esc_attr__( 'Blavatar' ) . '" width="16" height="16" class="blavatar"/>';
-    
+
             $blogname = empty( $blog->blogname ) ? $blog->domain : $blog->blogname;
-    
+
             $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-' . $blog->userblog_id, 'title' => $blavatar . $blogname,  'href' => get_admin_url($blog->userblog_id) ) );
             $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-d', 'title' => __( 'Dashboard' ), 'href' => get_admin_url($blog->userblog_id) ) );
-    
+
             if ( current_user_can_for_blog( $blog->userblog_id, 'edit_posts' ) ) {
                 $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-n', 'title' => __( 'New Post' ), 'href' => get_admin_url($blog->userblog_id, 'post-new.php') ) );
                 $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-c', 'title' => __( 'Manage Comments' ), 'href' => get_admin_url($blog->userblog_id, 'edit-comments.php') ) );
             }
-    
+
             $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-v', 'title' => __( 'Visit Site' ), 'href' => get_home_url($blog->userblog_id) ) );
         }
@@ -359 +359 @@
 
     $awaiting_mod = wp_count_comments();
-    $awaiting_mod = number_format_i18n( $awaiting_mod->moderated );
-
-    $bubble  = "<div class='ab-comments-bubble'>";
-    $bubble .= "<div class='ab-comments-count'>$awaiting_mod</div>";
-    $bubble .= "<div class='ab-comments-arrow'></div>";
-    $bubble .= "</div>";
+    $awaiting_mod = $awaiting_mod->moderated;
+
+    $icon  = "<div class='ab-comments-icon'>";
+    $icon .= "<div class='ab-comments-icon-body'></div>";
+    $icon .= "<div class='ab-comments-icon-arrow'></div>";
+    $icon .= "</div>";
+
+    if ( $awaiting_mod )
+        $title = sprintf( _n('%d Comment', '%d Comments', $awaiting_mod ), number_format_i18n( $awaiting_mod ) );
+    else
+        $title = __('Comments');
 
     $wp_admin_bar->add_menu( array(
         'id'    => 'comments',
-        'title' => $bubble,
+        'title' => $icon . $title,
         'href'  => admin_url('edit-comments.php'),
     ) );