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

Timestamp:

11/23/2011 09:46:47 PM (14 years ago)

Author:

koopersmith

Message:

Admin Bar: Secondary is so passé. Groups are the new black. fixes #19136.

File:

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

trunk/wp-includes/admin-bar.php

@@ -91 +91 @@
     // Add WordPress.org link
     $wp_admin_bar->add_menu( array(
-        'parent'    => 'wp-logo',
-        'secondary' => true,
+        'parent'    => 'wp-logo-external',
         'id'        => 'wporg',
         'title'     => __('WordPress.org'),
@@ -100 +99 @@
     // Add codex link
     $wp_admin_bar->add_menu( array(
-        'parent'    => 'wp-logo',
-        'secondary' => true,
+        'parent'    => 'wp-logo-external',
         'id'        => 'documentation',
         'title'     => __('Documentation'),
@@ -109 +107 @@
     // Add forums link
     $wp_admin_bar->add_menu( array(
-        'parent'    => 'wp-logo',
-        'secondary' => true,
+        'parent'    => 'wp-logo-external',
         'id'        => 'support-forums',
         'title'     => __('Support Forums'),
@@ -118 +115 @@
     // Add feedback link
     $wp_admin_bar->add_menu( array(
-        'parent'    => 'wp-logo',
-        'secondary' => true,
+        'parent'    => 'wp-logo-external',
         'id'        => 'feedback',
         'title'     => __('Feedback'),
@@ -144 +140 @@
         $wp_admin_bar->add_menu( array(
             'id'        => 'my-account',
-            'secondary' => true,
+            'parent'    => 'top-secondary',
             'title'     => $howdy . $avatar,
             'href'      => $profile_url,
@@ -166 +162 @@
             'href'   => $profile_url,
             'meta'   => array(
-                'class' => 'user-info user-info-item',
                 'tabindex' => -1
             ),
@@ -175 +170 @@
             'title'  => __( 'Edit My Profile' ),
             'href' => $profile_url,
-            'meta'   => array(
-                'class' => 'user-info-item',
-            ),
         ) );
         $wp_admin_bar->add_menu( array(
@@ -184 +176 @@
             'title'  => __( 'Log Out' ),
             'href'   => wp_logout_url(),
-            'meta'   => array(
-                'class' => 'user-info-item',
-            ),
         ) );
     }
@@ -277 +266 @@
 
     if ( is_super_admin() ) {
-        $wp_admin_bar->add_menu( array(
+        $wp_admin_bar->add_group( array(
             'parent' => 'my-sites',
+            'id'     => 'my-sites-super-admin',
+        ) );
+
+        $wp_admin_bar->add_menu( array(
+            'parent' => 'my-sites-super-admin',
             'id'     => 'network-admin',
             'title'  => __('Network Admin'),
@@ -310 +304 @@
     }
 
-    // Add blog links
+    // Add site links
+    $wp_admin_bar->add_group( array(
+        'parent' => 'my-sites',
+        'id'     => 'my-sites-list',
+        'meta'   => array(
+            'class' => is_super_admin() ? 'ab-sub-secondary' : '',
+        ),
+    ) );
+
     $blue_wp_logo_url = includes_url('images/wpmini-blue.png');
 
@@ -322 +324 @@
 
         $wp_admin_bar->add_menu( array(
-            'parent'    => 'my-sites',
-            'secondary' => is_super_admin(),
+            'parent'    => 'my-sites-list',
             'id'        => $menu_id,
             'title'     => $blavatar . $blogname,
@@ -481 +482 @@
 
     if ( current_user_can( 'create_users' ) || current_user_can( 'promote_users' ) )
-        $actions[ 'user-new.php' ] = array( _x( 'User', 'add new from admin bar' ), 'new-user', true );
+        $actions[ 'user-new.php' ] = array( _x( 'User', 'add new from admin bar' ), 'new-user', 'new-secondary-object' );
 
     if ( ! $actions )
@@ -494 +495 @@
     foreach ( $actions as $link => $action ) {
         list( $title, $id ) = $action;
-        $secondary = ! empty( $action[2] );
-
-        $wp_admin_bar->add_menu( array(
-            'parent'    => 'new-content',
-            'secondary' => $secondary,
+        $parent = empty( $action[2] ) ? 'new-content' : $action[2];
+
+        $wp_admin_bar->add_menu( array(
+            'parent'    => $parent,
             'id'        => $id,
             'title'     => $title,
@@ -600 +600 @@
 
 /**
+ * Add secondary menus.
+ *
+ * @since 3.3.0
+ */
+function wp_admin_bar_add_secondary_groups( $wp_admin_bar ) {
+    $wp_admin_bar->add_group( array(
+        'id'     => 'top-secondary',
+        'meta'   => array(
+            'class' => 'ab-top-secondary',
+        ),
+    ) );
+
+    $wp_admin_bar->add_group( array(
+        'parent' => 'wp-logo',
+        'id'     => 'wp-logo-external',
+        'meta'   => array(
+            'class' => 'ab-sub-secondary',
+        ),
+    ) );
+
+    $wp_admin_bar->add_group( array(
+        'parent' => 'new-content',
+        'id'     => 'new-secondary-object',
+        'meta'   => array(
+            'class' => 'ab-sub-secondary',
+        ),
+    ) );
+}
+
+/**
  * Style and scripts for the admin bar.
  *