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

Timestamp:

11/11/2010 08:02:52 PM (16 years ago)

Author:

ryan

Message:

Admin bar fixes. Props ocean90. see #14772

File:

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

trunk/wp-includes/admin-bar.php

@@ -111 +111 @@
         global $wpdb, $wp_admin_bar;
 
-        /* Add the 'My Dashboards' menu if the user has more than one site. */
+        /* Add the 'My Sites' menu if the user has more than one site. */
         if ( count( $wp_admin_bar->user->blogs ) <= 1 )
                 return;
@@ -125 +125 @@
 
                 $marker = '';
-                if ( strlen($blog->blogname) > 35 )
+                if ( strlen($blog->blogname) > 15 )
                         $marker = '...';
 
@@ -131 +131 @@
                         $blogname = $blog->domain;
                 else
-                        $blogname = substr( $blog->blogname, 0, 35 ) . $marker;
+                        $blogname = substr( $blog->blogname, 0, 15 ) . $marker;
 
                 if ( ! isset( $blog->visible ) || $blog->visible === true ) {
@@ -221 +221 @@
         $awaiting_mod = $awaiting_mod->moderated;
 
-        // @todo styling for awaiting mod count. Don't show count if zero?
-        $wp_admin_bar->add_menu( array( 'id' => 'comments', 'title' => sprintf( __('Comments %s'), "<span id='awaiting-mod' class='count-$awaiting_mod'><span class='pending-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'href' => admin_url('edit-comments.php') ) );
+        $wp_admin_bar->add_menu( array( 'id' => 'comments', 'title' => sprintf( __('Comments %s'), "<span id='ab-awaiting-mod' class='count-$awaiting_mod'><span class='pending-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'href' => admin_url('edit-comments.php') ) );
 }
 
@@ -228 +227 @@
         global $wp_admin_bar;
 
-        if ( !current_user_can('switch themes') )
+        if ( !current_user_can('switch_themes') )
                 return;
 
@@ -277 +276 @@
         $update_title = !empty($update_title) ? esc_attr(implode(', ', $update_title)) : '';
 
-        $update_title = sprintf( __('Updates %s'), "<span class='update-plugins count-$update_count' title='$update_title'><span class='update-count'>" . number_format_i18n($update_count) . "</span></span>" );
-
-        // @todo styling for awaiting mod count. Don't show count if zero?
+        $update_title = sprintf( __('Updates %s'), "<span id='ab-updates' class='count-$update_count' title='$update_title'><span class='update-count'>" . number_format_i18n($update_count) . "</span></span>" );
+
         $wp_admin_bar->add_menu( array( 'id' => 'updates', 'title' => $update_title, 'href' => admin_url('update-core.php') ) );
 }