Changeset 25090

Timestamp:

08/22/2013 06:05:56 PM (11 years ago)

Author:

lancewillett

Message:

Twenty Fourteen: widgetize the Post Format front page so other widgets can be used there, and the special Post Format content can be used in other widget areas. Props obenland, see #25028.

Location:

trunk/src/wp-content/themes/twentyfourteen

Files:

• front-page.php (modified) (1 diff)
• functions.php (modified) (1 diff)
• inc/widgets.php (added)
• recent-formatted-posts.php (deleted)
• rtl.css (modified) (1 diff)
• sidebar-content.php (modified) (1 diff)
• sidebar-ephemera.php (added)
• sidebar-footer.php (modified) (1 diff)
• style.css (modified) (16 diffs)

trunk/src/wp-content/themes/twentyfourteen/front-page.php

@@ -39 +39 @@
                 </div><!-- #primary .content-area -->
 
-                <?php get_template_part( 'recent-formatted-posts' ); ?>
+                <?php get_sidebar( 'ephemera' ); ?>
 
             </div><!-- .front-page-content-area -->

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

@@ -132 +132 @@
  */
 function twentyfourteen_widgets_init() {
+    require get_template_directory() . '/inc/widgets.php';
+    register_widget( 'Twenty_Fourteen_Ephemera_Widget' );
+
     register_sidebar( array(
-        'name' => __( 'Primary Sidebar', 'twentyfourteen' ),
-        'id' => 'sidebar-1',
-        'description' => __( 'Main sidebar that appears on the left.', 'twentyfourteen' ),
+        'name'          => __( 'Primary Sidebar', 'twentyfourteen' ),
+        'id'            => 'sidebar-1',
+        'description'   => __( 'Main sidebar that appears on the left.', 'twentyfourteen' ),
         'before_widget' => '<aside id="%1$s" class="widget %2$s">',
-        'after_widget' => '</aside>',
-        'before_title' => '<h1 class="widget-title">',
-        'after_title' => '</h1>',
+        'after_widget'  => '</aside>',
+        'before_title'  => '<h1 class="widget-title">',
+        'after_title'   => '</h1>',
     ) );
     register_sidebar( array(
-        'name' => __( 'Content Sidebar', 'twentyfourteen' ),
-        'id' => 'sidebar-2',
-        'description' => __( 'Additional sidebar that appears on the right, on single posts and pages.', 'twentyfourteen' ),
+        'name'          => __( 'Front Page Sidebar', 'twentyfourteen' ),
+        'id'            => 'sidebar-2',
+        'description'   => __( 'Additional sidebar that appears on the right, on the home page.', 'twentyfourteen' ),
         'before_widget' => '<aside id="%1$s" class="widget %2$s">',
-        'after_widget' => '</aside>',
-        'before_title' => '<h1 class="widget-title">',
-        'after_title' => '</h1>',
+        'after_widget'  => '</aside>',
+        'before_title'  => '<h1 class="widget-title">',
+        'after_title'   => '</h1>',
     ) );
     register_sidebar( array(
-        'name' => __( 'Footer Widget Area', 'twentyfourteen' ),
-        'id' => 'sidebar-3',
+        'name'          => __( 'Content Sidebar', '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>',
+        '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">',
+        'after_widget'  => '</aside>',
+        'before_title'  => '<h1 class="widget-title">',
+        'after_title'   => '</h1>',
     ) );
 }

trunk/src/wp-content/themes/twentyfourteen/rtl.css

@@ -220 +220 @@
 ----------------------------------------------- */
 
-.format-title:before {
+.ephemera .widget-title:before {
     margin-left: 10px;
     margin-left: 1.0rem;

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

@@ -10 +10 @@
     <?php do_action( 'before_sidebar' ); ?>
 
-    <?php if ( ! dynamic_sidebar( 'sidebar-2' ) ) : ?>
+    <?php if ( ! dynamic_sidebar( 'sidebar-3' ) ) : ?>
         <aside id="search" class="widget widget_search">
                 <?php get_search_form(); ?>

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

@@ -6 +6 @@
  * @subpackage Twenty_Fourteen
  */
-?>
-<?php
-if (   ! is_active_sidebar( 'sidebar-3' ) )
+
+if ( ! is_active_sidebar( 'sidebar-4' ) )
     return;
 ?>
+
 <div id="supplementary">
-
-    <?php if ( is_active_sidebar( 'sidebar-3' ) ) : ?>
     <div id="footer-sidebar" class="widget-area" role="complementary">
-        <?php dynamic_sidebar( 'sidebar-3' ); ?>
+        <?php dynamic_sidebar( 'sidebar-4' ); ?>
     </div><!-- #footer-sidebar -->
-    <?php endif; ?>
-
 </div><!-- #supplementary -->

trunk/src/wp-content/themes/twentyfourteen/style.css

@@ -429 +429 @@
 .site a,
 .more-link .meta-nav,
-.more-formatted-posts-link .meta-nav,
+.post-format-archive-link .meta-nav,
 .attachment-featured-featured img,
 .attachment-featured-thumbnail img,
@@ -1029 +1029 @@
     display: inline;
 }
-.post-formatted-posts .entry-title:after,
+.ephemera .entry-title:after,
 .content-area span + .entry-date:before,
 span + .byline:before,
@@ -1183 +1183 @@
 }
 .more-link,
-.more-formatted-posts-link {
+.post-format-archive-link {
     font-size: 14px;
     font-size: 1.4rem;
@@ -1190 +1190 @@
 }
 .more-link:hover,
-.more-formatted-posts-link:hover {
+.post-format-archive-link:hover {
     text-decoration: none;
 }
 .more-link .meta-nav,
-.more-formatted-posts-link .meta-nav {
+.post-format-archive-link .meta-nav {
     position: relative;
     left: 0;
 }
 .more-link:hover .meta-nav,
-.more-formatted-posts-link:hover .meta-nav {
+.post-format-archive-link:hover .meta-nav {
     left: 5px;
     left: 0.5rem;
@@ -1431 +1431 @@
 ----------------------------------------------- */
 
-.post-formatted-posts {
+.ephemera {
     border-top: 1px solid rgba(0, 0, 0, 0.1);
     border-bottom: 1px solid rgba(0, 0, 0, 0.1);
@@ -1440 +1440 @@
     padding: 2.3rem 1.0rem 0;
 }
-.post-formatted-posts .format-title {
+.ephemera .widget-title {
     border-top: 5px solid #000;
     color: #2b2b2b;
@@ -1452 +1452 @@
     text-transform: uppercase;
 }
-.post-formatted-posts .entry-content a {
+.ephemera .entry-content a {
     word-wrap: break-word;
 }
-.format-title:before {
+.ephemera .widget-title:before {
     background-color: #000;
     color: #fff;
@@ -1468 +1468 @@
     width: 3.6rem;
 }
-.recent-videos .format-title:before {
+.ephemera .video.widget-title:before {
     content: '\F104';
 }
-.recent-images .format-title:before {
+.ephemera .image.widget-title:before {
     content: '\F102';
 }
-.recent-galleries .format-title:before {
+.ephemera .gallery.widget-title:before {
     content: '\F103';
 }
-.recent-asides .format-title:before {
+.ephemera .aside.widget-title:before {
     content: '\F101';
 }
-.recent-quotes .format-title:before {
+.ephemera .quote.widget-title:before {
     content: '\F106';
 }
-.recent-links .format-title:before {
+.ephemera .link.widget-title:before {
     content: '\F107';
 }
-.post-formatted-posts .hentry {
+.ephemera .hentry {
     border-bottom: 1px solid rgba(0, 0, 0, 0.1);
     margin-bottom: 18px;
     margin-bottom: 1.8rem;
 }
-.post-formatted-posts .hentry:last-of-type {
+.ephemera .hentry:last-of-type {
     margin-bottom: 9px;
     margin-bottom: 0.9rem;
 }
-.post-formatted-posts .entry-title {
+.ephemera .entry-title {
     display: inline;
     font-size: 12px;
@@ -1504 +1504 @@
     margin: 0 0 0.6rem 0;
 }
-.post-formatted-posts .entry-meta {
+.ephemera .entry-meta {
     color: rgba(0, 0, 0, 0.2);
     line-height: 1.5;
@@ -1510 +1510 @@
     margin-bottom: 1.8rem;
 }
-.post-formatted-posts .entry-meta a {
+.ephemera .entry-meta a {
     color: #767676;
 }
-.post-formatted-posts .entry-meta a:hover {
+.ephemera .entry-meta a:hover {
     color: #2b2b2b;
 }
-.post-formatted-posts .entry-content p:not(.wp-caption-text) {
+.ephemera .entry-content p:not(.wp-caption-text) {
     font-size: 13px;
     font-size: 1.3rem;
@@ -1523 +1523 @@
     margin-bottom: 1.8rem;
 }
-.post-formatted-posts .entry-content blockquote p cite {
+.ephemera .entry-content blockquote p cite {
     font-size: 13px;
     font-size: 1.3rem;
     line-height: 1.3846153846;
 }
-.post-formatted-posts .wp-caption {
+.ephemera .wp-caption {
     margin-bottom: 18px;
     margin-bottom: 1.8rem;
 }
-.post-formatted-posts .wp-caption-text {
+.ephemera .wp-caption-text {
     line-height: 1.5;
     margin: 6px 0 0;
@@ -1538 +1538 @@
     padding: 0;
 }
-.post-formatted-posts .format-gallery .wp-caption-text {
+.ephemera .format-gallery .wp-caption-text {
     margin-bottom: 18px;
     margin-bottom: 1.8rem;
 }
-.post-formatted-posts .more-link {
+.ephemera .more-link {
     font-size: 12px;
     font-size: 1.2rem;
     line-height: 1.5;
 }
-.post-formatted-posts .more-formatted-posts-link {
+.ephemera .post-format-archive-link {
     display: inline-block;
     font-size: 12px;
@@ -2107 +2107 @@
     margin-left: 0.1rem;
 }
-.widget div:last-child,
 .widget table:last-child,
 .widget iframe:last-child,
@@ -2519 +2518 @@
         width: 30.35714285%;
     }
-    .post-formatted-posts {
+    .ephemera {
         border: none;
         clear: none;
@@ -2824 +2823 @@
     }
     .content-sidebar,
-    .post-formatted-posts {
+    .ephemera {
         margin: 0 0 0 -27.31707317%;
         width: 24.87804878%;
@@ -3056 +3055 @@
     }
     .content-sidebar,
-    .post-formatted-posts {
+    .ephemera {
         padding-right: 0;
     }