Changeset 23539

Timestamp:

02/28/2013 09:35:26 PM (12 years ago)

Author:

lancewillett

Message:

Twenty Thirteen: make footer widget area the primary sidebar, acting as "secondary" content. Move optional sidebar widget area to "tertiary" content. Props obenland, fixes #23644.

Location:

trunk/wp-content/themes/twentythirteen

Files:

• footer.php (modified) (1 diff)
• functions.php (modified) (4 diffs)
• js/functions.js (modified) (1 diff)
• sidebar-footer.php (deleted)
• sidebar-main.php (added)
• sidebar.php (modified) (2 diffs)

trunk/wp-content/themes/twentythirteen/footer.php

@@ -14 +14 @@
         </div><!-- #main -->
         <footer id="colophon" class="site-footer" role="contentinfo">
-            <?php get_sidebar( 'footer' ); ?>
+            <?php get_sidebar( 'main' ); ?>
 
             <div class="site-info">

trunk/wp-content/themes/twentythirteen/functions.php

@@ -170 +170 @@
 
     // Adds Masonry to handle vertical alignment of footer widgets.
-    if ( is_active_sidebar( 'sidebar-2' ) )
+    if ( is_active_sidebar( 'sidebar-1' ) )
         wp_enqueue_script( 'jquery-masonry' );
 
@@ -226 +226 @@
 function twentythirteen_widgets_init() {
     register_sidebar( array(
-        'name'          => __( 'Sidebar', 'twentythirteen' ),
+        'name'          => __( 'Main Widget Area', 'twentythirteen' ),
         'id'            => 'sidebar-1',
-        'description'   => __( 'Appears on posts and pages', 'twentythirteen' ),
+        'description'   => __( 'Appears in the footer section of the site', 'twentythirteen' ),
         'before_widget' => '<aside id="%1$s" class="widget %2$s">',
         'after_widget'  => '</aside>',
@@ -236 +236 @@
 
     register_sidebar( array(
-        'name'          => __( 'Footer Widget Area', 'twentythirteen' ),
+        'name'          => __( 'Secondary Widget Area', 'twentythirteen' ),
         'id'            => 'sidebar-2',
-        'description'   => __( 'Appears in the footer section of the site', 'twentythirteen' ),
+        'description'   => __( 'Appears on posts and pages in the sidebar.', 'twentythirteen' ),
         'before_widget' => '<aside id="%1$s" class="widget %2$s">',
         'after_widget'  => '</aside>',
@@ -506 +506 @@
         $classes[] = 'single-author';
 
-    if ( is_active_sidebar( 'sidebar-1' ) && ! is_attachment() && ! is_404() )
+    if ( is_active_sidebar( 'sidebar-2' ) && ! is_attachment() && ! is_404() )
         $classes[] = 'sidebar';
 

trunk/wp-content/themes/twentythirteen/js/functions.js

@@ -93 +93 @@
         var columnWidth = $( 'body' ).is( '.sidebar' ) ? 228 : 245;
 
-        $( '#tertiary .widget-area' ).masonry( {
+        $( '#secondary .widget-area' ).masonry( {
             itemSelector: '.widget',
             columnWidth:  columnWidth,

trunk/wp-content/themes/twentythirteen/sidebar.php

@@ -1 +1 @@
 <?php
 /**
- * The sidebar containing the main widget area.
+ * The sidebar containing the secondary widget area, displays on posts and pages.
  *
  * If no active widgets in this sidebar, it will be hidden completely.
@@ -10 +10 @@
  */
 
-if ( is_active_sidebar( 'sidebar-1' ) ) : ?>
-    <div id="secondary" class="sidebar-container" role="complementary">
+if ( is_active_sidebar( 'sidebar-2' ) ) : ?>
+    <div id="tertiary" class="sidebar-container" role="complementary">
         <div class="sidebar-inner">
             <div class="widget-area">
-                <?php dynamic_sidebar( 'sidebar-1' ); ?>
+                <?php dynamic_sidebar( 'sidebar-2' ); ?>
             </div>
         </div>
-    </div><!-- #secondary -->
+    </div><!-- #tertiary -->
 <?php endif; ?>