Skip to content

Commit 933a5f2

Browse files
committed
Set Available and Inactive Widget areas to not collapse, since they don't look like collapsing elements. Fixes #26327, props MikeHansenMe.
git-svn-id: https://develop.svn.wordpress.org/trunk@26593 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 3ce6788 commit 933a5f2

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

src/wp-admin/includes/widgets.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,21 @@ function wp_list_widget_controls( $sidebar, $sidebar_name = '' ) {
7171
$description = wp_sidebar_description( $sidebar );
7272

7373
echo '<div id="' . esc_attr( $sidebar ) . '" class="widgets-sortables">';
74-
7574
if ( $sidebar_name ) {
75+
if( 'Inactive Widgets' != $sidebar_name ) {
7676
?>
7777
<div class="sidebar-name">
7878
<div class="sidebar-name-arrow"><br /></div>
7979
<h3><?php echo esc_html( $sidebar_name ); ?> <span class="spinner"></span></h3>
8080
</div>
8181
<?php
82+
} else {
83+
?>
84+
<div>
85+
<h3><?php echo esc_html( $sidebar_name ); ?> <span class="spinner"></span></h3>
86+
</div>
87+
<?php
88+
}
8289
}
8390

8491
echo '<div class="sidebar-description">';

src/wp-admin/widgets.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,7 @@ function wp_widgets_access_body_class($classes) {
329329
<div class="widget-liquid-left">
330330
<div id="widgets-left">
331331
<div id="available-widgets" class="widgets-holder-wrap">
332-
<div class="sidebar-name">
333-
<div class="sidebar-name-arrow"><br /></div>
332+
<div>
334333
<h3><?php _e('Available Widgets'); ?> <span id="removing-widget"><?php _ex('Deactivate', 'removing-widget'); ?> <span></span></span></h3>
335334
</div>
336335
<div class="widget-holder">
@@ -350,7 +349,7 @@ function wp_widgets_access_body_class($classes) {
350349
$theme_sidebars = array();
351350
foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
352351
if ( false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) ) {
353-
$wrap_class = 'widgets-holder-wrap';
352+
$wrap_class = ( $registered_sidebar['id'] == 'wp_inactive_widgets' ) ? '' : 'widgets-holder-wrap';
354353
if ( !empty( $registered_sidebar['class'] ) )
355354
$wrap_class .= ' ' . $registered_sidebar['class'];
356355

0 commit comments

Comments
 (0)