<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[19843] trunk/wp-content/themes/twentytwelve/archive.php: Synchronize archive.php docs with Twenty Eleven.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19843">19843</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-02-06 22:37:45 +0000 (Mon, 06 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Synchronize archive.php docs with Twenty Eleven. Go easy on the PHP/HTML context switching. see <a href="http://core.trac.wordpress.org/ticket/19978">#19978</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytwelvearchivephp">trunk/wp-content/themes/twentytwelve/archive.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytwelvearchivephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/archive.php (19842 => 19843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/archive.php 2012-02-06 22:23:41 UTC (rev 19842)
+++ trunk/wp-content/themes/twentytwelve/archive.php 2012-02-06 22:37:45 UTC (rev 19843)
</span><span class="lines">@@ -2,6 +2,11 @@
</span><span class="cx"> /**
</span><span class="cx"> * The template for displaying Archive pages.
</span><span class="cx"> *
</span><ins>+ * 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
+ *
</ins><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Twelve
</span><span class="cx"> * @since Twenty Twelve 1.0
</span><span class="lines">@@ -15,44 +20,48 @@
</span><span class="cx"> <?php if ( have_posts() ) : ?>
</span><span class="cx">
</span><span class="cx"> <header class="page-header">
</span><del>- <h1 class="page-title">
- <?php if ( is_day() ) : ?>
- <?php printf( __( 'Daily Archives: %s', 'twentytwelve' ), '<span>' . get_the_date() . '</span>' ); ?>
- <?php elseif ( is_month() ) : ?>
- <?php printf( __( 'Monthly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'F Y', 'monthly archives date format', 'twentytwelve' ) ) . '</span>' ); ?>
- <?php elseif ( is_year() ) : ?>
- <?php printf( __( 'Yearly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'Y', 'yearly archives date format', 'twentytwelve' ) ) . '</span>' ); ?>
- <?php elseif ( is_tag() ) : ?>
- <?php
</del><ins>+ <h1 class="page-title"><?php
+ if ( is_day() ) {
+ printf( __( 'Daily Archives: %s', 'twentytwelve' ), '<span>' . get_the_date() . '</span>' );
+ } elseif ( is_month() ) {
+ printf( __( 'Monthly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'F Y', 'monthly archives date format', 'twentytwelve' ) ) . '</span>' );
+ } elseif ( is_year() ) {
+ printf( __( 'Yearly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'Y', 'yearly archives date format', 'twentytwelve' ) ) . '</span>' );
+ } elseif ( is_tag() ) {
</ins><span class="cx"> printf( __( 'Tag Archives: %s', 'twentytwelve' ), '<span>' . single_tag_title( '', false ) . '</span>' );
</span><span class="cx"> // Show an optional tag description
</span><span class="cx"> $tag_description = tag_description();
</span><del>- if ( ! empty( $tag_description ) )
</del><ins>+ if ( $tag_description )
</ins><span class="cx"> echo apply_filters( 'tag_archive_meta', '<div class="tag-archive-meta">' . $tag_description . '</div>' );
</span><del>- ?>
- <?php elseif ( is_category() ) : ?>
- <?php
</del><ins>+ } elseif ( is_category() ) {
</ins><span class="cx"> printf( __( 'Category Archives: %s', 'twentytwelve' ), '<span>' . single_cat_title( '', false ) . '</span>' );
</span><span class="cx"> // Show an optional category description
</span><span class="cx"> $category_description = category_description();
</span><del>- if ( ! empty( $category_description ) )
</del><ins>+ if ( $category_description )
</ins><span class="cx"> echo apply_filters( 'category_archive_meta', '<div class="category-archive-meta">' . $category_description . '</div>' );
</span><del>- ?>
- <?php else : ?>
- <?php _e( 'Blog Archives', 'twentytwelve' ); ?>
- <?php endif; ?>
- </h1>
</del><ins>+ } else {
+ _e( 'Blog Archives', 'twentytwelve' );
+ }
+ ?></h1>
</ins><span class="cx"> </header>
</span><span class="cx">
</span><del>- <?php twentytwelve_content_nav( 'nav-above' ); ?>
</del><ins>+ <?php
+ twentytwelve_content_nav( 'nav-above' );
+
+ /* Start the Loop */
+ while ( have_posts() ) : the_post();
</ins><span class="cx">
</span><del>- <?php /* Start the Loop */ ?>
- <?php while ( have_posts() ) : the_post(); ?>
- <?php get_template_part( 'content', get_post_format() ); ?>
- <?php endwhile; ?>
</del><ins>+ /* 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() );
</ins><span class="cx">
</span><del>- <?php twentytwelve_content_nav( 'nav-below' ); ?>
</del><ins>+ endwhile;
</ins><span class="cx">
</span><ins>+ twentytwelve_content_nav( 'nav-below' );
+ ?>
+
</ins><span class="cx"> <?php else : ?>
</span><span class="cx">
</span><span class="cx"> <article id="post-0" class="post no-results not-found">
</span></span></pre>
</div>
</div>
</body>
</html>