WordPress 4.3

[autoinstalls/wordpress.git] / wp-admin / customize.php

diff --git a/wp-admin/customize.php b/wp-admin/customize.php
index c8bd6e3c2e27c59b3f75918cdf331014a54f974b..6ee2de007af3c64a6a651e9756cc908c8aecd66e 100644 (file)
--- a/wp-admin/customize.php
+++ b/wp-admin/customize.php
@@ -33,6 +33,10 @@ if ( ! $return ) {
        }
 }
 
        }
 }
 

+/**
+ * @global WP_Scripts           $wp_scripts
+ * @global WP_Customize_Manager $wp_customize
+ */

 global $wp_scripts, $wp_customize;
 
 $registered = $wp_scripts->registered;
 global $wp_scripts, $wp_customize;
 
 $registered = $wp_scripts->registered;


@@ -119,38 +123,31 @@ do_action( 'customize_controls_print_scripts' );
 <div class="wp-full-overlay expanded">
        <form id="customize-controls" class="wrap wp-full-overlay-sidebar">
                <div id="customize-header-actions" class="wp-full-overlay-header">
 <div class="wp-full-overlay expanded">
        <form id="customize-controls" class="wrap wp-full-overlay-sidebar">
                <div id="customize-header-actions" class="wp-full-overlay-header">

-                       <div class="primary-actions">
-                               <?php
-                                       $save_text = $wp_customize->is_theme_active() ? __( 'Save &amp; Publish' ) : __( 'Save &amp; Activate' );
-                                       submit_button( $save_text, 'primary save', 'save', false );
-                               ?>
-                               <span class="spinner"></span>
-                               <a class="customize-controls-preview-toggle" href="#">
-                                       <span class="controls"><?php _e( 'Customize' ); ?></span>
-                                       <span class="preview"><?php _e( 'Preview' ); ?></span>
-                               </a>
-                               <a class="customize-controls-close" href="<?php echo esc_url( $return ); ?>">
-                                       <span class="screen-reader-text"><?php _e( 'Cancel' ); ?></span>
-                               </a>
-                               <span class="control-panel-back" tabindex="-1"><span class="screen-reader-text"><?php _e( 'Back' ); ?></span></span>
-                       </div>
-                       <div class="secondary-actions">
-                               <button type="button" class="customize-overlay-close">
-                                       <span class="screen-reader-text"><?php _e( 'Close overlay' ); ?></span>
-                               </button>
-                       </div>
+                       <?php
+                       $save_text = $wp_customize->is_theme_active() ? __( 'Save &amp; Publish' ) : __( 'Save &amp; Activate' );
+                       submit_button( $save_text, 'primary save', 'save', false );
+                       ?>
+                       <span class="spinner"></span>
+                       <a class="customize-controls-preview-toggle" href="#">
+                               <span class="controls"><?php _e( 'Customize' ); ?></span>
+                               <span class="preview"><?php _e( 'Preview' ); ?></span>
+                       </a>
+                       <a class="customize-controls-close" href="<?php echo esc_url( $return ); ?>">
+                               <span class="screen-reader-text"><?php _e( 'Cancel' ); ?></span>
+                       </a>

                </div>
 
                <div id="widgets-right"><!-- For Widget Customizer, many widgets try to look for instances under div#widgets-right, so we have to add that ID to a container div in the Customizer for compat -->
                <div class="wp-full-overlay-sidebar-content" tabindex="-1">
                </div>
 
                <div id="widgets-right"><!-- For Widget Customizer, many widgets try to look for instances under div#widgets-right, so we have to add that ID to a container div in the Customizer for compat -->
                <div class="wp-full-overlay-sidebar-content" tabindex="-1">

-                       <div id="customize-info" class="accordion-section">
-                               <div class="accordion-section-title" aria-label="<?php esc_attr_e( 'Customizer Options' ); ?>" tabindex="0">
+                       <div id="customize-info" class="accordion-section customize-info">
+                               <div class="accordion-section-title" aria-label="<?php esc_attr_e( 'Customizer Options' ); ?>">

                                        <span class="preview-notice"><?php
                                        <span class="preview-notice"><?php

-                                               echo sprintf( __( 'You are customizing %s' ), '<strong class="theme-name site-title">' . get_bloginfo( 'name' ) . '</strong>' );
+                                               echo sprintf( __( 'You are customizing %s' ), '<strong class="panel-title site-title">' . get_bloginfo( 'name' ) . '</strong>' );

                                        ?></span>
                                        ?></span>

+                                       <button class="customize-help-toggle dashicons dashicons-editor-help" aria-expanded="false"><span class="screen-reader-text"><?php _e( 'Help' ); ?></span></button>

                                </div>
                                </div>

-                               <div class="accordion-section-content"><?php
-                                       echo __( 'The Customizer allows you to preview changes to your site before publishing them. You can also navigate to different pages on your site to preview them.' );
+                               <div class="customize-panel-description"><?php
+                                       _e( 'The Customizer allows you to preview changes to your site before publishing them. You can also navigate to different pages on your site to preview them.' );

                                ?></div>
                        </div>
 
                                ?></div>
                        </div>
 


@@ -161,16 +158,18 @@ do_action( 'customize_controls_print_scripts' );
                </div>
 
                <div id="customize-footer-actions" class="wp-full-overlay-footer">
                </div>
 
                <div id="customize-footer-actions" class="wp-full-overlay-footer">

-                       <a href="#" class="collapse-sidebar button-secondary" title="<?php esc_attr_e('Collapse Sidebar'); ?>">
+                       <button type="button" class="collapse-sidebar button-secondary" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">

                                <span class="collapse-sidebar-arrow"></span>
                                <span class="collapse-sidebar-arrow"></span>

-                               <span class="collapse-sidebar-label"><?php _e('Collapse'); ?></span>
-                       </a>
+                               <span class="collapse-sidebar-label"><?php _e( 'Collapse' ); ?></span>
+                       </button>

                </div>
        </form>
        <div id="customize-preview" class="wp-full-overlay-main"></div>
        <?php
 
                </div>
        </form>
        <div id="customize-preview" class="wp-full-overlay-main"></div>
        <?php
 

-       // Render control templates.
+       // Render Panel, Section, and Control templates.
+       $wp_customize->render_panel_templates();
+       $wp_customize->render_section_templates();

        $wp_customize->render_control_templates();
 
        /**
        $wp_customize->render_control_templates();
 
        /**


@@ -206,14 +205,6 @@ do_action( 'customize_controls_print_scripts' );
         */
        $allowed_urls = array_unique( apply_filters( 'customize_allowed_urls', $allowed_urls ) );
 
         */
        $allowed_urls = array_unique( apply_filters( 'customize_allowed_urls', $allowed_urls ) );
 

-       $fallback_url = add_query_arg( array(
-               'preview'        => 1,
-               'template'       => $wp_customize->get_template(),
-               'stylesheet'     => $wp_customize->get_stylesheet(),
-               'preview_iframe' => true,
-               'TB_iframe'      => 'true'
-       ), home_url( '/' ) );
-

        $login_url = add_query_arg( array(
                'interim-login' => 1,
                'customize-login' => 1
        $login_url = add_query_arg( array(
                'interim-login' => 1,
                'customize-login' => 1


@@ -232,7 +223,6 @@ do_action( 'customize_controls_print_scripts' );
                        'ajax'          => esc_url_raw( admin_url( 'admin-ajax.php', 'relative' ) ),
                        'allowed'       => array_map( 'esc_url_raw', $allowed_urls ),
                        'isCrossDomain' => $cross_domain,
                        'ajax'          => esc_url_raw( admin_url( 'admin-ajax.php', 'relative' ) ),
                        'allowed'       => array_map( 'esc_url_raw', $allowed_urls ),
                        'isCrossDomain' => $cross_domain,

-                       'fallback'      => esc_url_raw( $fallback_url ),

                        'home'          => esc_url_raw( home_url( '/' ) ),
                        'login'         => esc_url_raw( $login_url ),
                ),
                        'home'          => esc_url_raw( home_url( '/' ) ),
                        'login'         => esc_url_raw( $login_url ),
                ),


@@ -254,28 +244,38 @@ do_action( 'customize_controls_print_scripts' );
 
        // Prepare Customize Setting objects to pass to JavaScript.
        foreach ( $wp_customize->settings() as $id => $setting ) {
 
        // Prepare Customize Setting objects to pass to JavaScript.
        foreach ( $wp_customize->settings() as $id => $setting ) {

-               $settings['settings'][ $id ] = array(
-                       'value'     => $setting->js_value(),
-                       'transport' => $setting->transport,
-                       'dirty'     => $setting->dirty,
-               );
+               if ( $setting->check_capabilities() ) {
+                       $settings['settings'][ $id ] = array(
+                               'value'     => $setting->js_value(),
+                               'transport' => $setting->transport,
+                               'dirty'     => $setting->dirty,
+                       );
+               }

        }
 
        // Prepare Customize Control objects to pass to JavaScript.
        foreach ( $wp_customize->controls() as $id => $control ) {
        }
 
        // Prepare Customize Control objects to pass to JavaScript.
        foreach ( $wp_customize->controls() as $id => $control ) {

-               $settings['controls'][ $id ] = $control->json();
+               if ( $control->check_capabilities() ) {
+                       $settings['controls'][ $id ] = $control->json();
+               }

        }
 
        // Prepare Customize Section objects to pass to JavaScript.
        foreach ( $wp_customize->sections() as $id => $section ) {
        }
 
        // Prepare Customize Section objects to pass to JavaScript.
        foreach ( $wp_customize->sections() as $id => $section ) {

-               $settings['sections'][ $id ] = $section->json();
+               if ( $section->check_capabilities() ) {
+                       $settings['sections'][ $id ] = $section->json();
+               }

        }
 
        // Prepare Customize Panel objects to pass to JavaScript.
        }
 
        // Prepare Customize Panel objects to pass to JavaScript.

-       foreach ( $wp_customize->panels() as $id => $panel ) {
-               $settings['panels'][ $id ] = $panel->json();
-               foreach ( $panel->sections as $section_id => $section ) {
-                       $settings['sections'][ $section_id ] = $section->json();
+       foreach ( $wp_customize->panels() as $panel_id => $panel ) {
+               if ( $panel->check_capabilities() ) {
+                       $settings['panels'][ $panel_id ] = $panel->json();
+                       foreach ( $panel->sections as $section_id => $section ) {
+                               if ( $section->check_capabilities() ) {
+                                       $settings['sections'][ $section_id ] = $section->json();
+                               }
+                       }

                }
        }
 
                }
        }