Changeset 26317

Timestamp:

11/22/2013 04:02:37 AM (12 years ago)

Author:

dd32

Message:

Theme Installer: Fix the Theme Preview function, and bring the button handling/styling inline with the Customizer. Fixes #26129

Location:

trunk/src/wp-admin

Files:

• css/wp-admin.css (modified) (3 diffs)
• includes/class-wp-theme-install-list-table.php (modified) (1 diff)
• js/theme-install.js (modified) (2 diffs)

trunk/src/wp-admin/css/wp-admin.css

@@ -7690 +7690 @@
     line-height: 24px;
     margin-bottom: 0;
+    margin-top: 0;
 }
 
@@ -7716 +7717 @@
     color: #777;
     line-height: 20px;
+}
+
+#theme-installer .wp-full-overlay-header {
+    margin-top: 9px;
+}
+
+#theme-installer .wp-full-overlay-header .theme-install {
+    float: right;
+    /* For when .theme-install is a span rather than a.button-primary (already installed theme) */
+    line-height: 26px;
+}
+
+#theme-installer .wp-full-overlay-sidebar { 
+    background: #EEE;
+    border-right: 1px solid #DDD;
+}
+
+#theme-installer .wp-full-overlay-main {
+    background: #fff url('../images/spinner.gif') no-repeat fixed center center;
+    background-size: 20px 20px;
 }
 
@@ -10721 +10742 @@
     .imgedit-wait,
     .customize-loading #customize-container,
-    .revision-tick.completed-false {
+    .revision-tick.completed-false,
+    #theme-installer .wp-full-overlay-main {
         background-image: url('../images/spinner-2x.gif');
     }

trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php

@@ -256 +256 @@
             <div class="wp-full-overlay-sidebar">
                 <div class="wp-full-overlay-header">
-                    <a href="#" class="close-full-overlay"><?php _e( '&larr; Close' ); ?></a>
+                    <a href="#" class="close-full-overlay button-secondary"><?php _e( 'Close' ); ?></a>
+                    <span class="theme-install"></span>
                 </div>
                 <div class="wp-full-overlay-sidebar-content">

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

@@ -61 +61 @@
 
     var preview = $('#theme-installer'),
+        header  = preview.find('.wp-full-overlay-header'),
         info    = preview.find('.install-theme-info'),
         panel   = preview.find('.wp-full-overlay-main'),
@@ -82 +83 @@
 
         info.html( $(this).closest('.installable-theme').find('.install-theme-info').html() );
+
+        header.find( '.theme-install' ).replaceWith( info.find( '.theme-install' ) );
+
         src = info.find( '.theme-preview-url' ).val();
         panel.html( '<iframe src="' + src + '" />');