WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Synchronize archive.php docs with Twenty Eleven. Go easy on the PHP/HTML context switching. see #19978. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19843 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2012-02-06 22:37:45 +00:00
parent a577a1faf8
commit 5267fef339
1 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
wp-content/themes/twentytwelve/archive.php
View File

@ -2,6 +2,11 @@
/** /**
* The template for displaying Archive pages. * The template for displaying Archive pages.
* *
* Used to display archive-type pages if nothing more specific matches a query.
* For example, puts together date-based pages if no date.php file exists.
*
* Learn more: http://codex.wordpress.org/Template_Hierarchy
*
* @package WordPress * @package WordPress
* @subpackage Twenty_Twelve * @subpackage Twenty_Twelve
* @since Twenty Twelve 1.0 * @since Twenty Twelve 1.0
@ -15,43 +20,47 @@ get_header(); ?>
<?php if ( have_posts() ) : ?> <?php if ( have_posts() ) : ?>
<header class="page-header"> <header class="page-header">
<h1 class="page-title"> <h1 class="page-title"><?php
<?php if ( is_day() ) : ?> if ( is_day() ) {
<?php printf( __( 'Daily Archives: %s', 'twentytwelve' ), '<span>' . get_the_date() . '</span>' ); ?> printf( __( 'Daily Archives: %s', 'twentytwelve' ), '<span>' . get_the_date() . '</span>' );
<?php elseif ( is_month() ) : ?> } elseif ( is_month() ) {
<?php printf( __( 'Monthly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'F Y', 'monthly archives date format', 'twentytwelve' ) ) . '</span>' ); ?> printf( __( 'Monthly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'F Y', 'monthly archives date format', 'twentytwelve' ) ) . '</span>' );
<?php elseif ( is_year() ) : ?> } elseif ( is_year() ) {
<?php printf( __( 'Yearly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'Y', 'yearly archives date format', 'twentytwelve' ) ) . '</span>' ); ?> printf( __( 'Yearly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'Y', 'yearly archives date format', 'twentytwelve' ) ) . '</span>' );
<?php elseif ( is_tag() ) : ?> } elseif ( is_tag() ) {
<?php
printf( __( 'Tag Archives: %s', 'twentytwelve' ), '<span>' . single_tag_title( '', false ) . '</span>' ); printf( __( 'Tag Archives: %s', 'twentytwelve' ), '<span>' . single_tag_title( '', false ) . '</span>' );
// Show an optional tag description // Show an optional tag description
$tag_description = tag_description(); $tag_description = tag_description();
if ( ! empty( $tag_description ) ) if ( $tag_description )
echo apply_filters( 'tag_archive_meta', '<div class="tag-archive-meta">' . $tag_description . '</div>' ); echo apply_filters( 'tag_archive_meta', '<div class="tag-archive-meta">' . $tag_description . '</div>' );
?> } elseif ( is_category() ) {
<?php elseif ( is_category() ) : ?>
<?php
printf( __( 'Category Archives: %s', 'twentytwelve' ), '<span>' . single_cat_title( '', false ) . '</span>' ); printf( __( 'Category Archives: %s', 'twentytwelve' ), '<span>' . single_cat_title( '', false ) . '</span>' );
// Show an optional category description // Show an optional category description
$category_description = category_description(); $category_description = category_description();
if ( ! empty( $category_description ) ) if ( $category_description )
echo apply_filters( 'category_archive_meta', '<div class="category-archive-meta">' . $category_description . '</div>' ); echo apply_filters( 'category_archive_meta', '<div class="category-archive-meta">' . $category_description . '</div>' );
?> } else {
<?php else : ?> _e( 'Blog Archives', 'twentytwelve' );
<?php _e( 'Blog Archives', 'twentytwelve' ); ?> }
<?php endif; ?> ?></h1>
</h1>
</header> </header>
<?php twentytwelve_content_nav( 'nav-above' ); ?> <?php
twentytwelve_content_nav( 'nav-above' );
<?php /* Start the Loop */ ?> /* Start the Loop */
<?php while ( have_posts() ) : the_post(); ?> while ( have_posts() ) : the_post();
<?php get_template_part( 'content', get_post_format() ); ?>
<?php endwhile; ?>
<?php twentytwelve_content_nav( 'nav-below' ); ?> /* Include the post format-specific template for the content. If you want to
* this in a child theme then include a file called called content-___.php
* (where ___ is the post format) and that will be used instead.
*/
get_template_part( 'content', get_post_format() );
endwhile;
twentytwelve_content_nav( 'nav-below' );
?>
<?php else : ?> <?php else : ?>