--- a/wp/wp-admin/customize.php Mon Jun 08 16:11:51 2015 +0000
+++ b/wp/wp-admin/customize.php Tue Jun 09 03:35:32 2015 +0200
@@ -1,6 +1,6 @@
<?php
/**
- * Customize Controls
+ * Theme Customize Screen.
*
* @package WordPress
* @subpackage Customize
@@ -9,17 +9,29 @@
define( 'IFRAME_REQUEST', true );
+/** Load WordPress Administration Bootstrap */
require_once( dirname( __FILE__ ) . '/admin.php' );
-if ( ! current_user_can( 'edit_theme_options' ) )
- wp_die( __( 'Cheatin’ uh?' ) );
+
+if ( ! current_user_can( 'customize' ) ) {
+ wp_die( __( 'Cheatin’ uh?' ), 403 );
+}
wp_reset_vars( array( 'url', 'return' ) );
-$url = urldecode( $url );
+$url = wp_unslash( $url );
$url = wp_validate_redirect( $url, home_url( '/' ) );
-if ( $return )
- $return = wp_validate_redirect( urldecode( $return ) );
-if ( ! $return )
- $return = $url;
+if ( $return ) {
+ $return = wp_unslash( $return );
+ $return = wp_validate_redirect( $return );
+}
+if ( ! $return ) {
+ if ( $url ) {
+ $return = $url;
+ } elseif ( current_user_can( 'edit_theme_options' ) || current_user_can( 'switch_themes' ) ) {
+ $return = admin_url( 'themes.php' );
+ } else {
+ $return = admin_url();
+ }
+}
global $wp_scripts, $wp_customize;
@@ -41,8 +53,6 @@
wp_enqueue_script( 'customize-controls' );
wp_enqueue_style( 'customize-controls' );
-wp_enqueue_script( 'accordion' );
-
/**
* Enqueue Customizer control scripts.
*
@@ -56,35 +66,49 @@
wp_user_settings();
_wp_admin_html_begin();
-$body_class = 'wp-core-ui js';
+$body_class = 'wp-core-ui wp-customizer js';
if ( wp_is_mobile() ) :
$body_class .= ' mobile';
- ?><meta name="viewport" id="viewport-meta" content="width=device-width, initial-scale=0.8, minimum-scale=0.5, maximum-scale=1.2"><?php
+ ?><meta name="viewport" id="viewport-meta" content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=1.2" /><?php
endif;
$is_ios = wp_is_mobile() && preg_match( '/iPad|iPod|iPhone/', $_SERVER['HTTP_USER_AGENT'] );
-if ( $is_ios )
+if ( $is_ios ) {
$body_class .= ' ios';
+}
-if ( is_rtl() )
- $body_class .= ' rtl';
+if ( is_rtl() ) {
+ $body_class .= ' rtl';
+}
$body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
-$admin_title = sprintf( __( '%1$s — WordPress' ), strip_tags( sprintf( __( 'Customize %s' ), $wp_customize->theme()->display('Name') ) ) );
-?><title><?php echo $admin_title; ?></title><?php
+if ( $wp_customize->is_theme_active() ) {
+ $document_title_tmpl = _x( 'Customize: %s', 'Placeholder is the document title from the preview' );
+} else {
+ $document_title_tmpl = _x( 'Live Preview: %s', 'Placeholder is the document title from the preview' );
+}
+$document_title_tmpl = html_entity_decode( $document_title_tmpl, ENT_QUOTES, 'UTF-8' ); // because exported to JS and assigned to document.title
+$admin_title = sprintf( $document_title_tmpl, __( 'Loading…' ) );
+?><title><?php echo $admin_title; ?></title>
+
+<script type="text/javascript">
+var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>';
+</script>
+
+<?php
/**
- * Print Customizer control styles.
+ * Fires when Customizer control styles are printed.
*
* @since 3.4.0
*/
do_action( 'customize_controls_print_styles' );
/**
- * Print Customizer control scripts.
+ * Fires when Customizer control scripts are printed.
*
* @since 3.4.0
*/
@@ -94,50 +118,46 @@
<body class="<?php echo esc_attr( $body_class ); ?>">
<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">
- <?php
- $save_text = $wp_customize->is_theme_active() ? __( 'Save & Publish' ) : __( 'Save & Activate' );
- submit_button( $save_text, 'primary save', 'save', false );
- ?>
- <span class="spinner"></span>
- <a class="back button" href="<?php echo esc_url( $return ? $return : admin_url( 'themes.php' ) ); ?>">
- <?php _e( 'Cancel' ); ?>
- </a>
+ <div class="primary-actions">
+ <?php
+ $save_text = $wp_customize->is_theme_active() ? __( 'Save & Publish' ) : __( 'Save & 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>
</div>
- <?php
- $screenshot = $wp_customize->theme()->get_screenshot();
- $cannot_expand = ! ( $screenshot || $wp_customize->theme()->get('Description') );
- ?>
-
- <div class="wp-full-overlay-sidebar-content accordion-container" tabindex="-1">
- <div id="customize-info" class="accordion-section <?php if ( $cannot_expand ) echo ' cannot-expand'; ?>">
- <div class="accordion-section-title" aria-label="<?php esc_attr_e( 'Theme Customizer Options' ); ?>" tabindex="0">
+ <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">
<span class="preview-notice"><?php
- /* translators: %s is the theme name in the Customize/Live Preview pane */
- echo sprintf( __( 'You are previewing %s' ), '<strong class="theme-name">' . $wp_customize->theme()->display('Name') . '</strong>' );
+ echo sprintf( __( 'You are customizing %s' ), '<strong class="theme-name site-title">' . get_bloginfo( 'name' ) . '</strong>' );
?></span>
</div>
- <?php if ( ! $cannot_expand ) : ?>
- <div class="accordion-section-content">
- <?php if ( $screenshot ) : ?>
- <img class="theme-screenshot" src="<?php echo esc_url( $screenshot ); ?>" />
- <?php endif; ?>
-
- <?php if ( $wp_customize->theme()->get('Description') ): ?>
- <div class="theme-description"><?php echo $wp_customize->theme()->display('Description'); ?></div>
- <?php endif; ?>
- </div>
- <?php endif; ?>
+ <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>
</div>
- <div id="customize-theme-controls"><ul>
- <?php
- foreach ( $wp_customize->sections() as $section )
- $section->maybe_render();
- ?>
- </ul></div>
+ <div id="customize-theme-controls">
+ <ul><?php // Panels and sections are managed here via JavaScript ?></ul>
+ </div>
+ </div>
</div>
<div id="customize-footer-actions" class="wp-full-overlay-footer">
@@ -150,6 +170,9 @@
<div id="customize-preview" class="wp-full-overlay-main"></div>
<?php
+ // Render control templates.
+ $wp_customize->render_control_templates();
+
/**
* Print Customizer control scripts in the footer.
*
@@ -157,12 +180,14 @@
*/
do_action( 'customize_controls_print_footer_scripts' );
- // If the frontend and the admin are served from the same domain, load the
- // preview over ssl if the customizer is being loaded over ssl. This avoids
- // insecure content warnings. This is not attempted if the admin and frontend
- // are on different domains to avoid the case where the frontend doesn't have
- // ssl certs. Domain mapping plugins can allow other urls in these conditions
- // using the customize_allowed_urls filter.
+ /*
+ * If the frontend and the admin are served from the same domain, load the
+ * preview over ssl if the Customizer is being loaded over ssl. This avoids
+ * insecure content warnings. This is not attempted if the admin and frontend
+ * are on different domains to avoid the case where the frontend doesn't have
+ * ssl certs. Domain mapping plugins can allow other urls in these conditions
+ * using the customize_allowed_urls filter.
+ */
$allowed_urls = array( home_url('/') );
$admin_origin = parse_url( admin_url() );
@@ -194,21 +219,22 @@
'customize-login' => 1
), wp_login_url() );
+ // Prepare Customizer settings to pass to JavaScript.
$settings = array(
'theme' => array(
'stylesheet' => $wp_customize->get_stylesheet(),
'active' => $wp_customize->is_theme_active(),
),
'url' => array(
- 'preview' => esc_url( $url ? $url : home_url( '/' ) ),
- 'parent' => esc_url( admin_url() ),
- 'activated' => admin_url( 'themes.php?activated=true&previewed' ),
- 'ajax' => esc_url( admin_url( 'admin-ajax.php', 'relative' ) ),
- 'allowed' => array_map( 'esc_url', $allowed_urls ),
+ 'preview' => esc_url_raw( $url ? $url : home_url( '/' ) ),
+ 'parent' => esc_url_raw( admin_url() ),
+ 'activated' => esc_url_raw( home_url( '/' ) ),
+ 'ajax' => esc_url_raw( admin_url( 'admin-ajax.php', 'relative' ) ),
+ 'allowed' => array_map( 'esc_url_raw', $allowed_urls ),
'isCrossDomain' => $cross_domain,
- 'fallback' => $fallback_url,
- 'home' => esc_url( home_url( '/' ) ),
- 'login' => $login_url,
+ 'fallback' => esc_url_raw( $fallback_url ),
+ 'home' => esc_url_raw( home_url( '/' ) ),
+ 'login' => esc_url_raw( $login_url ),
),
'browser' => array(
'mobile' => wp_is_mobile(),
@@ -216,27 +242,58 @@
),
'settings' => array(),
'controls' => array(),
+ 'panels' => array(),
+ 'sections' => array(),
'nonce' => array(
- 'save' => wp_create_nonce( 'save-customize_' . $wp_customize->get_stylesheet() ),
- 'preview' => wp_create_nonce( 'preview-customize_' . $wp_customize->get_stylesheet() )
- ),
+ 'save' => wp_create_nonce( 'save-customize_' . $wp_customize->get_stylesheet() ),
+ 'preview' => wp_create_nonce( 'preview-customize_' . $wp_customize->get_stylesheet() )
+ ),
+ 'autofocus' => array(),
+ 'documentTitleTmpl' => $document_title_tmpl,
);
+ // 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,
);
}
+ // Prepare Customize Control objects to pass to JavaScript.
foreach ( $wp_customize->controls() as $id => $control ) {
- $control->to_json();
- $settings['controls'][ $id ] = $control->json;
+ $settings['controls'][ $id ] = $control->json();
+ }
+
+ // Prepare Customize Section objects to pass to JavaScript.
+ foreach ( $wp_customize->sections() as $id => $section ) {
+ $settings['sections'][ $id ] = $section->json();
+ }
+
+ // 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();
+ }
+ }
+
+ // Pass to frontend the Customizer construct being deeplinked
+ if ( isset( $_GET['autofocus'] ) ) {
+ $autofocus = wp_unslash( $_GET['autofocus'] );
+ if ( is_array( $autofocus ) ) {
+ foreach ( $autofocus as $type => $id ) {
+ if ( isset( $settings[ $type . 's' ][ $id ] ) ) {
+ $settings['autofocus'][ $type ] = $id;
+ }
+ }
+ }
}
?>
<script type="text/javascript">
- var _wpCustomizeSettings = <?php echo json_encode( $settings ); ?>;
+ var _wpCustomizeSettings = <?php echo wp_json_encode( $settings ); ?>;
</script>
</div>
</body>