From 4b9f6216e9923f24834ee6faac07512eefd65fcf Mon Sep 17 00:00:00 2001
From: Daryl Koopersmith <koop@git.wordpress.org>
Date: Thu, 24 May 2012 03:29:51 +0000
Subject: [PATCH] Theme Customizer: Change 'Return to...' link to 'Cancel' and
 move 'Save' button to header. props helenyhou, fixes #20692, see #19910.

git-svn-id: https://develop.svn.wordpress.org/trunk@20864 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/customize.php                     | 15 +++++++--------
 wp-includes/css/customize-controls.dev.css | 22 +++++++++++-----------
 wp-includes/js/customize-controls.dev.js   |  9 ++-------
 wp-includes/js/customize-loader.dev.js     |  2 +-
 wp-includes/theme.php                      |  9 +++------
 5 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/wp-admin/customize.php b/wp-admin/customize.php
index a081573b22..08e997db90 100644
--- a/wp-admin/customize.php
+++ b/wp-admin/customize.php
@@ -50,8 +50,13 @@ do_action( 'customize_controls_print_scripts' );
 	<form id="customize-controls" class="wrap wp-full-overlay-sidebar">
 		<?php wp_nonce_field( 'customize_controls' ); ?>
 		<div id="customize-header-actions" class="wp-full-overlay-header">
-			<a class="back" href="<?php echo esc_url( admin_url( 'themes.php' ) ); ?>">
-				<?php printf( __( '&larr; Return to %s' ), __('Manage Themes') ); ?>
+			<?php
+				$save_text = $wp_customize->is_theme_active() ? __( 'Save' ) : __( 'Save and Activate' );
+				submit_button( $save_text, 'primary', 'save', false );
+			?>
+			<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" />
+			<a class="back button" href="<?php echo esc_url( admin_url( 'themes.php' ) ); ?>">
+				<?php _e( 'Cancel' ); ?>
 			</a>
 		</div>
 
@@ -81,12 +86,6 @@ do_action( 'customize_controls_print_scripts' );
 		</div>
 
 		<div id="customize-footer-actions" class="wp-full-overlay-footer">
-			<?php
-			$save_text = $wp_customize->is_theme_active() ? __('Save') : __('Save and Activate');
-			submit_button( $save_text, 'primary', 'save', false );
-			?>
-			<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" />
-
 			<a href="#" class="collapse-sidebar button-secondary" title="<?php esc_attr_e('Collapse Sidebar'); ?>">
 				<span class="collapse-sidebar-label"><?php _e('Collapse'); ?></span>
 				<span class="collapse-sidebar-arrow"></span>
diff --git a/wp-includes/css/customize-controls.dev.css b/wp-includes/css/customize-controls.dev.css
index 0940c04072..c4236d588d 100644
--- a/wp-includes/css/customize-controls.dev.css
+++ b/wp-includes/css/customize-controls.dev.css
@@ -131,20 +131,20 @@ body {
 	margin: 0;
 }
 
-#customize-footer-actions img {
+#customize-header-actions .button-primary {
+	float: right;
+	margin-top: 11px;
+}
+
+#customize-header-actions img {
 	display: none;
-	position: absolute;
-	top: 15px;
-	margin-left: 4px;
+	float: right;
+	margin-top: 13px;
+	margin-right: 4px;
 }
 
-.saving #customize-footer-actions img {
-	display: inline;
-}
-
-#customize-footer-actions .button-primary {
-	display: inline-block;
-	margin-top: 12px;
+.saving #customize-header-actions img {
+	display: block;
 }
 
 .customize-control {
diff --git a/wp-includes/js/customize-controls.dev.js b/wp-includes/js/customize-controls.dev.js
index fe6e8a8943..811c7e91c1 100644
--- a/wp-includes/js/customize-controls.dev.js
+++ b/wp-includes/js/customize-controls.dev.js
@@ -496,13 +496,8 @@
 
 		// If we receive a 'back' event, we're inside an iframe.
 		// Send any clicks to the 'Return' link to the parent page.
-		parent.bind( 'back', function( text ) {
-			var back = $('.back');
-
-			if ( text )
-				back.text( text );
-
-			back.on( 'click.back', function( event ) {
+		parent.bind( 'back', function() {
+			$('.back').on( 'click.back', function( event ) {
 				event.preventDefault();
 				parent.send( 'close' );
 			});
diff --git a/wp-includes/js/customize-loader.dev.js b/wp-includes/js/customize-loader.dev.js
index f0cb3cf309..c23ed667c3 100644
--- a/wp-includes/js/customize-loader.dev.js
+++ b/wp-includes/js/customize-loader.dev.js
@@ -69,7 +69,7 @@ if ( typeof wp === 'undefined' )
 
 			// Wait for the connection from the iframe before sending any postMessage events.
 			this.messenger.bind( 'ready', function() {
-				Loader.messenger.send( 'back', wpCustomizeLoaderL10n.back || '' );
+				Loader.messenger.send( 'back' );
 			});
 
 			this.messenger.bind( 'close', function() {
diff --git a/wp-includes/theme.php b/wp-includes/theme.php
index ee182398ed..f4816efc7d 100644
--- a/wp-includes/theme.php
+++ b/wp-includes/theme.php
@@ -1589,12 +1589,9 @@ add_action( 'plugins_loaded', '_wp_customize_include' );
  * @since 3.4.0
  */
 function _wp_customize_loader_localize() {
-	$l10n = array( 'url'  => admin_url( 'admin.php' ) );
-
-	if ( is_admin() )
-		$l10n[ 'back' ] = sprintf( __( '&larr; Return to %s' ), get_admin_page_title() );
-
-	wp_localize_script( 'customize-loader', 'wpCustomizeLoaderL10n', $l10n );
+	wp_localize_script( 'customize-loader', 'wpCustomizeLoaderL10n', array(
+		'url' => admin_url( 'admin.php' ),
+	) );
 }
 add_action( 'admin_enqueue_scripts', '_wp_customize_loader_localize' );