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

Timestamp:

12/13/2010 08:35:28 PM (14 years ago)

Author:

ryan

Message:

Admin bar sprite cleanups. Props ocean90, darrenmeehan. see #15611

File:

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

trunk/wp-includes/admin-bar.php

@@ -68 +68 @@
 
 /**
- * Show the logged in user's gravatar as a separator.
- *
- * @since 3.1.0
- */
-function wp_admin_bar_me_separator() {
-    global $wp_admin_bar;
-    $user_id = get_current_user_id();
-    if ( 0 != $user_id )
-        $wp_admin_bar->add_menu( array( 'id' => 'me', 'title' => get_avatar( get_current_user_id(), 16 ), 'href' => get_edit_profile_url( $user_id ), ) );
-}
-
-/**
  * Add the "My Account" menu and all submenus.
  *
@@ -91 +79 @@
     if ( 0 != $user_id ) {
         /* Add the 'My Account' menu */
-        $wp_admin_bar->add_menu( array( 'id' => 'my-account', 'title' => $user_identity,  'href' => get_edit_profile_url( $user_id ) ) );
+        $avatar = get_avatar( get_current_user_id(), 16 );
+        $wp_admin_bar->add_menu( array( 'id' => 'my-account', 'title' => $avatar . $user_identity,  'href' => get_edit_profile_url( $user_id ) ) );
 
         /* Add the "My Account" sub menus */
@@ -148 +137 @@
 
 /**
- * Show the blavatar of the current site as a separator.
- *
- * @since 3.1.0
- */
-function wp_admin_bar_blog_separator() {
-    global $wp_admin_bar, $current_blog;
-    $default = includes_url('images/wpmini-blue.png');
-    $wp_admin_bar->add_menu( array( 'id' => 'blog', 'title' => '<img class="avatar" src="' . $default . '" alt="' . esc_attr__( 'Current site avatar' ) . '" width="16" height="16" />',  'href' => home_url(), ) );
-}
-
-
-/**
  * Provide a shortlink.
  *
@@ -193 +170 @@
 }
 
+/**
+ * Add "Add New" menu.
+ *
+ * @since 3.1.0
+ */
 function wp_admin_bar_new_content_menu() {
     global $wp_admin_bar;
@@ -200 +182 @@
         if ( true !== $ptype_obj->show_in_menu || ! current_user_can( $ptype_obj->cap->edit_posts ) )
             continue;
+
         $actions[ 'post-new.php?post_type=' . $ptype_obj->name ] = array( $ptype_obj->labels->singular_name, $ptype_obj->cap->edit_posts, 'new-' . $ptype_obj->name );
     }
@@ -213 +196 @@
 }
 
+/**
+ * Add edit comments link with awaiting moderation count bubble.
+ *
+ * @since 3.1.0
+ */
 function wp_admin_bar_comments_menu() {
     global $wp_admin_bar;
@@ -226 +214 @@
 }
 
+/**
+ * Add "Appearance" menu with widget and nav menu submenu.
+ *
+ * @since 3.1.0
+ */
 function wp_admin_bar_appearance_menu() {
     global $wp_admin_bar;
@@ -244 +237 @@
 }
 
+/**
+ * Provide an update link if theme/plugin/core updates are available.
+ *
+ * @since 3.1.0
+ */
 function wp_admin_bar_updates_menu() {
     global $wp_admin_bar;