<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[47924] trunk/src: Themes: Show a disabled "Activated" button instead of "Activate" for the active theme on Add Themes screen.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/47924">47924</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/47924","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-06-08 18:14:19 +0000 (Mon, 08 Jun 2020)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/ticket/50334">#50334</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueueswpthemejs">trunk/src/js/_enqueues/wp/theme.js</a></li>
<li><a href="#trunksrcwpadminthemeinstallphp">trunk/src/wp-admin/theme-install.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueueswpthemejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/theme.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/theme.js        2020-06-07 22:40:16 UTC (rev 47923)
+++ trunk/src/js/_enqueues/wp/theme.js  2020-06-08 18:14:19 UTC (rev 47924)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,11 +28,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">        initialize: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                var description;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If theme is already installed, set an attribute.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If the theme is already installed, set an attribute.
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( _.indexOf( themes.data.installedThemes, this.get( 'slug' ) ) !== -1 ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        this.set({ installed: true });
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // If the theme is active, set an attribute.
+               if ( themes.data.activeTheme === this.get( 'slug' ) ) {
+                       this.set({ active: true });
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 // Set the attributes.
</span><span class="cx" style="display: block; padding: 0 10px">                this.set({
</span><span class="cx" style="display: block; padding: 0 10px">                        // `slug` is for installation, `id` is for existing.
</span></span></pre></div>
<a id="trunksrcwpadminthemeinstallphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/theme-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/theme-install.php      2020-06-07 22:40:16 UTC (rev 47923)
+++ trunk/src/wp-admin/theme-install.php        2020-06-08 18:14:19 UTC (rev 47924)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,6 +72,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        'selectFeatureFilter' => __( 'Select one or more Theme features to filter by' ),
</span><span class="cx" style="display: block; padding: 0 10px">                ),
</span><span class="cx" style="display: block; padding: 0 10px">                'installedThemes' => array_keys( $installed_themes ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                'activeTheme'     => get_stylesheet(),
</ins><span class="cx" style="display: block; padding: 0 10px">         )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -289,10 +290,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
</span><span class="cx" style="display: block; padding: 0 10px">                                        ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <# if ( data.activate_url ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <a class="button button-primary activate" href="{{ data.activate_url }}" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <# 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>
+                                               <# } #>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <# } #>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <# if ( data.customize_url ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <a class="button load-customize" href="{{ data.customize_url }}"><?php _e( 'Live Preview' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <# 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>
+                                               <# } #>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <# } else { #>
</span><span class="cx" style="display: block; padding: 0 10px">                                                <button class="button preview install-theme-preview"><?php _e( 'Preview' ); ?></button>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <# } #>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -343,7 +352,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        <button class="next-theme"><span class="screen-reader-text"><?php _e( 'Next theme' ); ?></span></button>
</span><span class="cx" style="display: block; padding: 0 10px">                        <# if ( data.installed ) { #>
</span><span class="cx" style="display: block; padding: 0 10px">                                <# if ( data.compatible_wp && data.compatible_php ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <a class="button button-primary activate" href="{{ data.activate_url }}"><?php _e( 'Activate' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <?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>
+                                       <# } #>
</ins><span class="cx" style="display: block; padding: 0 10px">                                 <# } else { #>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <a class="button button-primary disabled" ><?php _ex( 'Cannot Activate', 'theme' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px">                                <# } #>
</span></span></pre>
</div>
</div>

</body>
</html>