Changeset 22048

Timestamp:

09/27/2012 07:01:16 AM (12 years ago)

Author:

nacin

Message:

Add tag.php and category.php to Twenty Twelve. While by no means required, it pulls some extra logic out of archive.php, instead leveraging the template hierarchy so it is hopefully more understandable to users tweaking their themes. Use alternative control structure syntax in all templates. fixes #21951.

Location:

trunk/wp-content/themes/twentytwelve

Files:

• archive.php (modified) (2 diffs)
• author.php (modified) (1 diff)
• category.php (added)
• image.php (modified) (2 diffs)
• index.php (modified) (1 diff)
• tag.php (added)

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

@@ -7 +7 @@
  *
  * If you'd like to further customize these archive views, you may create a
- * new template file for each specific one, like tag.php for Tag archives or
+ * new template file for each specific one. For example, Twenty Twelve already
+ * has tag.php for Tag archives, category.php for Category archives, and
  * author.php for Author archives.
  *
@@ -25 +26 @@
             <header class="archive-header">
                 <h1 class="archive-title"><?php
-                    if ( is_day() ) {
+                    if ( is_day() ) :
                         printf( __( 'Daily Archives: %s', 'twentytwelve' ), '<span>' . get_the_date() . '</span>' );
-                    } elseif ( is_month() ) {
+                    elseif ( is_month() ) :
                         printf( __( 'Monthly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'F Y', 'monthly archives date format', 'twentytwelve' ) ) . '</span>' );
-                    } elseif ( is_year() ) {
+                    elseif ( is_year() ) :
                         printf( __( 'Yearly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'Y', 'yearly archives date format', 'twentytwelve' ) ) . '</span>' );
-                    } elseif ( is_tag() ) {
-                        printf( __( 'Tag Archives: %s', 'twentytwelve' ), '<span>' . single_tag_title( '', false ) . '</span>' );
-                    } elseif ( is_category() ) {
-                        printf( __( 'Category Archives: %s', 'twentytwelve' ), '<span>' . single_cat_title( '', false ) . '</span>' );
-                    } else {
+                    else :
                         _e( 'Archives', 'twentytwelve' );
-                    }
+                    endif;
                 ?></h1>
-
-                <?php
-                    // Show an optional tag description.
-                    if ( is_tag() ) {
-                        $tag_description = tag_description();
-                        if ( $tag_description )
-                            echo '<div class="archive-meta">' . $tag_description . '</div>';
-                    }
-                    // Show an optional category description.
-                    if ( is_category() ) {
-                        $category_description = category_description();
-                        if ( $category_description )
-                            echo '<div class="archive-meta">' . $category_description . '</div>';
-                    }
-                ?>
             </header><!-- .archive-header -->
 

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

@@ -2 +2 @@
 /**
  * The template for displaying Author Archive pages.
+ *
+ * Used to display archive-type pages for posts by an author.
+ *
+ * Learn more: http://codex.wordpress.org/Template_Hierarchy
  *
  * @package WordPress

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

@@ -2 +2 @@
 /**
  * The template for displaying image attachments.
+ *
+ * Learn more: http://codex.wordpress.org/Template_Hierarchy
  *
  * @package WordPress
@@ -52 +54 @@
  */
 $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 ) {
+foreach ( $attachments as $k => $attachment ) :
     if ( $attachment->ID == $post->ID )
         break;
-}
+endforeach;
+
 $k++;
 // If there is more than 1 attachment in a gallery
-if ( count( $attachments ) > 1 ) {
-    if ( isset( $attachments[ $k ] ) )
+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
+    else :
         // or get the URL of the first image attachment
         $next_attachment_url = get_attachment_link( $attachments[ 0 ]->ID );
-} else {
+    endif;
+else :
     // or, if there's only 1 image, get the URL of the image
     $next_attachment_url = wp_get_attachment_url();
-}
+endif;
 ?>
                                 <a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php

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

@@ -6 +6 @@
  * and one of the two required files for a theme (the other being style.css).
  * It is used to display a page when nothing more specific matches a query.
- * E.g., it puts together the home page when no home.php file exists.
+ * For example, it puts together the home page when no home.php file exists.
+ *
  * Learn more: http://codex.wordpress.org/Template_Hierarchy
  *