Changeset 25021 for trunk/src/wp-content/themes/twentyfourteen/image.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/image.php (modified) (6 diffs)

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

@@ -10 +10 @@
 ?>
 
-<div id="primary" class="content-area image-attachment">
+<section id="primary" class="content-area image-attachment">
     <div id="content" class="site-content full-width" role="main">
 
@@ -17 +17 @@
         <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
             <header class="entry-header">
-                <h1 class="entry-title"><?php the_title(); ?></h1>
+                <?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
 
                 <div class="entry-meta">
@@ -32 +32 @@
 
             <div class="entry-content">
-
                 <div class="entry-attachment">
                     <div class="attachment">
-                        <?php
-                            /**
-                             * Grab the IDs of all the image attachments in a gallery so we can get the URL of the next adjacent image in a gallery,
-                             * or the first image (if we're looking at the last image in a gallery), or, in a gallery of one, just the link to that image file
-                             */
-                            $attachments = array_values( get_children( array(
-                                'post_parent'    => $post->post_parent,
-                                'post_status'    => 'inherit',
-                                'post_type'      => 'attachment',
-                                'post_mime_type' => 'image',
-                                'order'          => 'ASC',
-                                'orderby'        => 'menu_order ID'
-                            ) ) );
-                            foreach ( $attachments as $k => $attachment ) {
-                                if ( $attachment->ID == $post->ID )
-                                    break;
-                            }
-                            $k++;
-                            // If there is more than 1 attachment in a gallery
-                            if ( count( $attachments ) > 1 ) {
-                                if ( isset( $attachments[ $k ] ) )
-                                    // get the URL of the next image attachment
-                                    $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
-                                else
-                                    // or get the URL of the first image attachment
-                                    $next_attachment_url = get_attachment_link( $attachments[ 0 ]->ID );
-                            } else {
-                                // or, if there's only 1 image, get the URL of the image
-                                $next_attachment_url = wp_get_attachment_url();
-                            }
-                        ?>
-
-                        <a href="<?php echo $next_attachment_url; ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php
-                            $attachment_size = apply_filters( 'twentyfourteen_attachment_size', array( 1200, 1200 ) ); // Filterable image size.
-                            echo wp_get_attachment_image( $post->ID, $attachment_size );
-                        ?></a>
+                        <?php twentyfourteen_the_attached_image(); ?>
                     </div><!-- .attachment -->
 
-                    <?php if ( ! empty( $post->post_excerpt ) ) : ?>
+                    <?php if ( has_excerpt() ) : ?>
                     <div class="entry-caption">
                         <?php the_excerpt(); ?>
@@ -80 +44 @@
                 </div><!-- .entry-attachment -->
 
-                <?php the_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>',
                     ) );
                 ?>
@@ -92 +56 @@
 
             <footer class="entry-meta">
-                <?php if ( comments_open() && pings_open() ) : // Comments and trackbacks open ?>
-                    <?php printf( __( '<a class="comment-link" href="#respond" title="Post a comment">Post a comment</a> or leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'twentyfourteen' ), get_trackback_url() ); ?>
-                <?php elseif ( ! comments_open() && pings_open() ) : // Only trackbacks open ?>
-                    <?php printf( __( 'Comments are closed, but you can leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'twentyfourteen' ), get_trackback_url() ); ?>
-                <?php elseif ( comments_open() && ! pings_open() ) : // Only comments open ?>
-                    <?php _e( 'Trackbacks are closed, but you can <a class="comment-link" href="#respond" title="Post a comment">post a comment</a>.', 'twentyfourteen' ); ?>
-                <?php elseif ( ! comments_open() && ! pings_open() ) : // Comments and trackbacks closed ?>
-                    <?php _e( 'Both comments and trackbacks are currently closed.', 'twentyfourteen' ); ?>
-                <?php endif; ?>
+                <?php
+                    if ( comments_open() && pings_open() ) : // Comments and trackbacks open
+                        printf( __( '<a class="comment-link" href="#respond" title="Post a comment">Post a comment</a> or leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'twentyfourteen' ), get_trackback_url() );
+                    elseif ( ! comments_open() && pings_open() ) : // Only trackbacks open
+                        printf( __( 'Comments are closed, but you can leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'twentyfourteen' ), get_trackback_url() );
+                    elseif ( comments_open() && ! pings_open() ) : // Only comments open
+                        _e( 'Trackbacks are closed, but you can <a class="comment-link" href="#respond" title="Post a comment">post a comment</a>.', 'twentyfourteen' );
+                    elseif ( ! comments_open() && ! pings_open() ) : // Comments and trackbacks closed
+                        _e( 'Both comments and trackbacks are currently closed.', 'twentyfourteen' );
+                    endif;
+                ?>
             </footer><!-- .entry-meta -->
-        </article><!-- #post-<?php the_ID(); ?> -->
+        </article><!-- #post-## -->
 
         <nav id="image-navigation" class="site-navigation">
@@ -113 +79 @@
     <?php endwhile; // end of the loop. ?>
 
-    </div><!-- #content .site-content -->
-</div><!-- #primary .content-area .image-attachment -->
+    </div><!-- #content -->
+</section><!-- #primary -->
 
-<?php get_sidebar(); ?>
-
-<?php get_footer(); ?>
+<?php
+get_sidebar();
+get_footer();