<!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>[21555] trunk/wp-content/themes/twentytwelve: Twenty Twelve: change homepage widget areas to use columns or multiple areas instead of one big area.</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, #logmsg > ol { margin-left: 0; 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/21555">21555</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2012-08-20 18:45:00 +0000 (Mon, 20 Aug 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Twelve: change homepage widget areas to use columns or multiple areas instead of one big area. Fixes <a href="http://core.trac.wordpress.org/ticket/21619">#21619</a>, props obenland.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytwelvefunctionsphp">trunk/wp-content/themes/twentytwelve/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvesidebarhomephp">trunk/wp-content/themes/twentytwelve/sidebar-home.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvestylecss">trunk/wp-content/themes/twentytwelve/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytwelvefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/functions.php (21554 => 21555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/functions.php 2012-08-20 18:35:33 UTC (rev 21554)
+++ trunk/wp-content/themes/twentytwelve/functions.php 2012-08-20 18:45:00 UTC (rev 21555)
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx"> register_sidebar( array(
</span><span class="cx"> 'name' => __( 'Main Sidebar', 'twentytwelve' ),
</span><span class="cx"> 'id' => 'sidebar-1',
</span><del>- 'description' => __( 'Appears on posts and pages except the optional Homepage template, which uses its own set of widgets', 'twentytwelve' ),
</del><ins>+ 'description' => __( 'Appears on posts and pages except the optional Homepage template, which has its own widgets', 'twentytwelve' ),
</ins><span class="cx"> 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
</span><span class="cx"> 'after_widget' => '</aside>',
</span><span class="cx"> 'before_title' => '<h3 class="widget-title">',
</span><span class="lines">@@ -191,17 +191,41 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> register_sidebar( array(
</span><del>- 'name' => __( 'Homepage Widgets', 'twentytwelve' ),
- 'id' => 'sidebar-home',
</del><ins>+ 'name' => __( 'Homepage Widgets One', 'twentytwelve' ),
+ 'id' => 'sidebar-2',
</ins><span class="cx"> 'description' => __( 'Appears when using the optional homepage template with a page set as Static Front Page', 'twentytwelve' ),
</span><span class="cx"> 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
</span><span class="cx"> 'after_widget' => '</aside>',
</span><span class="cx"> 'before_title' => '<h3 class="widget-title">',
</span><span class="cx"> 'after_title' => '</h3>',
</span><span class="cx"> ) );
</span><ins>+
+ register_sidebar( array(
+ 'name' => __( 'Homepage Widgets Two', 'twentytwelve' ),
+ 'id' => 'sidebar-3',
+ 'description' => __( 'Appears when using the optional homepage template with a page set as Static Front Page', 'twentytwelve' ),
+ 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
+ 'after_widget' => '</aside>',
+ 'before_title' => '<h3 class="widget-title">',
+ 'after_title' => '</h3>',
+ ) );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'widgets_init', 'twentytwelve_widgets_init' );
</span><span class="cx">
</span><ins>+/**
+ * Count the number of footer sidebars to enable dynamic classes for the footer
+ *
+ * @since Twenty Twelve 1.0
+ */
+function twentytwelve_homepage_sidebar_class() {
+ $classes = array( 'widget-area' );
+
+ if ( is_active_sidebar( 2 ) && is_active_sidebar( 3 ) )
+ $classes[] = 'two';
+
+ echo 'class="' . implode( ' ', $classes ) . '"';
+}
+
</ins><span class="cx"> if ( ! function_exists( 'twentytwelve_content_nav' ) ) :
</span><span class="cx"> /**
</span><span class="cx"> * Display navigation to next/previous pages when applicable.
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvesidebarhomephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/sidebar-home.php (21554 => 21555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/sidebar-home.php 2012-08-20 18:35:33 UTC (rev 21554)
+++ trunk/wp-content/themes/twentytwelve/sidebar-home.php 2012-08-20 18:45:00 UTC (rev 21555)
</span><span class="lines">@@ -1,17 +1,35 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The Sidebar containing the homepage widget area.
</del><ins>+ * The Sidebar containing the homepage widget areas.
</ins><span class="cx"> *
</span><del>- * If no active widgets in this sidebar, it will be hidden completely.
</del><ins>+ * If no active widgets in either sidebar, they will be hidden completely.
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Twelve
</span><span class="cx"> * @since Twenty Twelve 1.0
</span><span class="cx"> */
</span><ins>+
+/*
+The homepage widget area is triggered if any of the areas
+have widgets. So let's check that first.
+
+If none of the sidebars have widgets, then let's bail early.
+*/
+if ( ! is_active_sidebar( 2 ) && ! is_active_sidebar( 3 ) )
+ return;
+
+// If we get this far, we have widgets. Let do this.
</ins><span class="cx"> ?>
</span><ins>+<div id="secondary" <?php twentytwelve_homepage_sidebar_class(); ?> role="complementary">
+ <?php if ( is_active_sidebar( 2 ) ) : ?>
+ <div class="first home-widgets">
+ <?php dynamic_sidebar( 'sidebar-2' ); ?>
+ </div><!-- .first .home-widgets -->
+ <?php endif; ?>
</ins><span class="cx">
</span><del>- <?php if ( is_active_sidebar( 'sidebar-home' ) ) : ?>
- <div id="secondary" class="widget-area" role="complementary">
- <?php dynamic_sidebar( 'sidebar-home' ); ?>
- </div><!-- #secondary .widget-area -->
- <?php endif; ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+ <?php if ( is_active_sidebar( 3 ) ) : ?>
+ <div class="second home-widgets">
+ <?php dynamic_sidebar( 'sidebar-3' ); ?>
+ </div><!-- .second .home-widgets -->
+ <?php endif; ?>
+</div><!-- #secondary .widget-area -->
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvestylecss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/style.css (21554 => 21555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/style.css 2012-08-20 18:35:33 UTC (rev 21554)
+++ trunk/wp-content/themes/twentytwelve/style.css 2012-08-20 18:45:00 UTC (rev 21555)
</span><span class="lines">@@ -1433,18 +1433,28 @@
</span><span class="cx"> float: right;
</span><span class="cx"> width: 47.916666667%;
</span><span class="cx"> }
</span><del>- .page-template-homepage-php .widget-area .widget {
</del><ins>+ .page-template-homepage-php .widget-area .widget,
+ .page-template-homepage-php .widget-area.two .home-widgets {
</ins><span class="cx"> float: left;
</span><span class="cx"> width: 51.875%;
</span><span class="cx"> margin-bottom: 24px;
</span><span class="cx"> margin-bottom: 1.714285714rem;
</span><span class="cx"> }
</span><del>- .page-template-homepage-php .widget-area .widget:nth-child(even) {
</del><ins>+ .page-template-homepage-php .widget-area .widget:nth-child(odd) {
+ clear: right;
+ }
+ .page-template-homepage-php .widget-area .widget:nth-child(even),
+ .page-template-homepage-php .widget-area.two .home-widgets + .home-widgets {
</ins><span class="cx"> float: right;
</span><span class="cx"> width: 39.0625%;
</span><span class="cx"> margin: 0 0 24px;
</span><span class="cx"> margin: 0 0 1.714285714rem;
</span><span class="cx"> }
</span><ins>+ .page-template-homepage-php .widget-area.two .widget,
+ .page-template-homepage-php .widget-area.two .widget:nth-child(even) {
+ float: none;
+ width: auto;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Minimum width of 960 pixels. */
</span></span></pre>
</div>
</div>
</body>
</html>