Changeset 26426 for trunk/src/wp-admin/widgets.php

Timestamp:

11/27/2013 01:29:49 AM (11 years ago)

Author:

azaozz

Message:

Widgets: drop onto closed sidebars.

• Make dropping a widget easier by preventing the source sidebar from resizing while the widget is being dragged.
• Move widgets dropped on closed sidebars to the top. UI Sortable places them randomly near the bottom.
• Fix possible regression in wp_list_widget_controls(), add an optional argument to output the sidebar name inside the sortable container.
• Updated styles for sidebar description and widget-hover class.

Part props shaunandrews, fixes #25952.

File:

• trunk/src/wp-admin/widgets.php (modified) (3 diffs)

trunk/src/wp-admin/widgets.php

@@ -333 +333 @@
     <div id="available-widgets" class="widgets-holder-wrap">
         <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>
+            <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>
         <div class="widget-holder">
-        <p class="description"><?php _e('Drag widgets from here to a sidebar on the right to activate them. Drag widgets back here to deactivate them and delete their settings.'); ?></p>
-        <div id="widget-list">
-        <?php wp_list_widgets(); ?>
-        </div>
-        <br class='clear' />
+            <div class="sidebar-description">
+                <p class="description"><?php _e('Drag widgets from here to a sidebar on the right to activate them. Drag widgets back here to deactivate them and delete their settings.'); ?></p>
+            </div>
+            <div id="widget-list">
+                <?php wp_list_widgets(); ?>
+            </div>
+            <br class='clear' />
         </div>
         <br class="clear" />
@@ -356 +359 @@
         ?>
         <div class="<?php echo esc_attr( $wrap_class ); ?>">
-            <div class="sidebar-name">
-                <div class="sidebar-name-arrow"><br /></div>
-                <h3><?php echo esc_html( $registered_sidebar['name'] ); ?> <span class="spinner"></span></h3>
-            </div>
             <div class="widget-holder inactive">
-                <?php wp_list_widget_controls( $registered_sidebar['id'] ); ?>
+                <?php wp_list_widget_controls( $registered_sidebar['id'], $registered_sidebar['name'] ); ?>
                 <div class="clear"></div>
             </div>
         </div>
         <?php
+
     } else {
         $theme_sidebars[$sidebar] = $registered_sidebar;
@@ -408 +408 @@
     ?>
     <div class="<?php echo esc_attr( $wrap_class ); ?>">
-        <div class="sidebar-name">
-            <div class="sidebar-name-arrow"><br /></div>
-            <h3><?php echo esc_html( $registered_sidebar['name'] ); ?>  <span class="spinner"></span></h3>
-        </div>
-        <?php wp_list_widget_controls( $sidebar ); // Show the control forms for each of the widgets in this sidebar ?>
+        <?php wp_list_widget_controls( $sidebar, $registered_sidebar['name'] ); // Show the control forms for each of the widgets in this sidebar ?>
     </div>
     <?php