Changeset 25762 for trunk/src/wp-content/themes/twentyfourteen/functions.php

Timestamp:

10/11/2013 03:16:59 AM (12 years ago)

Author:

lancewillett

Message:

Twenty Fourteen: merge Front Page Sidebar and Content Sidebar. Props iamtakashi, see #25565; closes #25565.

File:

• trunk/src/wp-content/themes/twentyfourteen/functions.php (modified) (4 diffs)

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

@@ -150 +150 @@
     ) );
     register_sidebar( array(
-        'name'          => __( 'Front Page Sidebar', 'twentyfourteen' ),
+        'name'          => __( 'Content Sidebar', 'twentyfourteen' ),
         'id'            => 'sidebar-2',
-        'description'   => __( 'Additional sidebar that appears on the right, on the home page.', 'twentyfourteen' ),
+        'description'   => __( 'Additional sidebar that appears on the right.', 'twentyfourteen' ),
         'before_widget' => '<aside id="%1$s" class="widget %2$s">',
         'after_widget'  => '</aside>',
@@ -159 +159 @@
     ) );
     register_sidebar( array(
-        'name'          => __( 'Content Sidebar', 'twentyfourteen' ),
+        'name'          => __( 'Footer Widget Area', 'twentyfourteen' ),
         'id'            => 'sidebar-3',
-        'description'   => __( 'Additional sidebar that appears on the right, on single posts and pages.', 'twentyfourteen' ),
-        'before_widget' => '<aside id="%1$s" class="widget %2$s">',
-        'after_widget'  => '</aside>',
-        'before_title'  => '<h1 class="widget-title">',
-        'after_title'   => '</h1>',
-    ) );
-    register_sidebar( array(
-        'name'          => __( 'Footer Widget Area', 'twentyfourteen' ),
-        'id'            => 'sidebar-4',
         'description'   => __( 'Appears in the footer section of the site.', 'twentyfourteen' ),
         'before_widget' => '<aside id="%1$s" class="widget %2$s">',
@@ -471 +462 @@
         $classes[] = 'list-view';
 
-    if ( ( ! is_front_page() && ! is_active_sidebar( 'sidebar-3' ) )
+    if ( ( ! is_active_sidebar( 'sidebar-2' ) )
         || is_page_template( 'full-width-page.php' )
         || is_page_template( 'contributor-page.php' )
@@ -477 +468 @@
         $classes[] = 'full-width';
 
-    if ( is_active_sidebar( 'sidebar-4' ) )
+    if ( is_active_sidebar( 'sidebar-3' ) )
         $classes[] = 'footer-widgets';