Changeset 32265

Timestamp:

04/22/2015 04:15:01 PM (6 years ago)

Author:

ocean90

Message:

Theme Switcher: Provide an easier way to reset back to the current active theme.

• Add control for the active theme when doing a theme preview
• Highlight an active theme and move it to the top

props valendesigns, ocean90.
fixes #32002.

Location:

trunk/src

Files:

• wp-admin/css/customize-controls.css (modified) (1 diff)
• wp-admin/css/themes.css (modified) (1 diff)
• wp-includes/class-wp-customize-control.php (modified) (2 diffs)
• wp-includes/class-wp-customize-manager.php (modified) (1 diff)

trunk/src/wp-admin/css/customize-controls.css

@@ -1090 +1090 @@
         display: block;
     }
+
+    .wp-customizer .theme-browser .theme.active .theme-name span {
+        display: inline;
+    }
 }
 

trunk/src/wp-admin/css/themes.css

@@ -260 +260 @@
 }
 
+.theme-browser .customize-control .theme.active .theme-name {
+    padding-right: 15px;
+}
+
 .theme-browser .theme.active .theme-name span {
     font-weight: 600;

trunk/src/wp-includes/class-wp-customize-control.php

@@ -1244 +1244 @@
     public function content_template() {
         $current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+        $active_url  = esc_url( remove_query_arg( 'theme', $current_url ) );
         $preview_url = esc_url( add_query_arg( 'theme', '__THEME__', $current_url ) ); // Token because esc_url() strips curly braces.
         $preview_url = str_replace( '__THEME__', '{{ data.theme.id }}', $preview_url );
         ?>
-        <div class="theme" tabindex="0" data-preview-url="<?php echo esc_attr( $preview_url ); ?>" aria-describedby="{{ data.theme.id }}-action {{ data.theme.id }}-name">
+        <# if ( data.theme.isActiveTheme ) { #>
+            <div class="theme active" tabindex="0" data-preview-url="<?php echo esc_attr( $active_url ); ?>" aria-describedby="{{ data.theme.id }}-action {{ data.theme.id }}-name">
+        <# } else { #>
+            <div class="theme" tabindex="0" data-preview-url="<?php echo esc_attr( $preview_url ); ?>" aria-describedby="{{ data.theme.id }}-action {{ data.theme.id }}-name">
+        <# } #>
+
             <# if ( data.theme.screenshot[0] ) { #>
                 <div class="theme-screenshot">
@@ -1255 +1261 @@
                 <div class="theme-screenshot blank"></div>
             <# } #>
-            <span class="more-details" id="{{ data.theme.id }}-action"><?php _e( 'Live Preview' ); ?></span>
+
+            <# if ( data.theme.isActiveTheme ) { #>
+                <span class="more-details" id="{{ data.theme.id }}-action"><?php _e( 'Customize' ); ?></span>
+            <# } else { #>
+                <span class="more-details" id="{{ data.theme.id }}-action"><?php _e( 'Live Preview' ); ?></span>
+            <# } #>
+
             <div class="theme-author"><?php printf( __( 'By %s' ), '{{ data.theme.author }}' ); ?></div>
 
-            <h3 class="theme-name" id="{{ data.theme.id }}-name">{{ data.theme.name }}</h3>
-
-            <div class="theme-actions">
-                <button type="button" class="button theme-details"><?php _e( 'Theme Details' ); ?></button>
-            </div>
+            <# if ( data.theme.isActiveTheme ) { #>
+                <h3 class="theme-name" id="{{ data.theme.id }}-name">
+                    <?php
+                    /* translators: %s: theme name */
+                    printf( __( '<span>Active:</span> %s' ), '{{ data.theme.name }}' );
+                    ?>
+                </h3>
+            <# } else { #>
+                <h3 class="theme-name" id="{{ data.theme.id }}-name">{{ data.theme.name }}</h3>
+                <div class="theme-actions">
+                    <button type="button" class="button theme-details"><?php _e( 'Theme Details' ); ?></button>
+                </div>
+            <# } #>
         </div>
     <?php

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -1199 +1199 @@
 
         // Theme Controls.
+
+        // Add a control for the active/original theme.
+        if ( ! $this->is_theme_active() ) {
+            $themes = wp_prepare_themes_for_js( array( wp_get_theme( $this->original_stylesheet ) ) );
+            $active_theme = current( $themes );
+            $active_theme['isActiveTheme'] = true;
+            $this->add_control( new WP_Customize_Theme_Control( $this, $active_theme['id'], array(
+                'theme'    => $active_theme,
+                'section'  => 'themes',
+                'settings' => 'active_theme',
+            ) ) );
+        }
+
         $themes = wp_prepare_themes_for_js();
         foreach ( $themes as $theme ) {
-            if ( $theme['active'] ) {
+            if ( $theme['active'] || $theme['id'] === $this->original_stylesheet ) {
                 continue;
             }
 
             $theme_id = 'theme_' . $theme['id'];
+            $theme['isActiveTheme'] = false;
             $this->add_control( new WP_Customize_Theme_Control( $this, $theme_id, array(
                 'theme'    => $theme,