WordPress.org

Make WordPress Core


Ignore:
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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/class-wp-customize-control.php

    r32134 r32265  
    12441244    public function content_template() {
    12451245        $current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
     1246        $active_url  = esc_url( remove_query_arg( 'theme', $current_url ) );
    12461247        $preview_url = esc_url( add_query_arg( 'theme', '__THEME__', $current_url ) ); // Token because esc_url() strips curly braces.
    12471248        $preview_url = str_replace( '__THEME__', '{{ data.theme.id }}', $preview_url );
    12481249        ?>
    1249         <div class="theme" tabindex="0" data-preview-url="<?php echo esc_attr( $preview_url ); ?>" aria-describedby="{{ data.theme.id }}-action {{ data.theme.id }}-name">
     1250        <# if ( data.theme.isActiveTheme ) { #>
     1251            <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">
     1252        <# } else { #>
     1253            <div class="theme" tabindex="0" data-preview-url="<?php echo esc_attr( $preview_url ); ?>" aria-describedby="{{ data.theme.id }}-action {{ data.theme.id }}-name">
     1254        <# } #>
     1255
    12501256            <# if ( data.theme.screenshot[0] ) { #>
    12511257                <div class="theme-screenshot">
     
    12551261                <div class="theme-screenshot blank"></div>
    12561262            <# } #>
    1257             <span class="more-details" id="{{ data.theme.id }}-action"><?php _e( 'Live Preview' ); ?></span>
     1263
     1264            <# if ( data.theme.isActiveTheme ) { #>
     1265                <span class="more-details" id="{{ data.theme.id }}-action"><?php _e( 'Customize' ); ?></span>
     1266            <# } else { #>
     1267                <span class="more-details" id="{{ data.theme.id }}-action"><?php _e( 'Live Preview' ); ?></span>
     1268            <# } #>
     1269
    12581270            <div class="theme-author"><?php printf( __( 'By %s' ), '{{ data.theme.author }}' ); ?></div>
    12591271
    1260             <h3 class="theme-name" id="{{ data.theme.id }}-name">{{ data.theme.name }}</h3>
    1261 
    1262             <div class="theme-actions">
    1263                 <button type="button" class="button theme-details"><?php _e( 'Theme Details' ); ?></button>
    1264             </div>
     1272            <# if ( data.theme.isActiveTheme ) { #>
     1273                <h3 class="theme-name" id="{{ data.theme.id }}-name">
     1274                    <?php
     1275                    /* translators: %s: theme name */
     1276                    printf( __( '<span>Active:</span> %s' ), '{{ data.theme.name }}' );
     1277                    ?>
     1278                </h3>
     1279            <# } else { #>
     1280                <h3 class="theme-name" id="{{ data.theme.id }}-name">{{ data.theme.name }}</h3>
     1281                <div class="theme-actions">
     1282                    <button type="button" class="button theme-details"><?php _e( 'Theme Details' ); ?></button>
     1283                </div>
     1284            <# } #>
    12651285        </div>
    12661286    <?php
Note: See TracChangeset for help on using the changeset viewer.