Changeset 52353

Timestamp:

12/10/2021 08:31:57 PM (3 years ago)

Author:

hellofromTonya

Message:

Themes: Show only "Customize" or "Activate" button in block theme's Theme Details modal.

At the bottom of a block theme's "Theme Details" modal, only one button will be displayed:

• "Customize" button when the block theme is activated;
• Else, the "Activate" button.

The "Live Preview", "Editor beta", and "Navigation Menus" buttons are removed.

Follow-up to [15646], [52341], [52346].

Props poena, ryelle, kafleg, antonvlasenko, costdev, SergeyBiryukov, hellofromTonya.
Fixes #54578.

File:

• trunk/src/wp-admin/themes.php (modified) (6 diffs)

trunk/src/wp-admin/themes.php

@@ -308 +308 @@
 
 if ( is_array( $submenu ) && isset( $submenu['themes.php'] ) ) {
+    $forbidden_paths = array(
+        'themes.php',
+        'theme-editor.php',
+        'site-editor.php',
+        'edit.php?post_type=wp_navigation',
+    );
+
     foreach ( (array) $submenu['themes.php'] as $item ) {
         $class = '';
-        if ( 'themes.php' === $item[2] || 'theme-editor.php' === $item[2] || 0 === strpos( $item[2], 'customize.php' ) ) {
+
+        if ( in_array( $item[2], $forbidden_paths, true ) || str_starts_with( $item[2], 'customize.php' ) ) {
             continue;
         }
@@ -542 +550 @@
             <a class="button activate" href="<?php echo $theme['actions']['activate']; ?>" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
             <?php
-            if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
+            if ( ! $theme['blockTheme'] && current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
                 /* translators: %s: Theme name. */
                 $live_preview_aria_label = sprintf( _x( 'Live Preview %s', 'theme' ), '{{ data.name }}' );
@@ -554 +562 @@
             ?>
             <a class="button disabled" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _ex( 'Cannot Activate', 'theme' ); ?></a>
-            <?php if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { ?>
+            <?php if ( ! $theme['blockTheme'] && current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { ?>
                 <a class="button button-primary hide-if-no-customize disabled"><?php _e( 'Live Preview' ); ?></a>
             <?php } ?>
@@ -914 +922 @@
                     ?>
                     <a class="button disabled" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _ex( 'Cannot Activate', 'theme' ); ?></a>
-                    <a class="button button-primary hide-if-no-customize disabled"><?php _e( 'Live Preview' ); ?></a>
+                    <# if ( ! data.blockTheme ) { #>
+                        <a class="button button-primary hide-if-no-customize disabled"><?php _e( 'Live Preview' ); ?></a>
+                    <# } #>
                 <# } #>
             <# } #>
@@ -1122 +1132 @@
                         <a href="{{{ data.actions.activate }}}" class="button activate" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
                     <# } #>
-                    <a href="{{{ data.actions.customize }}}" class="button button-primary load-customize hide-if-no-customize"><?php _e( 'Live Preview' ); ?></a>
+                    <# if ( ! data.blockTheme ) { #>
+                        <a href="{{{ data.actions.customize }}}" class="button button-primary load-customize hide-if-no-customize"><?php _e( 'Live Preview' ); ?></a>
+                    <# } #>
                 <# } else { #>
                     <?php
@@ -1131 +1143 @@
                         <a class="button disabled" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _ex( 'Cannot Activate', 'theme' ); ?></a>
                     <# } #>
-                    <a class="button button-primary hide-if-no-customize disabled"><?php _e( 'Live Preview' ); ?></a>
+                    <# if ( ! data.blockTheme ) { #>
+                        <a class="button button-primary hide-if-no-customize disabled"><?php _e( 'Live Preview' ); ?></a>
+                    <# } #>
                 <# } #>
             </div>