Changeset 37714 for trunk/src/wp-admin/themes.php

Timestamp:

06/15/2016 04:36:07 PM (8 years ago)

Author:

obenland

Message:

Update/Install: Shiny Updates v2.

Gone are the days of isolation and feelings of "meh", brought on by The Bleak Screen of Sadness. For a shiny knight has arrived to usher our plugins and themes along their arduous journey of installation, updates, and the inevitable fate of ultimate deletion.

Props swissspidy, adamsilverstein, mapk, afragen, ocean90, ryelle, j-falk, michael-arestad, melchoyce, DrewAPicture, AdamSoucie, ethitter, pento, dd32, kraftbj, Ipstenu, jorbin, afercia, stephdau, paulwilde, jipmoors, khag7, svovaf, jipmoors, obenland.
Fixes #22029, #25828, #31002, #31529, #31530, #31773, #33637, #35032.

File:

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

trunk/src/wp-admin/themes.php

@@ -146 +146 @@
 add_thickbox();
 wp_enqueue_script( 'theme' );
+wp_enqueue_script( 'updates' );
 wp_enqueue_script( 'customize-loader' );
 
@@ -249 +250 @@
         <div class="theme-screenshot blank"></div>
     <?php } ?>
+
+    <?php if ( $theme['hasUpdate'] ) : ?>
+        <div class="update-message notice inline notice-warning notice-alt">
+            <p><?php _e( 'New version available. <button class="button-link" type="button">Update now</button>' ); ?></p>
+        </div>
+    <?php endif; ?>
+
     <span class="more-details" id="<?php echo $aria_action; ?>"><?php _e( 'Theme Details' ); ?></span>
     <div class="theme-author"><?php printf( __( 'By %s' ), $theme['author'] ); ?></div>
@@ -277 +285 @@
 
     </div>
-
-    <?php if ( $theme['hasUpdate'] ) { ?>
-        <div class="theme-update"><?php _e( 'Update Available' ); ?></div>
-    <?php } ?>
 </div>
 <?php endforeach; ?>
@@ -369 +373 @@
         <div class="theme-screenshot blank"></div>
     <# } #>
+
+    <# if ( data.hasUpdate ) { #>
+        <div class="update-message notice inline notice-warning notice-alt"><p><?php _e( 'New version available. <button class="button-link" type="button">Update now</button>' ); ?></p></div>
+    <# } #>
+
     <span class="more-details" id="{{ data.id }}-action"><?php _e( 'Theme Details' ); ?></span>
-    <div class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.author }}}' ); ?></div>
+    <div class="theme-author">
+        <?php
+        /* translators: %s: Theme author name */
+        printf( __( 'By %s' ), '{{{ data.author }}}' );
+        ?>
+    </div>
 
     <# if ( data.active ) { #>
         <h2 class="theme-name" id="{{ data.id }}-name">
             <?php
-            /* translators: %s: theme name */
+            /* translators: %s: Theme name */
             printf( __( '<span>Active:</span> %s' ), '{{{ data.name }}}' );
             ?>
@@ -384 +398 @@
 
     <div class="theme-actions">
-
-    <# if ( data.active ) { #>
-        <# if ( data.actions.customize ) { #>
-            <a class="button button-primary customize load-customize hide-if-no-customize" href="{{{ data.actions.customize }}}"><?php _e( 'Customize' ); ?></a>
+        <# if ( data.active ) { #>
+            <# if ( data.actions.customize ) { #>
+                <a class="button button-primary customize load-customize hide-if-no-customize" href="{{{ data.actions.customize }}}"><?php _e( 'Customize' ); ?></a>
+            <# } #>
+        <# } else { #>
+            <a class="button button-secondary activate" href="{{{ data.actions.activate }}}"><?php _e( 'Activate' ); ?></a>
+            <a class="button button-primary load-customize hide-if-no-customize" href="{{{ data.actions.customize }}}"><?php _e( 'Live Preview' ); ?></a>
         <# } #>
-    <# } else { #>
-        <a class="button button-secondary activate" href="{{{ data.actions.activate }}}"><?php _e( 'Activate' ); ?></a>
-        <a class="button button-primary load-customize hide-if-no-customize" href="{{{ data.actions.customize }}}"><?php _e( 'Live Preview' ); ?></a>
-    <# } #>
-
     </div>
-
-    <# if ( data.hasUpdate ) { #>
-        <div class="theme-update"><?php _e( 'Update Available' ); ?></div>
-    <# } #>
 </script>
 
@@ -462 +470 @@
 </script>
 
-<?php require( ABSPATH . 'wp-admin/admin-footer.php' );
+<?php
+wp_print_request_filesystem_credentials_modal();
+wp_print_admin_notice_templates();
+wp_print_update_row_templates();
+
+require( ABSPATH . 'wp-admin/admin-footer.php' );