Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 09:37:42 +01:00
Code Issues Projects Releases Wiki Activity

Set Available and Inactive Widget areas to not collapse, since they don't look like collapsing elements. Fixes #26327, props MikeHansenMe.

Browse Source 
Built from https://develop.svn.wordpress.org/trunk@26593


git-svn-id: http://core.svn.wordpress.org/trunk@26483 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Matt Thomas 2013-12-03 21:32:10 +00:00
parent d050370578
commit 26a22db98e
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-admin/includes/widgets.php
View File

@ -71,14 +71,21 @@ function wp_list_widget_controls( $sidebar, $sidebar_name = '' ) {
$description = wp_sidebar_description( $sidebar );
echo '<div id="' . esc_attr( $sidebar ) . '" class="widgets-sortables">';
if ( $sidebar_name ) {
if( 'Inactive Widgets' != $sidebar_name ) {
?>
<div class="sidebar-name">
<div class="sidebar-name-arrow"><br /></div>
<h3><?php echo esc_html( $sidebar_name ); ?> <span class="spinner"></span></h3>
</div>
<?php
} else {
?>
<div>
<h3><?php echo esc_html( $sidebar_name ); ?> <span class="spinner"></span></h3>
</div>
<?php
}
}
echo '<div class="sidebar-description">';

5
wp-admin/widgets.php
View File

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