Changeset 20940

Timestamp:

05/26/2012 08:47:55 PM (12 years ago)

Author:

koopersmith

Message:

Theme Customizer: Don't expand theme title if there are no details to show. props nacin, fixes #20757, see #19910.

Location:

trunk

Files:

• wp-admin/customize.php (modified) (2 diffs)
• wp-includes/css/customize-controls.dev.css (modified) (2 diffs)
• wp-includes/js/customize-controls.dev.js (modified) (1 diff)

trunk/wp-admin/customize.php

@@ -61 +61 @@
         </div>
 
+        <?php
+            $screenshot = $wp_customize->theme()->get_screenshot();
+            $cannot_expand = ! ( $screenshot || $wp_customize->theme()->get('Description') );
+        ?>
+
         <div class="wp-full-overlay-sidebar-content">
-            <div id="customize-info" class="customize-section">
+            <div id="customize-info" class="customize-section<?php if ( $cannot_expand ) echo ' cannot-expand'; ?>">
                 <div class="customize-section-title">
                     <span class="preview-notice"><?php _e('You are previewing'); ?></span>
                     <strong class="theme-name"><?php echo $wp_customize->theme()->display('Name'); ?></strong>
                 </div>
+                <?php if ( ! $cannot_expand ) : ?>
                 <div class="customize-section-content">
-                    <?php if ( $screenshot = $wp_customize->theme()->get_screenshot() ) : ?>
+                    <?php if ( $screenshot ) : ?>
                         <img class="theme-screenshot" src="<?php echo esc_url( $screenshot ); ?>" />
                     <?php endif; ?>
@@ -76 +82 @@
                     <?php endif; ?>
                 </div>
+                <?php endif; ?>
             </div>
 

trunk/wp-includes/css/customize-controls.dev.css

@@ -27 +27 @@
     -moz-user-select: none;
     user-select: none;
+}
+
+.cannot-expand .customize-section-title {
+    cursor: auto;
 }
 
@@ -83 +87 @@
     right: 20px;
     z-index: 1;
+}
+
+.cannot-expand .customize-section-title:after {
+    display: none;
 }
 

trunk/wp-includes/js/customize-controls.dev.js

@@ -595 +595 @@
 
         // Temporary accordion code.
-        $('.customize-section-title').click( function() {
+        $('.customize-section-title').click( function( event ) {
             var clicked = $( this ).parents( '.customize-section' );
+
+            if ( clicked.hasClass('cannot-expand') )
+                return;
+
             $( '.customize-section' ).not( clicked ).removeClass( 'open' );
             clicked.toggleClass( 'open' );
-            return false;
+            event.preventDefault();
         });