Wordpress 3.6

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

index 3e6a67508a00cc5e884922d0b553e06e7dfed01d..a9e05c2fd5a41f6fd05ea30fcac2a06452130f92 100644 (file)
--- a/wp-admin/customize.php
+++ b/wp-admin/customize.php
@@ -7,6 +7,8 @@
   * @since 3.4.0
   */
  
+define( 'IFRAME_REQUEST', true );
+
  require_once( './admin.php' );
  if ( ! current_user_can( 'edit_theme_options' ) )
         wp_die( __( 'Cheatin&#8217; uh?' ) );
@@ -34,6 +36,8 @@ do_action( 'customize_controls_init' );
  wp_enqueue_script( 'customize-controls' );
  wp_enqueue_style( 'customize-controls' );
  
+wp_enqueue_script( 'accordion' );
+
  do_action( 'customize_controls_enqueue_scripts' );
  
  // Let's roll.
@@ -42,7 +46,7 @@ do_action( 'customize_controls_enqueue_scripts' );
  wp_user_settings();
  _wp_admin_html_begin();
  
-$body_class = '';
+$body_class = 'wp-core-ui js';
  
  if ( wp_is_mobile() ) :
         $body_class .= ' mobile';
@@ -55,6 +59,10 @@ $is_ios = wp_is_mobile() && preg_match( '/iPad|iPod|iPhone/', $_SERVER['HTTP_USE
  if ( $is_ios )
         $body_class .= ' ios';
  
+if ( is_rtl() )
+       $body_class .=  ' rtl';
+$body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
+
  $admin_title = sprintf( __( '%1$s &#8212; WordPress' ), strip_tags( sprintf( __( 'Customize %s' ), $wp_customize->theme()->display('Name') ) ) );
  ?><title><?php echo $admin_title; ?></title><?php
  
@@ -65,13 +73,13 @@ do_action( 'customize_controls_print_scripts' );
  <body class="<?php echo esc_attr( $body_class ); ?>">
  <div class="wp-full-overlay expanded">
         <form id="customize-controls" class="wrap wp-full-overlay-sidebar">
-               <?php wp_nonce_field( 'customize_controls-' . $wp_customize->get_stylesheet() ); ?>
+
                 <div id="customize-header-actions" class="wp-full-overlay-header">
                         <?php
                                 $save_text = $wp_customize->is_theme_active() ? __( 'Save &amp; Publish' ) : __( 'Save &amp; Activate' );
-                               submit_button( $save_text, 'primary', 'save', false );
+                               submit_button( $save_text, 'primary save', 'save', false );
                         ?>
-                       <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" />
+                       <span class="spinner"></span>
                         <a class="back button" href="<?php echo esc_url( $return ? $return : admin_url( 'themes.php' ) ); ?>">
                                 <?php _e( 'Cancel' ); ?>
                         </a>
@@ -82,16 +90,16 @@ do_action( 'customize_controls_print_scripts' );
                         $cannot_expand = ! ( $screenshot || $wp_customize->theme()->get('Description') );
                 ?>
  
-               <div class="wp-full-overlay-sidebar-content">
-                       <div id="customize-info" class="customize-section<?php if ( $cannot_expand ) echo ' cannot-expand'; ?>">
-                               <div class="customize-section-title">
+               <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">
                                         <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>' );
                                         ?></span>
                                 </div>
                                 <?php if ( ! $cannot_expand ) : ?>
-                               <div class="customize-section-content">
+                               <div class="accordion-section-content">
                                         <?php if ( $screenshot ) : ?>
                                                 <img class="theme-screenshot" src="<?php echo esc_url( $screenshot ); ?>" />
                                         <?php endif; ?>
@@ -175,6 +183,10 @@ do_action( 'customize_controls_print_scripts' );
                 ),
                 'settings' => array(),
                 'controls' => array(),
+               'nonce'    => array(
+                       'save'    => wp_create_nonce( 'save-customize_' . $wp_customize->get_stylesheet() ),
+                       'preview' => wp_create_nonce( 'preview-customize_' . $wp_customize->get_stylesheet() )
+               ),
         );
  
         foreach ( $wp_customize->settings() as $id => $setting ) {