<!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>[26285] trunk/src/wp-admin: Widgets: split the sidebars in two containers so there are no empty spaces when they are shown in two columns and some are open, other closed.</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/26285">26285</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-11-20 04:44:21 +0000 (Wed, 20 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Widgets: split the sidebars in two containers so there are no empty spaces when they are shown in two columns and some are open, other closed. See <a href="http://core.trac.wordpress.org/ticket/25952">#25952</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsswpadmincss">trunk/src/wp-admin/css/wp-admin.css</a></li>
<li><a href="#trunksrcwpadminjswidgetsjs">trunk/src/wp-admin/js/widgets.js</a></li>
<li><a href="#trunksrcwpadminwidgetsphp">trunk/src/wp-admin/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/wp-admin.css (26284 => 26285)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/wp-admin.css 2013-11-20 03:35:38 UTC (rev 26284)
+++ trunk/src/wp-admin/css/wp-admin.css 2013-11-20 04:44:21 UTC (rev 26285)
</span><span class="lines">@@ -10810,33 +10810,33 @@
</span><span class="cx"> #menu-locations-wrap .widefat {
</span><span class="cx"> width: 100%;
</span><span class="cx"> }
</span><ins>+}
</ins><span class="cx">
</span><del>-}
</del><span class="cx"> @media only screen and (min-width: 1250px) {
</span><span class="cx"> #widgets-left #available-widgets .widget {
</span><span class="cx"> width: 49%;
</span><span class="cx"> float: left;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> #widgets-left #available-widgets .widget:nth-child(even) {
</span><span class="cx"> float: right;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- #widgets-right .widgets-holder-wrap {
- width: 48.5%;
</del><ins>+ #widgets-right .sidebars-column-1,
+ #widgets-right .sidebars-column-2 {
</ins><span class="cx"> float: left;
</span><ins>+ width: 49%;
</ins><span class="cx"> }
</span><del>-
- #widgets-right .widgets-holder-wrap:nth-child(odd) {
- clear: both;
</del><ins>+
+ #widgets-right .sidebars-column-1 {
+ margin-right: 2%;
</ins><span class="cx"> }
</span><del>-
- #widgets-right .widgets-holder-wrap:nth-child(even) {
- float: right;
- }
</del><span class="cx">
</span><del>- #widgets-right.single-sidebar .widgets-holder-wrap {
</del><ins>+ #widgets-right.single-sidebar .sidebars-column-1,
+ #widgets-right.single-sidebar .sidebars-column-2 {
+ float: none;
</ins><span class="cx"> width: 100%;
</span><ins>+ margin: 0;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpadminjswidgetsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/widgets.js (26284 => 26285)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/widgets.js 2013-11-20 03:35:38 UTC (rev 26284)
+++ trunk/src/wp-admin/js/widgets.js 2013-11-20 04:44:21 UTC (rev 26285)
</span><span class="lines">@@ -12,13 +12,14 @@
</span><span class="cx"> sidebars = $('div.widgets-sortables'),
</span><span class="cx"> isRTL = !! ( 'undefined' !== typeof isRtl && isRtl );
</span><span class="cx">
</span><del>- $('#widgets-right').children('.widgets-holder-wrap').children('.sidebar-name').click( function() {
- var $this = $(this), parent = $this.parent();
- if ( parent.hasClass('closed') ) {
- parent.removeClass('closed');
</del><ins>+ $('#widgets-right .sidebar-name').click( function() {
+ var $this = $(this), wrap = $this.closest('.widgets-holder-wrap');
+
+ if ( wrap.hasClass('closed') ) {
+ wrap.removeClass('closed');
</ins><span class="cx"> $this.siblings('.widgets-sortables').sortable('refresh');
</span><span class="cx"> } else {
</span><del>- parent.addClass('closed');
</del><ins>+ wrap.addClass('closed');
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpadminwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/widgets.php (26284 => 26285)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/widgets.php 2013-11-20 03:35:38 UTC (rev 26284)
+++ trunk/src/wp-admin/widgets.php 2013-11-20 04:44:21 UTC (rev 26285)
</span><span class="lines">@@ -345,27 +345,28 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php
</span><ins>+
+$theme_sidebars = array();
</ins><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><span class="cx"> $wrap_class = 'widgets-holder-wrap';
</span><span class="cx"> if ( !empty( $registered_sidebar['class'] ) )
</span><span class="cx"> $wrap_class .= ' ' . $registered_sidebar['class'];
</span><span class="cx">
</span><del>-?>
-
</del><ins>+ ?>
</ins><span class="cx"> <div class="<?php echo esc_attr( $wrap_class ); ?>">
</span><span class="cx"> <div class="sidebar-name">
</span><span class="cx"> <div class="sidebar-name-arrow"><br /></div>
</span><del>- <h3><?php echo esc_html( $registered_sidebar['name'] ); ?>
- <span class="spinner"></span>
- </h3>
</del><ins>+ <h3><?php echo esc_html( $registered_sidebar['name'] ); ?> <span class="spinner"></span></h3>
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="widget-holder inactive">
</span><span class="cx"> <?php wp_list_widget_controls( $registered_sidebar['id'] ); ?>
</span><span class="cx"> <div class="clear"></div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><del>-<?php
</del><ins>+ <?php
+ } else {
+ $theme_sidebars[$sidebar] = $registered_sidebar;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="lines">@@ -375,31 +376,46 @@
</span><span class="cx">
</span><span class="cx"> <div class="widget-liquid-right">
</span><span class="cx"> <div id="widgets-right">
</span><ins>+<div class="sidebars-column-1">
</ins><span class="cx"> <?php
</span><del>-$i = 0;
-foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
- if ( false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) )
- continue;
</del><span class="cx">
</span><ins>+$i = $split = 0;
+$sidebars_count = count( $theme_sidebars );
+
+if ( $sidebars_count > 2 )
+ $split = ceil( $sidebars_count / 2 );
+
+foreach ( $theme_sidebars as $sidebar => $registered_sidebar ) {
</ins><span class="cx"> $wrap_class = 'widgets-holder-wrap';
</span><span class="cx"> if ( !empty( $registered_sidebar['class'] ) )
</span><span class="cx"> $wrap_class .= ' sidebar-' . $registered_sidebar['class'];
</span><span class="cx">
</span><del>- if ( $i )
- $wrap_class .= ' closed'; ?>
</del><ins>+ if ( $i > 0 )
+ $wrap_class .= ' closed';
</ins><span class="cx">
</span><ins>+ if ( $split && $i == $split ) {
+ ?>
+ </div><div class="sidebars-column-2">
+ <?php
+ }
+
+ ?>
</ins><span class="cx"> <div class="<?php echo esc_attr( $wrap_class ); ?>">
</span><del>- <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 ?>
</del><ins>+ <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 ?>
</ins><span class="cx"> </div>
</span><del>-<?php
</del><ins>+ <?php
+
</ins><span class="cx"> $i++;
</span><del>-} ?>
</del><ins>+}
+
+?>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><ins>+</div>
</ins><span class="cx"> <form action="" method="post">
</span><span class="cx"> <?php wp_nonce_field( 'save-sidebar-widgets', '_wpnonce_widgets', false ); ?>
</span><span class="cx"> </form>
</span></span></pre>
</div>
</div>
</body>
</html>