<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[26593] trunk/src/wp-admin: Set Available and Inactive Widget areas to not collapse, since they don't look like collapsing elements.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26593">26593</a></dd>
<dt>Author</dt> <dd>iammattthomas</dd>
<dt>Date</dt> <dd>2013-12-03 21:31:37 +0000 (Tue, 03 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Set Available and Inactive Widget areas to not collapse, since they don't look like collapsing elements. Fixes <a href="http://core.trac.wordpress.org/ticket/26327">#26327</a>, props MikeHansenMe.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludeswidgetsphp">trunk/src/wp-admin/includes/widgets.php</a></li>
<li><a href="#trunksrcwpadminwidgetsphp">trunk/src/wp-admin/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludeswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/widgets.php (26592 => 26593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/widgets.php 2013-12-03 21:13:14 UTC (rev 26592)
+++ trunk/src/wp-admin/includes/widgets.php 2013-12-03 21:31:37 UTC (rev 26593)
</span><span class="lines">@@ -71,14 +71,21 @@
</span><span class="cx"> $description = wp_sidebar_description( $sidebar );
</span><span class="cx">
</span><span class="cx"> echo '<div id="' . esc_attr( $sidebar ) . '" class="widgets-sortables">';
</span><del>-
</del><span class="cx"> if ( $sidebar_name ) {
</span><ins>+ if( 'Inactive Widgets' != $sidebar_name ) {
</ins><span class="cx"> ?>
</span><span class="cx"> <div class="sidebar-name">
</span><span class="cx"> <div class="sidebar-name-arrow"><br /></div>
</span><span class="cx"> <h3><?php echo esc_html( $sidebar_name ); ?> <span class="spinner"></span></h3>
</span><span class="cx"> </div>
</span><span class="cx"> <?php
</span><ins>+ } else {
+ ?>
+ <div>
+ <h3><?php echo esc_html( $sidebar_name ); ?> <span class="spinner"></span></h3>
+ </div>
+ <?php
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> echo '<div class="sidebar-description">';
</span></span></pre></div>
<a id="trunksrcwpadminwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/widgets.php (26592 => 26593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/widgets.php 2013-12-03 21:13:14 UTC (rev 26592)
+++ trunk/src/wp-admin/widgets.php 2013-12-03 21:31:37 UTC (rev 26593)
</span><span class="lines">@@ -329,8 +329,7 @@
</span><span class="cx"> <div class="widget-liquid-left">
</span><span class="cx"> <div id="widgets-left">
</span><span class="cx"> <div id="available-widgets" class="widgets-holder-wrap">
</span><del>- <div class="sidebar-name">
- <div class="sidebar-name-arrow"><br /></div>
</del><ins>+ <div>
</ins><span class="cx"> <h3><?php _e('Available Widgets'); ?> <span id="removing-widget"><?php _ex('Deactivate', 'removing-widget'); ?> <span></span></span></h3>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="widget-holder">
</span><span class="lines">@@ -350,7 +349,7 @@
</span><span class="cx"> $theme_sidebars = array();
</span><span class="cx"> foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
</span><span class="cx"> if ( false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) ) {
</span><del>- $wrap_class = 'widgets-holder-wrap';
</del><ins>+ $wrap_class = ( $registered_sidebar['id'] == 'wp_inactive_widgets' ) ? '' : 'widgets-holder-wrap';
</ins><span class="cx"> if ( !empty( $registered_sidebar['class'] ) )
</span><span class="cx"> $wrap_class .= ' ' . $registered_sidebar['class'];
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>