Changeset 30459

Timestamp:

11/20/2014 03:28:55 PM (10 years ago)

Author:

ocean90

Message:

Customizer: Use deep-links for Backgrounds, Headers, and Widgets.

Replace links in admin menu and toolbar to Custom Background/Header screen with deep-links to the Customizer section.
On the Widgets screen display a link to the Customizer widgets panel.

props topher1kenobe, rzen, celloexpressions, westonruter
fixes #25569, #25571, #28032.

Location:

trunk/src

Files:

• wp-admin/css/admin-menu.css (modified) (1 diff)
• wp-admin/custom-background.php (modified) (1 diff)
• wp-admin/custom-header.php (modified) (1 diff)
• wp-admin/menu.php (modified) (1 diff)
• wp-admin/widgets.php (modified) (1 diff)
• wp-includes/admin-bar.php (modified) (2 diffs)

trunk/src/wp-admin/css/admin-menu.css

@@ -611 +611 @@
 }
 
+/* Hide-if-customize for items we can't add classes to */
+.customize-support #menu-appearance a[href="themes.php?page=custom-header"],
+.customize-support #menu-appearance a[href="themes.php?page=custom-background"] {
+    display: none;
+}
 
 /* Auto-folding of the admin menu */

trunk/src/wp-admin/custom-background.php

@@ -238 +238 @@
 <div class="wrap" id="custom-background">
 <h2><?php _e( 'Custom Background' ); ?></h2>
+
+<?php if ( current_user_can( 'customize' ) ) { ?>
+<div class="update-nag hide-if-no-customize">
+    <p>
+        <?php
+        printf(
+            __( 'You can now manage and live-preview Custom Backgrounds in the <a href="%1$s">Customizer</a>.' ),
+            admin_url( 'customize.php?autofocus[control]=background_image' )
+        );
+        ?>
+    </p>
+</div>
+<?php } ?>
 
 <?php if ( ! empty( $this->updated ) ) { ?>

trunk/src/wp-admin/custom-header.php

@@ -525 +525 @@
 <h2><?php _e( 'Custom Header' ); ?></h2>
 
+<?php if ( current_user_can( 'customize' ) ) { ?>
+<div class="update-nag hide-if-no-customize">
+    <p>
+        <?php
+        printf(
+            __( 'You can now manage and live-preview Custom Header in the <a href="%1$s">Customizer</a>.' ),
+            admin_url( 'customize.php?autofocus[control]=header_image' )
+        );
+        ?>
+    </p>
+</div>
+<?php } ?>
+
 <?php if ( ! empty( $this->updated ) ) { ?>
 <div id="message" class="updated">

trunk/src/wp-admin/menu.php

@@ -153 +153 @@
     $customize_url = add_query_arg( 'return', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), 'customize.php' );
     $submenu['themes.php'][6] = array( __( 'Customize' ), 'customize', $customize_url, '', 'hide-if-no-customize' );
-    unset( $customize_url );
+
     if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) ) {
         $submenu['themes.php'][10] = array(__( 'Menus' ), 'edit_theme_options', 'nav-menus.php');
     }
+
+    if ( current_theme_supports( 'custom-header' ) && current_user_can( 'customize') ) {
+        $customize_header_url = add_query_arg( 'autofocus[control]', 'header_image', $customize_url );
+        $submenu['themes.php'][15] = array( __( 'Header' ), $appearance_cap, $customize_header_url, '', 'hide-if-no-customize' );
+    }
+
+    if ( current_theme_supports( 'custom-background' ) && current_user_can( 'customize') ) {
+        $customize_background_url = add_query_arg( 'autofocus[control]', 'background_image', $customize_url );
+        $submenu['themes.php'][20] = array( __( 'Background' ), $appearance_cap, $customize_background_url, '', 'hide-if-no-customize' );
+    }
+
+    unset( $customize_url );
 
 unset( $appearance_cap );

trunk/src/wp-admin/widgets.php

@@ -311 +311 @@
 
 <div class="wrap">
-<h2><?php echo esc_html( $title ); ?></h2>
+<h2>
+<?php
+    echo esc_html( $title );
+    if ( current_user_can( 'customize' ) ) {
+        printf(
+            ' <a class="add-new-h2 hide-if-no-customize" href="%1$s">%2$s</a>',
+            admin_url( 'customize.php?autofocus[panel]=widgets' ),
+            __( 'Manage in Customizer' )
+        );
+    }
+?>
+</h2>
 
 <?php if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) { ?>

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

@@ -663 +663 @@
         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() );
     if ( current_user_can( 'customize' ) ) {
-        $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
         $wp_admin_bar->add_menu( array(
             'parent' => 'appearance',
             'id'     => 'customize',
             'title'  => __('Customize'),
-            'href'   => add_query_arg( 'url', urlencode( $current_url ), wp_customize_url() ),
+            'href'   => $customize_url,
             'meta'   => array(
                 'class' => 'hide-if-no-customize',
@@ -683 +684 @@
         $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'menus', 'title' => __('Menus'), 'href' => admin_url('nav-menus.php') ) );
 
-    if ( current_theme_supports( 'custom-background' ) )
-        $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'background', 'title' => __('Background'), 'href' => admin_url('themes.php?page=custom-background') ) );
-
-    if ( current_theme_supports( 'custom-header' ) )
-        $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'header', 'title' => __('Header'), 'href' => admin_url('themes.php?page=custom-header') ) );
+    if ( current_theme_supports( 'custom-background' ) ) {
+        $wp_admin_bar->add_menu( array(
+            'parent' => 'appearance',
+            'id'     => 'background',
+            'title'  => __( 'Background' ),
+            'href'   => admin_url( 'themes.php?page=custom-background' ),
+            'meta'   => array(
+                'class' => 'hide-if-customize',
+            ),
+        ) );
+
+        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',
+                ),
+            ) );
+        }
+    }
+
+    if ( current_theme_supports( 'custom-header' ) ) {
+        $wp_admin_bar->add_menu( array(
+            'parent' => 'appearance',
+            'id'     => 'header',
+            'title'  => __( 'Header' ),
+            'href'   => admin_url( 'themes.php?page=custom-header' ),
+            'meta'   => array(
+                'class' => 'hide-if-customize',
+            ),
+        ) );
+
+        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',
+                ),
+            ) );
+        }
+    }
+
 }