Changeset 25624

Timestamp:

09/25/2013 04:35:26 PM (10 years ago)

Author:

lancewillett

Message:

Twenty Fourteen: make the content sidebar optional and alter the layout to full-width if the sidebar is not active, but without adding wider featured image (for now). Props iamtakashi, closes #25031.

Location:

trunk/src/wp-content/themes/twentyfourteen

Files:

• functions.php (modified) (1 diff)
• sidebar-content.php (modified) (1 diff)

trunk/src/wp-content/themes/twentyfourteen/functions.php

@@ -471 +471 @@
         $classes[] = 'list-view';
 
-    if ( is_page_template( 'full-width-page.php' ) || is_page_template( 'contributor-page.php' ) || is_attachment() )
+    if ( ( ! is_front_page() && ! is_active_sidebar( 'sidebar-3' ) )
+        || is_page_template( 'full-width-page.php' )
+        || is_page_template( 'contributor-page.php' )
+        || is_attachment() )
         $classes[] = 'full-width';
 

trunk/src/wp-content/themes/twentyfourteen/sidebar-content.php

@@ -6 +6 @@
  * @subpackage Twenty_Fourteen
  */
+if ( ! is_active_sidebar( 'sidebar-3' ) )
+    return;
 ?>
 <div id="content-sidebar" class="content-sidebar widget-area" role="complementary">
     <?php do_action( 'before_sidebar' ); ?>
 
-    <?php if ( ! dynamic_sidebar( 'sidebar-3' ) ) : ?>
-        <aside id="search" class="widget widget_search">
-                <?php get_search_form(); ?>
-        </aside>
-
-        <aside id="link" class="widget widget_links">
-            <h1 class="widget-title"><?php _e( 'Blogroll', 'twentyfourteen' ); ?></h1>
-            <ul class="xoxo blogroll">
-                <?php wp_list_bookmarks( array( 'title_li' => '', 'categorize' => 0 ) ); ?>
-            </ul>
-        </aside>
-
-        <aside id="meta" class="widget">
-            <h1 class="widget-title"><?php _e( 'Meta', 'twentyfourteen' ); ?></h1>
-            <ul>
-                <?php wp_register(); ?>
-                <li><?php wp_loginout(); ?></li>
-                <?php wp_meta(); ?>
-            </ul>
-        </aside>
-    <?php endif; // end sidebar widget area ?>
+    <?php dynamic_sidebar( 'sidebar-3' ); ?>
 </div><!-- #content-sidebar -->