<!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>[23539] trunk/wp-content/themes/twentythirteen: Twenty Thirteen: make footer widget area the primary sidebar, acting as "secondary" content.</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/23539">23539</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-02-28 21:35:26 +0000 (Thu, 28 Feb 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Thirteen: make footer widget area the primary sidebar, acting as "secondary" content. Move optional sidebar widget area to "tertiary" content. Props obenland, fixes <a href="http://core.trac.wordpress.org/ticket/23644">#23644</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentythirteenfooterphp">trunk/wp-content/themes/twentythirteen/footer.php</a></li>
<li><a href="#trunkwpcontentthemestwentythirteenfunctionsphp">trunk/wp-content/themes/twentythirteen/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentythirteenjsfunctionsjs">trunk/wp-content/themes/twentythirteen/js/functions.js</a></li>
<li><a href="#trunkwpcontentthemestwentythirteensidebarphp">trunk/wp-content/themes/twentythirteen/sidebar.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentythirteensidebarmainphp">trunk/wp-content/themes/twentythirteen/sidebar-main.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentythirteensidebarfooterphp">trunk/wp-content/themes/twentythirteen/sidebar-footer.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentythirteenfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/footer.php (23538 => 23539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/footer.php 2013-02-28 21:28:47 UTC (rev 23538)
+++ trunk/wp-content/themes/twentythirteen/footer.php 2013-02-28 21:35:26 UTC (rev 23539)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx">
</span><span class="cx"> </div><!-- #main -->
</span><span class="cx"> <footer id="colophon" class="site-footer" role="contentinfo">
</span><del>- <?php get_sidebar( 'footer' ); ?>
</del><ins>+ <?php get_sidebar( 'main' ); ?>
</ins><span class="cx">
</span><span class="cx"> <div class="site-info">
</span><span class="cx"> <?php do_action( 'twentythirteen_credits' ); ?>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentythirteenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/functions.php (23538 => 23539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/functions.php 2013-02-28 21:28:47 UTC (rev 23538)
+++ trunk/wp-content/themes/twentythirteen/functions.php 2013-02-28 21:35:26 UTC (rev 23539)
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> wp_enqueue_script( 'comment-reply' );
</span><span class="cx">
</span><span class="cx"> // Adds Masonry to handle vertical alignment of footer widgets.
</span><del>- if ( is_active_sidebar( 'sidebar-2' ) )
</del><ins>+ if ( is_active_sidebar( 'sidebar-1' ) )
</ins><span class="cx"> wp_enqueue_script( 'jquery-masonry' );
</span><span class="cx">
</span><span class="cx"> // Loads JavaScript file with functionality specific to Twenty Thirteen.
</span><span class="lines">@@ -225,9 +225,9 @@
</span><span class="cx"> */
</span><span class="cx"> function twentythirteen_widgets_init() {
</span><span class="cx"> register_sidebar( array(
</span><del>- 'name' => __( 'Sidebar', 'twentythirteen' ),
</del><ins>+ 'name' => __( 'Main Widget Area', 'twentythirteen' ),
</ins><span class="cx"> 'id' => 'sidebar-1',
</span><del>- 'description' => __( 'Appears on posts and pages', 'twentythirteen' ),
</del><ins>+ 'description' => __( 'Appears in the footer section of the site', 'twentythirteen' ),
</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">@@ -235,9 +235,9 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> register_sidebar( array(
</span><del>- 'name' => __( 'Footer Widget Area', 'twentythirteen' ),
</del><ins>+ 'name' => __( 'Secondary Widget Area', 'twentythirteen' ),
</ins><span class="cx"> 'id' => 'sidebar-2',
</span><del>- 'description' => __( 'Appears in the footer section of the site', 'twentythirteen' ),
</del><ins>+ 'description' => __( 'Appears on posts and pages in the sidebar.', 'twentythirteen' ),
</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">@@ -505,7 +505,7 @@
</span><span class="cx"> if ( ! is_multi_author() )
</span><span class="cx"> $classes[] = 'single-author';
</span><span class="cx">
</span><del>- if ( is_active_sidebar( 'sidebar-1' ) && ! is_attachment() && ! is_404() )
</del><ins>+ if ( is_active_sidebar( 'sidebar-2' ) && ! is_attachment() && ! is_404() )
</ins><span class="cx"> $classes[] = 'sidebar';
</span><span class="cx">
</span><span class="cx"> return $classes;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentythirteenjsfunctionsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/js/functions.js (23538 => 23539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/js/functions.js 2013-02-28 21:28:47 UTC (rev 23538)
+++ trunk/wp-content/themes/twentythirteen/js/functions.js 2013-02-28 21:35:26 UTC (rev 23539)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> if ( $.isFunction( $.fn.masonry ) ) {
</span><span class="cx"> var columnWidth = $( 'body' ).is( '.sidebar' ) ? 228 : 245;
</span><span class="cx">
</span><del>- $( '#tertiary .widget-area' ).masonry( {
</del><ins>+ $( '#secondary .widget-area' ).masonry( {
</ins><span class="cx"> itemSelector: '.widget',
</span><span class="cx"> columnWidth: columnWidth,
</span><span class="cx"> gutterWidth: 20
</span></span></pre></div>
<a id="trunkwpcontentthemestwentythirteensidebarfooterphp"></a>
<div class="delfile"><h4>Deleted: trunk/wp-content/themes/twentythirteen/sidebar-footer.php (23538 => 23539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/sidebar-footer.php 2013-02-28 21:28:47 UTC (rev 23538)
+++ trunk/wp-content/themes/twentythirteen/sidebar-footer.php 2013-02-28 21:35:26 UTC (rev 23539)
</span><span class="lines">@@ -1,18 +0,0 @@
</span><del>-<?php
-/**
- * The sidebar containing the footer widget area.
- *
- * If no active widgets in this sidebar, it will be hidden completely.
- *
- * @package WordPress
- * @subpackage Twenty_Thirteen
- * @since Twenty Thirteen 1.0
- */
-
-if ( is_active_sidebar( 'sidebar-2' ) ) : ?>
- <div id="tertiary" class="sidebar-container" role="complementary">
- <div class="widget-area">
- <?php dynamic_sidebar( 'sidebar-2' ); ?>
- </div>
- </div><!-- #tertiary -->
-<?php endif; ?>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentythirteensidebarmainphp"></a>
<div class="addfile"><h4>Added: trunk/wp-content/themes/twentythirteen/sidebar-main.php (0 => 23539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/sidebar-main.php (rev 0)
+++ trunk/wp-content/themes/twentythirteen/sidebar-main.php 2013-02-28 21:35:26 UTC (rev 23539)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<?php
+/**
+ * The sidebar containing the footer widget area.
+ *
+ * If no active widgets in this sidebar, it will be hidden completely.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Thirteen
+ * @since Twenty Thirteen 1.0
+ */
+
+if ( is_active_sidebar( 'sidebar-1' ) ) : ?>
+ <div id="secondary" class="sidebar-container" role="complementary">
+ <div class="widget-area">
+ <?php dynamic_sidebar( 'sidebar-1' ); ?>
+ </div>
+ </div><!-- #secondary -->
+<?php endif; ?>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/wp-content/themes/twentythirteen/sidebar-main.php
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkwpcontentthemestwentythirteensidebarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/sidebar.php (23538 => 23539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/sidebar.php 2013-02-28 21:28:47 UTC (rev 23538)
+++ trunk/wp-content/themes/twentythirteen/sidebar.php 2013-02-28 21:35:26 UTC (rev 23539)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The sidebar containing the main widget area.
</del><ins>+ * The sidebar containing the secondary widget area, displays on posts and pages.
</ins><span class="cx"> *
</span><span class="cx"> * If no active widgets in this sidebar, it will be hidden completely.
</span><span class="cx"> *
</span><span class="lines">@@ -9,12 +9,12 @@
</span><span class="cx"> * @since Twenty Thirteen 1.0
</span><span class="cx"> */
</span><span class="cx">
</span><del>-if ( is_active_sidebar( 'sidebar-1' ) ) : ?>
- <div id="secondary" class="sidebar-container" role="complementary">
</del><ins>+if ( is_active_sidebar( 'sidebar-2' ) ) : ?>
+ <div id="tertiary" class="sidebar-container" role="complementary">
</ins><span class="cx"> <div class="sidebar-inner">
</span><span class="cx"> <div class="widget-area">
</span><del>- <?php dynamic_sidebar( 'sidebar-1' ); ?>
</del><ins>+ <?php dynamic_sidebar( 'sidebar-2' ); ?>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><del>- </div><!-- #secondary -->
</del><ins>+ </div><!-- #tertiary -->
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>