Changeset 47924

Timestamp:

06/08/2020 06:14:19 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Themes: Show a disabled "Activated" button instead of "Activate" for the active theme on Add Themes screen.

Additionally, switch the "Live Preview" label for the active theme to "Customize", for consistency with the Themes screen.

Props afercia, SergeyBiryukov.
Fixes #50334.

Location:

trunk/src

Files:

• js/_enqueues/wp/theme.js (modified) (1 diff)
• wp-admin/theme-install.php (modified) (3 diffs)

trunk/src/js/_enqueues/wp/theme.js

@@ -29 +29 @@
         var description;
 
-        // If theme is already installed, set an attribute.
+        // If the theme is already installed, set an attribute.
         if ( _.indexOf( themes.data.installedThemes, this.get( 'slug' ) ) !== -1 ) {
             this.set({ installed: true });
+        }
+
+        // If the theme is active, set an attribute.
+        if ( themes.data.activeTheme === this.get( 'slug' ) ) {
+            this.set({ active: true });
         }
 

trunk/src/wp-admin/theme-install.php

@@ -73 +73 @@
         ),
         'installedThemes' => array_keys( $installed_themes ),
+        'activeTheme'     => get_stylesheet(),
     )
 );
@@ -290 +291 @@
                     ?>
                     <# if ( data.activate_url ) { #>
-                        <a class="button button-primary activate" href="{{ data.activate_url }}" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
+                        <# if ( ! data.active ) { #>
+                            <a class="button button-primary activate" href="{{ data.activate_url }}" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
+                        <# } else { #>
+                            <button class="button button-primary disabled"><?php _ex( 'Activated', 'theme' ); ?></button>
+                        <# } #>
                     <# } #>
                     <# if ( data.customize_url ) { #>
-                        <a class="button load-customize" href="{{ data.customize_url }}"><?php _e( 'Live Preview' ); ?></a>
+                        <# if ( ! data.active ) { #>
+                            <a class="button load-customize" href="{{ data.customize_url }}"><?php _e( 'Live Preview' ); ?></a>
+                        <# } else { #>
+                            <a class="button load-customize" href="{{ data.customize_url }}"><?php _e( 'Customize' ); ?></a>
+                        <# } #>
                     <# } else { #>
                         <button class="button preview install-theme-preview"><?php _e( 'Preview' ); ?></button>
@@ -344 +353 @@
             <# if ( data.installed ) { #>
                 <# if ( data.compatible_wp && data.compatible_php ) { #>
-                    <a class="button button-primary activate" href="{{ data.activate_url }}"><?php _e( 'Activate' ); ?></a>
+                    <?php
+                    /* translators: %s: Theme name. */
+                    $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
+                    ?>
+                    <# if ( ! data.active ) { #>
+                        <a class="button button-primary activate" href="{{ data.activate_url }}" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
+                    <# } else { #>
+                        <button class="button button-primary disabled"><?php _ex( 'Activated', 'theme' ); ?></button>
+                    <# } #>
                 <# } else { #>
                     <a class="button button-primary disabled" ><?php _ex( 'Cannot Activate', 'theme' ); ?></a>