Changeset 26608

Timestamp:

12/04/2013 04:30:05 PM (13 years ago)

Author:

iammattthomas

Message:

Revert r26593 so Available and Inactive widgets are once again collapsible. Make the arrows only appear on hover when uncollapsed. Fixes #26327, props nacin.

Location:

trunk/src/wp-admin

Files:

• css/wp-admin.css (modified) (1 diff)
• includes/widgets.php (modified) (2 diffs)
• widgets.php (modified) (2 diffs)

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

@@ -10488 +10488 @@
 }
 
+.js #widgets-left .sidebar-name .sidebar-name-arrow {
+        display: none;
+}
+
+.js #widgets-left .widgets-holder-wrap.closed .sidebar-name .sidebar-name-arrow,
+.js #widgets-left .sidebar-name:hover .sidebar-name-arrow {
+        display: block;
+}
+
 /* Show the arrow only on hover */
 .js .sidebar-name .sidebar-name-arrow:before,

trunk/src/wp-admin/includes/widgets.php

@@ -72 +72 @@
 
         echo '<div id="' . esc_attr( $sidebar ) . '" class="widgets-sortables">';
+
         if ( $sidebar_name ) {
-                if( 'Inactive Widgets' != $sidebar_name ) {
                 ?>
                 <div class="sidebar-name">
@@ -80 +80 @@
                 </div>
                 <?php
-                } else {
-                ?>
-                <div>
-                        <h3><?php echo esc_html( $sidebar_name ); ?> <span class="spinner"></span></h3>
-                </div>
-                <?php
-                }
         }
 

trunk/src/wp-admin/widgets.php

@@ -330 +330 @@
 <div id="widgets-left">
         <div id="available-widgets" class="widgets-holder-wrap">
-                <div>
+                <div class="sidebar-name">
+                        <div class="sidebar-name-arrow"><br /></div>
                         <h3><?php _e('Available Widgets'); ?> <span id="removing-widget"><?php _ex('Deactivate', 'removing-widget'); ?> <span></span></span></h3>
                 </div>
@@ -350 +351 @@
 foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
         if ( false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) ) {
-                $wrap_class = ( $registered_sidebar['id'] == 'wp_inactive_widgets' ) ? '' : 'widgets-holder-wrap';
+                $wrap_class = 'widgets-holder-wrap';
                 if ( !empty( $registered_sidebar['class'] ) )
                         $wrap_class .= ' ' . $registered_sidebar['class'];