Changeset 19915 for trunk/wp-content/themes/twentytwelve/content.php

Timestamp:

02/14/2012 03:54:46 AM (13 years ago)

Author:

lancewillett

Message:

Twenty Twelve template changes and fixes ... see #19978.

• Add custom header support
• header.php: use get_stylesheet_uri() to load stylesheet, props Mamaduka
• Add full-width template, including adding relevant body_class value as a CSS hook
• Hide sidebar on all views if no active widgets exist
• Fix site title output (was missing site title)
• Remove "featured" title for sticky posts
• Add content template files for aside, image, link, and quote post formats
• Indent content-single.php to match content.php
• Remove sample JPG since Twenty Twelve ships with no default header images

... and style updates, props drewstrojny

• Better footer styles
• Styling for full-width layouts
• Add basic styles for archive views
• Refine post header/footer styles a bit

File:

• trunk/wp-content/themes/twentytwelve/content.php (modified) (6 diffs)

trunk/wp-content/themes/twentytwelve/content.php

@@ -1 +1 @@
 <?php
 /**
- * The default template for displaying content
+ * The default template for displaying content on indexed pages (home, archive, search)
  *
  * @package WordPress
@@ -11 +11 @@
     <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
         <header class="entry-header">
-            <?php if ( is_sticky() ) : ?>
-                <hgroup>
-                    <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
-                    <h3 class="entry-format"><?php _e( 'Featured', 'twentytwelve' ); ?></h3>
-                </hgroup>
-            <?php else : ?>
             <h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
-            <?php endif; ?>
 
-            <?php if ( 'post' == get_post_type() ) : ?>
+            <?php if ( 'post' == get_post_type() ) : // Hide entry meta for pages ?>
             <div class="entry-meta">
                 <?php twentytwelve_posted_on(); ?>
@@ -27 +20 @@
         </header><!-- .entry-header -->
 
-        <?php if ( is_search() ) : // Only display Excerpts for Search ?>
+        <?php if ( is_search() ) : // Only display excerpts for search ?>
         <div class="entry-summary">
             <?php the_excerpt(); ?>
@@ -39 +32 @@
 
         <footer class="entry-meta">
-            <?php $show_sep = false; ?>
-            <?php if ( 'post' == get_post_type() ) : // Hide category and tag text for pages on Search ?>
+            <?php if ( 'post' == get_post_type() ) : // Hide category and tag text for pages ?>
             <?php
                 /* translators: used between list items, there is a space after the comma */
                 $categories_list = get_the_category_list( __( ', ', 'twentytwelve' ) );
-                if ( $categories_list ):
+                if ( $categories_list ) :
             ?>
             <span class="cat-links">
-                <?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentytwelve' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list );
-                $show_sep = true; ?>
+                <?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentytwelve' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list ); ?>
             </span>
             <?php endif; // End if categories ?>
@@ -54 +45 @@
                 /* translators: used between list items, there is a space after the comma */
                 $tags_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
-                if ( $tags_list ):
-                if ( $show_sep ) : ?>
-            <span class="sep"> | </span>
-                <?php endif; // End if $show_sep ?>
+                if ( $tags_list ) : ?>
             <span class="tag-links">
-                <?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentytwelve' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list );
-                $show_sep = true; ?>
+                <?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentytwelve' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list ); ?>
             </span>
             <?php endif; // End if $tags_list ?>
@@ -66 +53 @@
 
             <?php if ( comments_open() ) : ?>
-            <?php if ( $show_sep ) : ?>
-            <span class="sep"> | </span>
-            <?php endif; // End if $show_sep ?>
             <span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentytwelve' ) . '</span>', __( '<b>1</b> Reply', 'twentytwelve' ), __( '<b>%</b> Replies', 'twentytwelve' ) ); ?></span>
             <?php endif; // End if comments_open() ?>