Ticket #20692: 20692.diff

wp-includes/theme.php

@@ -1592 +1592 @@
         $l10n = array( 'url'  => admin_url( 'admin.php' ) );
 
         if ( is_admin() )
-                $l10n[ 'back' ] = sprintf( __( '← Return to %s' ), get_admin_page_title() );
+                $l10n[ 'back' ] = __( 'Cancel' );
 
         wp_localize_script( 'customize-loader', 'wpCustomizeLoaderL10n', $l10n );
 }

wp-includes/css/customize-controls.dev.css

@@ -131 +131 @@
         margin: 0;
 }
 
+#customize-header-actions .button-primary {
+        float: right;
+        margin-top: 11px;
+}
+
 #customize-footer-actions img {
         display: none;
         position: absolute;
@@ -142 +147 @@
         display: inline;
 }
 
-#customize-footer-actions .button-primary {
-        display: inline-block;
-        margin-top: 12px;
-}
-
 .customize-control {
         width: 100%;
         float: left;

wp-admin/customize.php

@@ -50 +50 @@
         <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 );
+                        ?>
+                        <a class="back button" href="<?php echo esc_url( admin_url( 'themes.php' ) ); ?>">
+                                <?php _e( 'Cancel' ); ?>
                         </a>
                 </div>
 
@@ -81 +85 @@
                 </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'); ?>">