Changeset 25021 for trunk/src/wp-content/themes/twentyfourteen/content-single.php

Timestamp:

08/14/2013 04:38:01 PM (12 years ago)

Author:

lancewillett

Message:

Twenty Fourteen: first pass at matching code standards achieved with Twenty Thirteen development. See #24858, props obenland.

File:

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

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

@@ -4 +4 @@
  * @subpackage Twenty_Fourteen
  */
-$format = get_post_format();
-if ( false === $format )
-    $format = 'standard';
+has_post_format()
 ?>
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-    <?php if ( ( 'video' != $format ) && ( 'image' != $format ) && ( 'aside' != $format ) && ( 'link' != $format ) && ( 'quote' != $format ) ) : ?>
+    <?php if ( has_post_thumbnail() && ! has_post_format( array( 'video', 'image', 'aside', 'link', 'quote' ) ) ) : ?>
     <div class="attachment-featured-thumbnail">
-    <?php
-        if ( '' != get_the_post_thumbnail() )
-            the_post_thumbnail( 'featured-thumbnail-large' );
-    ?>
+    <?php the_post_thumbnail( 'featured-thumbnail-large' ); ?>
     </div>
     <?php endif; ?>
 
     <header class="entry-header">
+        <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
         <div class="entry-meta">
-            <?php
-                /* translators: used between list items, there is a space after the comma */
-                $categories_list = get_the_category_list( __( ', ', 'twentyfourteen' ) );
-                if ( $categories_list && twentyfourteen_categorized_blog() ) :
-            ?>
-            <span class="cat-links">
-                <?php echo $categories_list; ?>
-            </span>
-            <?php endif; // End if categories ?>
+            <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
         </div><!-- .entry-meta -->
+        <?php
+            endif;
 
-        <?php if ( ( 'standard' == $format ) || ( 'video' == $format ) || ( 'image' == $format ) || ( 'gallery' == $format ) ) : ?>
-            <h1 class="entry-title"><?php the_title(); ?></h1>
-        <?php endif; ?>
+            if ( ! has_post_format( array( 'status', 'chat', 'aside', 'link', 'quote', 'audio' ) ) ) :
+                the_title( '<h1 class="entry-title">', '</h1>' );
+            endif;
+        ?>
 
         <div class="entry-meta">
-            <?php if ( 'standard' != $format ) : ?>
+            <?php if ( has_post_format() ) : ?>
             <span class="post-format">
                 <a class="entry-format" href="<?php echo esc_url( get_post_format_link( get_post_format() ) ); ?>" title="<?php echo esc_attr( sprintf( __( 'All %s posts', 'twentyfourteen' ), get_post_format_string( get_post_format() ) ) ); ?>"><?php echo get_post_format_string( get_post_format() ); ?></a>
@@ -45 +36 @@
             <?php twentyfourteen_posted_on(); ?>
 
-            <?php if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
+            <?php if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) : ?>
             <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
             <?php endif; ?>
@@ -53 +44 @@
     </header><!-- .entry-header -->
 
-    <div class="entry-content clearfix">
-        <?php the_content(); ?>
+    <div class="entry-content">
         <?php
+            the_content();
             wp_link_pages( array(
                 'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
                 'after'       => '</div>',
                 'link_before' => '<span>',
-                'link_after'  => '</span>'
+                'link_after'  => '</span>',
             ) );
         ?>
@@ -66 +57 @@
 
     <footer class="entry-meta">
-        <?php if ( ( 'quote' == $format ) || ( 'aside' == $format ) ) : ?>
+        <?php if ( has_post_format( array( 'quote', 'aside' ) ) ) : ?>
         <div class="entry-meta">
-            <?php the_title( '<h1 class="entry-title"><a href="' . get_permalink() . '" rel="bookmark">', '</a></h1>' ); ?>
+            <?php the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' ); ?>
         </div><!-- .entry-meta -->
         <?php endif; ?>
 
-        <?php
-            $tag_list = get_the_tag_list();
-            if ( '' != $tag_list ) :
-        ?>
+        <?php if ( has_tag() ) : ?>
             <span class="tag-links">
-                <?php echo $tag_list; ?>
+                <?php echo get_the_tag_list(); ?>
             </span>
-        <?php endif; // End if $tag_list ?>
+        <?php endif; ?>
     </footer><!-- .entry-meta -->
-</article><!-- #post-<?php the_ID(); ?> -->
+</article><!-- #post-## -->