Changeset 33130 for trunk/src/wp-includes/admin-bar.php

Timestamp:

07/08/2015 08:02:44 PM (8 years ago)

Author:

helen

Message:

Toolbar: Disambiguate links to the dashboard vs. to the customizer.

All links in the site name menu now point to admin screens, and Customize is its own top-level link. This makes it clear which context you are about to enter.

fixes #32924. see #32678.

File:

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

trunk/src/wp-includes/admin-bar.php

@@ -317 +317 @@
         wp_admin_bar_appearance_menu( $wp_admin_bar );
     }
+}
+
+/**
+ * Add the "Customize" link.
+ *
+ * @since 4.3.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
+ */
+function wp_admin_bar_customize_menu( $wp_admin_bar ) {
+    // Don't show for users who can't access the customizer.
+    if ( ! current_user_can( 'customize' ) ) {
+        return;
+    }
+
+    $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+    $customize_url = add_query_arg( 'url', urlencode( $current_url ), wp_customize_url() );
+
+    $wp_admin_bar->add_menu( array(
+        'id'     => 'customize',
+        'title'  => __( 'Customize' ),
+        'href'   => $customize_url,
+        'meta'   => array(
+            'class' => 'hide-if-no-customize',
+        ),
+    ) );
+    add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' );
 }
 
@@ -665 +692 @@
     $wp_admin_bar->add_group( array( 'parent' => 'site-name', 'id' => 'appearance' ) );
 
-    $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
-    $customize_url = add_query_arg( 'url', urlencode( $current_url ), wp_customize_url() );
-
     if ( current_user_can( 'switch_themes' ) ) {
         $wp_admin_bar->add_menu( array(
@@ -674 +698 @@
             'title'  => __( 'Themes' ),
             'href'   => admin_url( 'themes.php' ),
-            'meta'   => array(
-                'class' => 'hide-if-customize',
-            ),
-        ) );
-
-        if ( current_user_can( 'customize' ) ) {
-            $wp_admin_bar->add_menu( array(
-                'parent' => 'appearance',
-                'id'     => 'customize-themes',
-                'title'  => __( 'Themes' ),
-                'href'   => add_query_arg( urlencode( 'autofocus[section]' ), 'themes', $customize_url ), // urlencode() needed due to #16859
-                'meta'   => array(
-                    'class' => 'hide-if-no-customize',
-                ),
-            ) );
-        }
-    }
-
-    if ( current_user_can( 'customize' ) ) {
-        $wp_admin_bar->add_menu( array(
-            'parent' => 'appearance',
-            'id'     => 'customize',
-            'title'  => __('Customize'),
-            'href'   => $customize_url,
-            'meta'   => array(
-                'class' => 'hide-if-no-customize',
-            ),
-        ) );
-        add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' );
+        ) );
     }
 
@@ -715 +711 @@
             'title'  => __( 'Widgets' ),
             'href'   => admin_url( 'widgets.php' ),
-            'meta'   => array(
-                'class' => 'hide-if-customize',
-            ),
-        ) );
-
-        if ( current_user_can( 'customize' ) ) {
-            $wp_admin_bar->add_menu( array(
-                'parent' => 'appearance',
-                'id'     => 'customize-widgets',
-                'title'  => __( 'Widgets' ),
-                'href'   => add_query_arg( urlencode( 'autofocus[panel]' ), 'widgets', $customize_url ), // urlencode() needed due to #16859
-                'meta'   => array(
-                    'class' => 'hide-if-no-customize',
-                ),
-            ) );
-        }
+        ) );
     }
 
@@ -746 +727 @@
             ),
         ) );
-
-        if ( current_user_can( 'customize' ) ) {
-            $wp_admin_bar->add_menu( array(
-                'parent' => 'appearance',
-                'id'     => 'customize-background',
-                'title'  => __( 'Background' ),
-                'href'   => add_query_arg( urlencode( 'autofocus[control]' ), 'background_image', $customize_url ), // urlencode() needed due to #16859
-                'meta'   => array(
-                    'class' => 'hide-if-no-customize',
-                ),
-            ) );
-        }
     }
 
@@ -770 +739 @@
             ),
         ) );
-
-        if ( current_user_can( 'customize' ) ) {
-            $wp_admin_bar->add_menu( array(
-                'parent' => 'appearance',
-                'id'     => 'customize-header',
-                'title'  => __( 'Header' ),
-                'href'   => add_query_arg( urlencode( 'autofocus[control]' ), 'header_image', $customize_url ), // urlencode() needed due to #16859
-                'meta'   => array(
-                    'class' => 'hide-if-no-customize',
-                ),
-            ) );
-        }
     }