Changeset 4586 for trunk/bp-members/bp-members-adminbar.php

Timestamp:

07/04/2011 05:37:22 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Admin bar and navigation tweaks:

• Add Displayed user/Displayed group avatars and names to moderation menus.
• Add WP admin bar sprites and custom CSS for new admin bar items.
• Audit text of navigation elements and remove references to "My" or "Your" as needed.
• Add missing WP core functions to root blog menu item.

File:

• trunk/bp-members/bp-members-adminbar.php (modified) (9 diffs)

trunk/bp-members/bp-members-adminbar.php

@@ -22 +22 @@
         return;
 
-    // Create the root blog menu
-    $wp_admin_bar->add_menu( array(
-        'id'    => 'bp-root-blog',
-        'title' => get_blog_option( BP_ROOT_BLOG, 'blogname' ),
-        'href'  => bp_get_root_domain()
-    ) );
-
     // Logged in user
     if ( is_user_logged_in() ) {
-
-        // Dashboard links
-        if ( is_super_admin() ) {
-
-            // Add site admin link
-            $wp_admin_bar->add_menu( array(
-                'parent' => 'bp-root-blog',
-                'title'  => __( 'Admin Dashboard', 'buddypress' ),
-                'href'   => get_admin_url( BP_ROOT_BLOG )
-            ) );
-
-            // Add network admin link
-            if ( is_multisite() ) {
-
-                // Link to the network admin dashboard
-                $wp_admin_bar->add_menu( array(
-                    'parent' => 'bp-root-blog',
-                    'title'  => __( 'Network Dashboard', 'buddypress' ),
-                    'href'   => network_admin_url()
-                ) );
-            }
-        }
 
         // User avatar
@@ -68 +39 @@
         $wp_admin_bar->add_menu( array(
             'id'    => $bp->my_account_menu_id,
-            'title' => $avatar . bp_get_user_firstname( $bp->loggedin_user->fullname ),
+            'title' => $avatar . bp_get_loggedin_user_fullname(),
             'href'  => $bp->loggedin_user->domain
         ) );
@@ -103 +74 @@
  */
 function bp_members_user_admin_menu() {
-    global $wp_admin_bar;
+    global $bp, $wp_admin_bar;
 
     // Only show if viewing a user
@@ -113 +84 @@
         return false;
 
+    // User avatar
+    $avatar = bp_core_fetch_avatar( array(
+        'item_id' => $bp->displayed_user->id,
+        'email'   => $bp->displayed_user->userdata->user_email,
+        'width'   => 16,
+        'height'  => 16
+    ) );
+
+    // Unique ID for the 'My Account' menu
+    $bp->user_admin_menu_id = ( ! empty( $avatar ) ) ? 'user-admin-with-avatar' : 'user-admin';
+
     // Add the top-level User Admin button
     $wp_admin_bar->add_menu( array(
-        'id'    => 'user-admin',
-        'title' => __( 'User Admin', 'buddypress' ),
+        'id'    => $bp->user_admin_menu_id,
+        'title' => $avatar . bp_get_displayed_user_fullname(),
         'href'  => bp_displayed_user_domain()
     ) );
@@ -122 +104 @@
     // User Admin > Edit this user's profile
     $wp_admin_bar->add_menu( array(
-        'parent' => 'user-admin',
+        'parent' => $bp->user_admin_menu_id,
         'id'     => 'edit-profile',
-        'title'  => sprintf( __( "Edit %s's Profile", 'buddypress' ), bp_get_displayed_user_fullname() ),
+        'title'  => __( "Edit Profile", 'buddypress' ),
         'href'   => bp_get_members_component_link( 'profile', 'edit' )
     ) );
@@ -130 +112 @@
     // User Admin > Edit this user's avatar
     $wp_admin_bar->add_menu( array(
-        'parent' => 'user-admin',
+        'parent' => $bp->user_admin_menu_id,
         'id'     => 'change-avatar',
-        'title'  => sprintf( __( "Edit %s's Avatar", 'buddypress' ), bp_get_displayed_user_fullname() ),
-        'href'   => bp_get_members_component_link( 'profile', 'change-avatar' )
-    ) );
-    
-    // User Admin > Edit this user's avatar
-    $wp_admin_bar->add_menu( array(
-        'parent' => 'user-admin',
-        'id'     => 'change-avatar',
-        'title'  => sprintf( __( "Edit %s's Avatar", 'buddypress' ), bp_get_displayed_user_fullname() ),
+        'title'  => __( "Edit Avatar", 'buddypress' ),
         'href'   => bp_get_members_component_link( 'profile', 'change-avatar' )
     ) );
@@ -147 +121 @@
     if ( !bp_core_is_user_spammer( bp_displayed_user_id() ) ) {
         $wp_admin_bar->add_menu( array(
-            'parent' => 'user-admin',
+            'parent' => $bp->user_admin_menu_id,
             'id'     => 'spam-user',
-            'title'  => __( "Mark as Spammer", 'buddypress' ),
+            'title'  => __( 'Mark as Spammer', 'buddypress' ),
             'href'   => wp_nonce_url( bp_displayed_user_domain() . 'admin/mark-spammer/', 'mark-unmark-spammer' ),
             'meta'   => array( 'onclick' => 'confirm(" ' . __( 'Are you sure you want to mark this user as a spammer?', 'buddypress' ) . '");' ) 
@@ -155 +129 @@
     } else {
         $wp_admin_bar->add_menu( array(
-            'parent' => 'user-admin',
+            'parent' => $bp->user_admin_menu_id,
             'id'     => 'unspam-user',
-            'title'  => __( "Not a Spammer", 'buddypress' ),
+            'title'  => __( 'Not a Spammer', 'buddypress' ),
             'href'   => wp_nonce_url( bp_displayed_user_domain() . 'admin/unmark-spammer/', 'mark-unmark-spammer' ),
             'meta'   => array( 'onclick' => 'confirm(" ' . __( 'Are you sure you want to mark this user as not a spammer?', 'buddypress' ) . '");' ) 
@@ -165 +139 @@
     // User Admin > Delete Account
     $wp_admin_bar->add_menu( array(
-        'parent' => 'user-admin',
+        'parent' => $bp->user_admin_menu_id,
         'id'     => 'delete-user',
-        'title'  => sprintf( __( "Delete %s's Account", 'buddypress' ), bp_get_displayed_user_fullname() ),
+        'title'  => __( 'Delete Account', 'buddypress' ),
         'href'   => wp_nonce_url( bp_displayed_user_domain() . 'admin/delete-user/', 'delete-user' ),
         'meta'   => array( 'onclick' => 'confirm(" ' . __( "Are you sure you want to delete this user's account?", 'buddypress' ) . '");' )