<!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>[25021] trunk/src/wp-content/themes/twentyfourteen: Twenty Fourteen: first pass at matching code standards achieved with Twenty Thirteen development.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/25021">25021</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-08-14 16:38:01 +0000 (Wed, 14 Aug 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Fourteen: first pass at matching code standards achieved with Twenty Thirteen development. See <a href="http://core.trac.wordpress.org/ticket/24858">#24858</a>, props obenland.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfourteen404php">trunk/src/wp-content/themes/twentyfourteen/404.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenarchivephp">trunk/src/wp-content/themes/twentyfourteen/archive.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencommentsphp">trunk/src/wp-content/themes/twentyfourteen/comments.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentfeaturedpostphp">trunk/src/wp-content/themes/twentyfourteen/content-featured-post.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentpagephp">trunk/src/wp-content/themes/twentyfourteen/content-page.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentpostformatphp">trunk/src/wp-content/themes/twentyfourteen/content-post-format.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentrecentformattedpostphp">trunk/src/wp-content/themes/twentyfourteen/content-recent-formatted-post.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentsinglephp">trunk/src/wp-content/themes/twentyfourteen/content-single.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentphp">trunk/src/wp-content/themes/twentyfourteen/content.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenfeaturedcontentphp">trunk/src/wp-content/themes/twentyfourteen/featured-content.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenfooterphp">trunk/src/wp-content/themes/twentyfourteen/footer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenfullwidthpagephp">trunk/src/wp-content/themes/twentyfourteen/full-width-page.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenfunctionsphp">trunk/src/wp-content/themes/twentyfourteen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenheaderphp">trunk/src/wp-content/themes/twentyfourteen/header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenimagephp">trunk/src/wp-content/themes/twentyfourteen/image.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteeninccustomheaderphp">trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteeninccustomizerphp">trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteeninctemplatetagsphp">trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenindexphp">trunk/src/wp-content/themes/twentyfourteen/index.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteennoresultsphp">trunk/src/wp-content/themes/twentyfourteen/no-results.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenpagephp">trunk/src/wp-content/themes/twentyfourteen/page.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteensearchphp">trunk/src/wp-content/themes/twentyfourteen/search.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteensearchformphp">trunk/src/wp-content/themes/twentyfourteen/searchform.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteensidebarphp">trunk/src/wp-content/themes/twentyfourteen/sidebar.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteensinglephp">trunk/src/wp-content/themes/twentyfourteen/single.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenstylecss">trunk/src/wp-content/themes/twentyfourteen/style.css</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfourteenfrontpagephp">trunk/src/wp-content/themes/twentyfourteen/front-page.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyfourteen404php"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/404.php (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/404.php 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/404.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -11,24 +11,20 @@
</span><span class="cx"> <div id="primary" class="content-area">
</span><span class="cx"> <div id="content" class="site-content" role="main">
</span><span class="cx">
</span><del>- <article id="post-0" class="post error404 not-found">
- <header class="entry-header">
- <h1 class="entry-title"><?php _e( 'Oops! That page can’t be found.', 'twentyfourteen' ); ?></h1>
- </header><!-- .entry-header -->
</del><ins>+ <header class="page-header">
+ <h1 class="page-title"><?php _e( "Oops! That page can't be found.", 'twentyfourteen' ); ?></h1>
+ </header>
</ins><span class="cx">
</span><del>- <div class="entry-content">
- <p><?php _e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', 'twentyfourteen' ); ?></p>
</del><ins>+ <div class="page-content">
+ <p><?php _e( 'It looks like nothing was found at this location. Maybe try a search?', 'twentyfourteen' ); ?></p>
</ins><span class="cx">
</span><del>- <?php get_search_form(); ?>
</del><ins>+ <?php get_search_form(); ?>
+ </div><!-- .page-content -->
</ins><span class="cx">
</span><del>- </div><!-- .entry-content -->
- </article><!-- #post-0 .post .error404 .not-found -->
</del><ins>+ </div><!-- #content -->
+ </div><!-- #primary -->
</ins><span class="cx">
</span><del>- </div><!-- #content .site-content -->
- </div><!-- #primary .content-area -->
-
-<?php get_sidebar( 'content' ); ?>
-
-<?php get_sidebar(); ?>
-
-<?php get_footer(); ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php
+get_sidebar( 'content' );
+get_sidebar();
+get_footer();
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenarchivephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/archive.php (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/archive.php 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/archive.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -2,6 +2,14 @@
</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.
+ *
+ * If you'd like to further customize these archive views, you may create a
+ * new template file for each specific one. For example, Twenty Fourteen
+ * already has tag.php for Tag archives, category.php for Category archives,
+ * and author.php for Author archives.
+ *
</ins><span class="cx"> * Learn more: http://codex.wordpress.org/Template_Hierarchy
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="lines">@@ -13,79 +21,45 @@
</span><span class="cx"> <section id="primary" class="content-area">
</span><span class="cx"> <div id="content" class="site-content" role="main">
</span><span class="cx">
</span><del>- <?php if ( have_posts() ) : ?>
</del><ins>+ <?php if ( have_posts() ) : ?>
</ins><span class="cx">
</span><span class="cx"> <header class="page-header">
</span><span class="cx"> <h1 class="page-title">
</span><span class="cx"> <?php
</span><del>- if ( is_category() ) {
- printf( __( 'Category Archives: %s', 'twentyfourteen' ), '<span>' . single_cat_title( '', false ) . '</span>' );
</del><ins>+ if ( is_day() ) :
+ printf( __( 'Day: %s', 'twentyfourteen' ), get_the_date() );
</ins><span class="cx">
</span><del>- } elseif ( is_tag() ) {
- printf( __( 'Tag Archives: %s', 'twentyfourteen' ), '<span>' . single_tag_title( '', false ) . '</span>' );
</del><ins>+ elseif ( is_month() ) :
+ printf( __( 'Month: %s', 'twentyfourteen' ), get_the_date( 'F Y' ) );
</ins><span class="cx">
</span><del>- } elseif ( is_author() ) {
- /* Queue the first post, that way we know
- * what author we're dealing with (if that is the case).
- */
- the_post();
- printf( __( 'Author Archives: %s', 'twentyfourteen' ), '<span class="vcard"><a class="url fn n" href="' . get_author_posts_url( get_the_author_meta( 'ID' ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' );
- /* Since we called the_post() above, we need to
- * rewind the loop back to the beginning that way
- * we can run the loop properly, in full.
- */
- rewind_posts();
</del><ins>+ elseif ( is_year() ) :
+ printf( __( 'Year: %s', 'twentyfourteen' ), get_the_date( 'Y' ) );
</ins><span class="cx">
</span><del>- } elseif ( is_day() ) {
- printf( __( 'Daily Archives: %s', 'twentyfourteen' ), '<span>' . get_the_date() . '</span>' );
-
- } elseif ( is_month() ) {
- printf( __( 'Monthly Archives: %s', 'twentyfourteen' ), '<span>' . get_the_date( 'F Y' ) . '</span>' );
-
- } elseif ( is_year() ) {
- printf( __( 'Yearly Archives: %s', 'twentyfourteen' ), '<span>' . get_the_date( 'Y' ) . '</span>' );
-
- } else {
</del><ins>+ else :
</ins><span class="cx"> _e( 'Archives', 'twentyfourteen' );
</span><span class="cx">
</span><del>- }
</del><ins>+ endif;
</ins><span class="cx"> ?>
</span><span class="cx"> </h1>
</span><del>- <?php
- if ( is_category() ) {
- // show an optional category description
- $category_description = category_description();
- if ( ! empty( $category_description ) )
- echo apply_filters( 'category_archive_meta', '<div class="taxonomy-description">' . $category_description . '</div>' );
-
- } elseif ( is_tag() ) {
- // show an optional tag description
- $tag_description = tag_description();
- if ( ! empty( $tag_description ) )
- echo apply_filters( 'tag_archive_meta', '<div class="taxonomy-description">' . $tag_description . '</div>' );
- }
- ?>
</del><span class="cx"> </header><!-- .page-header -->
</span><span class="cx">
</span><del>- <?php while ( have_posts() ) : the_post(); ?>
</del><ins>+ <?php
+ while ( have_posts() ) :
+ the_post();
</ins><span class="cx">
</span><del>- <?php twentyfourteen_get_template_part(); ?>
</del><ins>+ twentyfourteen_get_template_part();
+ endwhile;
+ twentyfourteen_content_nav( 'nav-below' );
</ins><span class="cx">
</span><del>- <?php endwhile; ?>
</del><ins>+ else :
+ get_template_part( 'no-results', 'archive' );
</ins><span class="cx">
</span><del>- <?php twentyfourteen_content_nav( 'nav-below' ); ?>
</del><ins>+ endif;
+ ?>
+ </div><!-- #content -->
+</section><!-- #primary -->
</ins><span class="cx">
</span><del>- <?php else : ?>
-
- <?php get_template_part( 'no-results', 'archive' ); ?>
-
- <?php endif; ?>
-
- </div><!-- #content .site-content -->
-</section><!-- #primary .content-area -->
-
-<?php get_sidebar( 'content' ); ?>
-
-<?php get_sidebar(); ?>
-
-<?php get_footer(); ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php
+get_sidebar( 'content' );
+get_sidebar();
+get_footer();
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/comments.php (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/comments.php 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/comments.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -2,75 +2,65 @@
</span><span class="cx"> /**
</span><span class="cx"> * The template for displaying Comments.
</span><span class="cx"> *
</span><del>- * The area of the page that contains both current comments
- * and the comment form. The actual display of comments is
- * handled by a callback to twentyfourteen_comment() which is
- * located in the functions.php file.
</del><ins>+ * The area of the page that contains comments and the comment form.
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Fourteen
</span><span class="cx"> */
</span><del>-?>
</del><span class="cx">
</span><del>-<?php
- /*
- * If the current post is protected by a password and
- * the visitor has not yet entered the password we will
- * return early without loading the comments.
- */
- if ( post_password_required() )
- return;
</del><ins>+/*
+ * If the current post is protected by a password and the visitor has not yet
+ * entered the password we will return early without loading the comments.
+ */
+if ( post_password_required() )
+ return;
</ins><span class="cx"> ?>
</span><span class="cx">
</span><del>- <div id="comments" class="comments-area">
</del><ins>+<div id="comments" class="comments-area">
</ins><span class="cx">
</span><del>- <?php // You can start editing here -- including this comment! ?>
-
</del><span class="cx"> <?php if ( have_comments() ) : ?>
</span><del>- <h2 class="comments-title">
- <?php
- printf( _n( 'One thought on “%2$s”', '%1$s thoughts on “%2$s”', get_comments_number(), 'twentyfourteen' ),
- number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>' );
- ?>
- </h2>
</del><span class="cx">
</span><del>- <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
- <nav role="navigation" id="comment-nav-above" class="site-navigation comment-navigation clearfix">
- <h1 class="assistive-text"><?php _e( 'Comment navigation', 'twentyfourteen' ); ?></h1>
- <div class="nav-previous"><?php previous_comments_link( __( '← Older Comments', 'twentyfourteen' ) ); ?></div>
- <div class="nav-next"><?php next_comments_link( __( 'Newer Comments →', 'twentyfourteen' ) ); ?></div>
- </nav><!-- #comment-nav-above .site-navigation .comment-navigation -->
- <?php endif; // check for comment navigation ?>
</del><ins>+ <h2 class="comments-title">
+ <?php
+ printf( _n( 'One thought on “%2$s”', '%1$s thoughts on “%2$s”', get_comments_number(), 'twentyfourteen' ),
+ number_format_i18n( get_comments_number() ), get_the_title() );
+ ?>
+ </h2>
</ins><span class="cx">
</span><del>- <ol class="commentlist">
- <?php
- /* Loop through and list the comments. Tell wp_list_comments()
- * to use twentyfourteen_comment() to format the comments.
- * If you want to overload this in a child theme then you can
- * define twentyfourteen_comment() and that will be used instead.
- * See twentyfourteen_comment() in inc/template-tags.php for more.
- */
- wp_list_comments( array( 'callback' => 'twentyfourteen_comment' ) );
- ?>
- </ol><!-- .commentlist -->
</del><ins>+ <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : ?>
+ <nav id="comment-nav-above" class="navigation comment-navigation" role="navigation">
+ <h1 class="screen-reader-text"><?php _e( 'Comment navigation', 'twentyfourteen' ); ?></h1>
+ <div class="nav-previous"><?php previous_comments_link( __( '← Older Comments', 'twentyfourteen' ) ); ?></div>
+ <div class="nav-next"><?php next_comments_link( __( 'Newer Comments →', 'twentyfourteen' ) ); ?></div>
+ </nav><!-- #comment-nav-above -->
+ <?php endif; // Check for comment navigation. ?>
</ins><span class="cx">
</span><del>- <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
- <nav role="navigation" id="comment-nav-below" class="site-navigation comment-navigation clearfix">
- <h1 class="assistive-text"><?php _e( 'Comment navigation', 'twentyfourteen' ); ?></h1>
- <div class="nav-previous"><?php previous_comments_link( __( '← Older Comments', 'twentyfourteen' ) ); ?></div>
- <div class="nav-next"><?php next_comments_link( __( 'Newer Comments →', 'twentyfourteen' ) ); ?></div>
- </nav><!-- #comment-nav-below .site-navigation .comment-navigation -->
- <?php endif; // check for comment navigation ?>
</del><ins>+ <ol class="comment-list">
+ <?php
+ wp_list_comments( array(
+ 'style' => 'ol',
+ 'short_ping' => true,
</ins><span class="cx">
</span><del>- <?php endif; // have_comments() ?>
</del><ins>+ // TODO: Remove callback and update styles.
+ 'callback'=>'twentyfourteen_comment',
+ ) );
+ ?>
+ </ol><!-- .comment-list -->
</ins><span class="cx">
</span><del>- <?php
- // If comments are closed and there are comments, let's leave a little note, shall we?
- if ( ! comments_open() && '0' != get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
- ?>
- <p class="nocomments"><?php _e( 'Comments are closed.', 'twentyfourteen' ); ?></p>
</del><ins>+ <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : ?>
+ <nav id="comment-nav-below" class="navigation comment-navigation" role="navigation">
+ <h1 class="screen-reader-text"><?php _e( 'Comment navigation', 'twentyfourteen' ); ?></h1>
+ <div class="nav-previous"><?php previous_comments_link( __( '← Older Comments', 'twentyfourteen' ) ); ?></div>
+ <div class="nav-next"><?php next_comments_link( __( 'Newer Comments →', 'twentyfourteen' ) ); ?></div>
+ </nav><!-- #comment-nav-below -->
+ <?php endif; // Check for comment navigation. ?>
+
+ <?php if ( ! comments_open() ) : ?>
+ <p class="nocomments"><?php _e( 'Comments are closed.', 'twentyfourteen' ); ?></p>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><ins>+ <?php endif; // have_comments() ?>
+
</ins><span class="cx"> <?php comment_form(); ?>
</span><span class="cx">
</span><del>-</div><!-- #comments .comments-area -->
</del><ins>+</div><!-- #comments -->
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentfeaturedpostphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/content-featured-post.php (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/content-featured-post.php 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/content-featured-post.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -5,41 +5,47 @@
</span><span class="cx"> */
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>-<article id="post-<?php the_ID(); ?>" <?php post_class( 'clearfix' ); ?>>
- <a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyfourteen' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="<?php the_ID(); ?>" class="attachment-featured-featured">
</del><ins>+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <a class="attachment-featured-featured" href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyfourteen' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="<?php the_ID(); ?>">
</ins><span class="cx"> <?php
</span><del>- $images = get_children( array( 'post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 1 ) );
</del><ins>+ if ( has_post_thumbnail() ) :
+ the_post_thumbnail( 'featured-thumbnail-featured' );
</ins><span class="cx">
</span><del>- if ( '' != get_the_post_thumbnail() ) :
- the_post_thumbnail( 'featured-thumbnail-featured' );
- elseif ( $images ) :
- $image = array_shift( $images );
- echo wp_get_attachment_image( $image->ID, 'featured-thumbnail-featured' );
- else : ?>
- <img src="<?php echo get_template_directory_uri(); ?>/images/placeholder.png" alt="" class="featured-thumbnail-featured" /><?php
</del><ins>+ else :
+ $images = get_children( array(
+ 'post_parent' => get_the_ID(),
+ 'post_type' => 'attachment',
+ 'post_mime_type' => 'image',
+ 'orderby' => 'menu_order',
+ 'order' => 'ASC',
+ 'numberposts' => 1,
+ ) );
+
+ if ( $images ) :
+ $image = array_shift( $images );
+ echo wp_get_attachment_image( $image->ID, 'featured-thumbnail-featured' );
+
+ else : ?>
+ <img class="featured-thumbnail-featured" src="<?php echo get_template_directory_uri(); ?>/images/placeholder.png" alt="" /><?php
+
+ endif;
</ins><span class="cx"> endif;
</span><span class="cx"> ?>
</span><span class="cx"> </a>
</span><span class="cx">
</span><span class="cx"> <div class="entry-wrap">
</span><span class="cx"> <header class="entry-header">
</span><ins>+ <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
</ins><span class="cx"> <div class="entry-meta">
</span><del>- <?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 ?>
</del><ins>+ <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><del>- <h1 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
</del><ins>+ <?php endif; ?>
+
+ <?php the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' ); ?>
</ins><span class="cx"> </header><!-- .entry-header -->
</span><span class="cx">
</span><del>- <div class="entry-summary clearfix">
</del><ins>+ <div class="entry-summary">
</ins><span class="cx"> <?php the_excerpt(); ?>
</span><span class="cx"> </div><!-- .entry-summary -->
</span><span class="cx"> </div>
</span><del>-
-</article><!-- #post-<?php the_ID(); ?> -->
</del><span class="cx">\ No newline at end of file
</span><ins>+</article><!-- #post-## -->
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentpagephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/content-page.php (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/content-page.php 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/content-page.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template used for displaying page content in page.php
</del><ins>+ * The template used for displaying page content.
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Fourteen
</span><span class="lines">@@ -8,20 +8,19 @@
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><del>- <header class="entry-header">
- <h1 class="entry-title"><?php the_title(); ?></h1>
- </header><!-- .entry-header -->
</del><ins>+ <?php the_title( '<header class="entry-header"><h1 class="entry-title">', '</h1></header><!-- .entry-header -->' ); ?>
</ins><span class="cx">
</span><del>- <div class="entry-content clearfix">
- <?php the_content(); ?>
</del><ins>+ <div class="entry-content">
</ins><span class="cx"> <?php
</span><ins>+ the_content();
</ins><span class="cx"> wp_link_pages( array(
</span><span class="cx"> 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
</span><span class="cx"> 'after' => '</div>',
</span><span class="cx"> 'link_before' => '<span>',
</span><del>- 'link_after' => '</span>'
</del><ins>+ 'link_after' => '</span>',
</ins><span class="cx"> ) );
</span><ins>+
+ edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' );
</ins><span class="cx"> ?>
</span><del>- <?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?>
</del><span class="cx"> </div><!-- .entry-content -->
</span><del>-</article><!-- #post-<?php the_ID(); ?> -->
</del><ins>+</article><!-- #post-## -->
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentpostformatphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/content-post-format.php (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/content-post-format.php 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/content-post-format.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -43,41 +43,37 @@
</span><span class="cx"> <?php
</span><span class="cx"> if ( 'post' == get_post_type() )
</span><span class="cx"> twentyfourteen_posted_on();
</span><ins>+
+ if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) :
</ins><span class="cx"> ?>
</span><del>-
- <?php if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
- <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
</del><ins>+ <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?>
</span><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx"> </header><!-- .entry-header -->
</span><span class="cx">
</span><del>- <div class="entry-content clearfix">
- <?php the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyfourteen' ) ); ?>
</del><ins>+ <div class="entry-content">
</ins><span class="cx"> <?php
</span><ins>+ the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyfourteen' ) );
</ins><span class="cx"> wp_link_pages( array(
</span><span class="cx"> 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
</span><span class="cx"> 'after' => '</div>',
</span><span class="cx"> 'link_before' => '<span>',
</span><del>- 'link_after' => '</span>'
</del><ins>+ 'link_after' => '</span>',
</ins><span class="cx"> ) );
</span><span class="cx"> ?>
</span><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx">
</span><span class="cx"> <footer class="entry-meta">
</span><del>- <?php if ( ( 'quote' == $format ) || ( 'aside' == $format ) ) : ?>
</del><ins>+ <?php if ( has_post_format( array( 'quote', 'aside' ) ) ) : ?>
</ins><span class="cx"> <div class="entry-meta">
</span><del>- <?php the_title( '<h1 class="entry-title"><a href="' . get_permalink() . '" rel="bookmark">', '</a></h1>' ); ?>
</del><ins>+ <?php the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' ); ?>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <?php
- $tag_list = get_the_tag_list();
- if ( '' != $tag_list && 'post' == get_post_type() ) :
- ?>
- <span class="tag-links"><?php echo $tag_list; ?></span>
- <?php endif; // End if $tag_list ?>
</del><ins>+ <?php if ( has_tag() ) : ?>
+ <span class="tag-links"><?php echo get_the_tag_list(); ?></span>
+ <?php endif; ?>
</ins><span class="cx"> </footer><!-- .entry-meta -->
</span><del>-
-</article><!-- #post-<?php the_ID(); ?> -->
</del><span class="cx">\ No newline at end of file
</span><ins>+</article><!-- #post-## -->
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentrecentformattedpostphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/content-recent-formatted-post.php (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/content-recent-formatted-post.php 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/content-recent-formatted-post.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -6,29 +6,39 @@
</span><span class="cx"> if ( isset( $GLOBALS['content_width'] ) )
</span><span class="cx"> $GLOBALS['content_width'] = 306;
</span><span class="cx">
</span><del>-$format = get_post_format();
-if ( false === $format )
- $format = 'standard';
</del><ins>+$images = get_posts( array(
+ 'post_parent' => get_post()->post_parent,
+ 'fields' => 'ids',
+ 'numberposts' => -1,
+ 'post_status' => 'inherit',
+ 'post_type' => 'attachment',
+ 'post_mime_type' => 'image',
+ 'order' => 'ASC',
+ 'orderby' => 'menu_order ID'
+) );
+$total_images = count( $images );
</ins><span class="cx"> ?>
</span><span class="cx">
</span><del>-<article id="post-<?php the_ID(); ?>" <?php post_class( 'clearfix' ); ?>>
- <div class="entry-content clearfix">
</del><ins>+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <div class="entry-content">
</ins><span class="cx"> <?php
</span><del>- if ( 'gallery' == $format ) :
- $featured_image = get_the_post_thumbnail( get_the_ID(), 'featured-thumbnail-formatted' );
- $images = get_children( array( 'post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC' ) );
- if ( $images ) :
- $total_images = count( $images );
- if ( empty( $featured_image ) ) {
- $image = array_shift( $images );
- $featured_image = wp_get_attachment_image( $image->ID, 'featured-thumbnail-formatted' );
- }
</del><ins>+ if ( has_post_format( 'gallery' ) ) :
+ if ( has_post_thumbnail() ) :
+ $featured_image = get_the_post_thumbnail( get_the_ID(), 'featured-thumbnail-formatted' );
+ elseif ( $total_images > 0 ) :
+ $image = array_shift( $images );
+ $featured_image = wp_get_attachment_image( $image, 'featured-thumbnail-formatted' );
</ins><span class="cx"> ?>
</span><del>- <a href="<?php the_permalink(); ?>"><?php echo $featured_image; ?></a>
- <p class="wp-caption-text"><?php printf( _n( 'This gallery contains <a %1$s>%2$s photo</a>.', 'This gallery contains <a %1$s>%2$s photos</a>.', $total_images, 'twentyfourteen' ),
- 'href="' . get_permalink() . '" title="' . esc_attr( sprintf( __( 'Permalink to %s', 'twentyfourteen' ), the_title_attribute( 'echo=0' ) ) ) . '" rel="bookmark"',
</del><ins>+ <a href="<?php the_permalink(); ?>"><?php echo $featured_image; ?></a>
+ <p class="wp-caption-text">
+ <?php
+ printf( _n( 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photo</a>.', 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photos</a>.', $total_images, 'twentyfourteen' ),
+ esc_url( get_permalink() ),
</ins><span class="cx"> number_format_i18n( $total_images )
</span><del>- ); ?></p><?php
</del><ins>+ );
+ ?>
+ </p>
+ <?php
</ins><span class="cx"> else :
</span><span class="cx"> the_excerpt();
</span><span class="cx"> endif;
</span><span class="lines">@@ -41,14 +51,16 @@
</span><span class="cx"> <header class="entry-header">
</span><span class="cx"> <div class="entry-meta">
</span><span class="cx"> <?php
</span><del>- if ( 'link' != $format ) :
- the_title( '<h1 class="entry-title"><a href="' . get_permalink() . '" title="' . esc_attr( sprintf( __( 'Permalink to %s', 'twentyfourteen' ), the_title_attribute( 'echo=0' ) ) ) . '" rel="bookmark">', '</a></h1>' );
</del><ins>+ if ( ! has_post_format( 'link' ) ) :
+ the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
</ins><span class="cx"> endif;
</span><ins>+
+ twentyfourteen_posted_on();
+
+ if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) :
</ins><span class="cx"> ?>
</span><del>- <?php twentyfourteen_posted_on(); ?>
- <?php if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
</del><span class="cx"> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx"> </header><!-- .entry-header -->
</span><del>-</article>
</del><span class="cx">\ No newline at end of file
</span><ins>+</article><!-- #post-## -->
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentsinglephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/content-single.php (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/content-single.php 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/content-single.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -3,40 +3,31 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Fourteen
</span><span class="cx"> */
</span><del>-$format = get_post_format();
-if ( false === $format )
- $format = 'standard';
</del><ins>+has_post_format()
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><del>- <?php if ( ( 'video' != $format ) && ( 'image' != $format ) && ( 'aside' != $format ) && ( 'link' != $format ) && ( 'quote' != $format ) ) : ?>
</del><ins>+ <?php if ( has_post_thumbnail() && ! has_post_format( array( 'video', 'image', 'aside', 'link', 'quote' ) ) ) : ?>
</ins><span class="cx"> <div class="attachment-featured-thumbnail">
</span><del>- <?php
- if ( '' != get_the_post_thumbnail() )
- the_post_thumbnail( 'featured-thumbnail-large' );
- ?>
</del><ins>+ <?php the_post_thumbnail( 'featured-thumbnail-large' ); ?>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <header class="entry-header">
</span><ins>+ <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
</ins><span class="cx"> <div class="entry-meta">
</span><del>- <?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 ?>
</del><ins>+ <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><ins>+ <?php
+ endif;
</ins><span class="cx">
</span><del>- <?php if ( ( 'standard' == $format ) || ( 'video' == $format ) || ( 'image' == $format ) || ( 'gallery' == $format ) ) : ?>
- <h1 class="entry-title"><?php the_title(); ?></h1>
- <?php endif; ?>
</del><ins>+ if ( ! has_post_format( array( 'status', 'chat', 'aside', 'link', 'quote', 'audio' ) ) ) :
+ the_title( '<h1 class="entry-title">', '</h1>' );
+ endif;
+ ?>
</ins><span class="cx">
</span><span class="cx"> <div class="entry-meta">
</span><del>- <?php if ( 'standard' != $format ) : ?>
</del><ins>+ <?php if ( has_post_format() ) : ?>
</ins><span class="cx"> <span class="post-format">
</span><span class="cx"> <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>
</span><span class="cx"> </span>
</span><span class="lines">@@ -44,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> <?php twentyfourteen_posted_on(); ?>
</span><span class="cx">
</span><del>- <?php if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
</del><ins>+ <?php if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) : ?>
</ins><span class="cx"> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="lines">@@ -52,32 +43,29 @@
</span><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx"> </header><!-- .entry-header -->
</span><span class="cx">
</span><del>- <div class="entry-content clearfix">
- <?php the_content(); ?>
</del><ins>+ <div class="entry-content">
</ins><span class="cx"> <?php
</span><ins>+ the_content();
</ins><span class="cx"> wp_link_pages( array(
</span><span class="cx"> 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
</span><span class="cx"> 'after' => '</div>',
</span><span class="cx"> 'link_before' => '<span>',
</span><del>- 'link_after' => '</span>'
</del><ins>+ 'link_after' => '</span>',
</ins><span class="cx"> ) );
</span><span class="cx"> ?>
</span><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx">
</span><span class="cx"> <footer class="entry-meta">
</span><del>- <?php if ( ( 'quote' == $format ) || ( 'aside' == $format ) ) : ?>
</del><ins>+ <?php if ( has_post_format( array( 'quote', 'aside' ) ) ) : ?>
</ins><span class="cx"> <div class="entry-meta">
</span><del>- <?php the_title( '<h1 class="entry-title"><a href="' . get_permalink() . '" rel="bookmark">', '</a></h1>' ); ?>
</del><ins>+ <?php the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' ); ?>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <?php
- $tag_list = get_the_tag_list();
- if ( '' != $tag_list ) :
- ?>
</del><ins>+ <?php if ( has_tag() ) : ?>
</ins><span class="cx"> <span class="tag-links">
</span><del>- <?php echo $tag_list; ?>
</del><ins>+ <?php echo get_the_tag_list(); ?>
</ins><span class="cx"> </span>
</span><del>- <?php endif; // End if $tag_list ?>
</del><ins>+ <?php endif; ?>
</ins><span class="cx"> </footer><!-- .entry-meta -->
</span><del>-</article><!-- #post-<?php the_ID(); ?> -->
</del><ins>+</article><!-- #post-## -->
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/content.php (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/content.php 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/content.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -3,74 +3,66 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Fourteen
</span><span class="cx"> */
</span><del>-$format = get_post_format();
</del><ins>+
</ins><span class="cx"> ?>
</span><span class="cx">
</span><del>-<article id="post-<?php the_ID(); ?>" <?php post_class( 'clearfix' ); ?>>
</del><ins>+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</ins><span class="cx"> <a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyfourteen' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="<?php the_ID(); ?>" class="attachment-featured-thumbnail">
</span><del>- <?php
- if ( '' != get_the_post_thumbnail() )
- the_post_thumbnail( 'featured-thumbnail-large' );
- ?>
</del><ins>+ <?php the_post_thumbnail( 'featured-thumbnail-large' ); ?>
</ins><span class="cx"> </a>
</span><span class="cx">
</span><span class="cx"> <header class="entry-header">
</span><del>- <?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() && 'post' == get_post_type() ) :
- ?>
</del><ins>+ <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
</ins><span class="cx"> <div class="entry-meta">
</span><del>- <span class="cat-links"><?php echo $categories_list; ?></span>
</del><ins>+ <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <h1 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
</span><span class="cx">
</span><span class="cx"> <div class="entry-meta">
</span><del>- <?php if ( 'gallery' == $format ) : ?>
</del><ins>+ <?php if ( has_post_format( 'gallery' ) ) : ?>
</ins><span class="cx"> <span class="post-format">
</span><del>- <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>
</del><ins>+ <a class="entry-format" href="<?php echo esc_url( get_post_format_link( 'gallery' ) ); ?>" title="<?php echo esc_attr( sprintf( __( 'All %s posts', 'twentyfourteen' ), get_post_format_string( 'gallery' ) ) ); ?>"><?php echo get_post_format_string( 'gallery' ); ?></a>
</ins><span class="cx"> </span>
</span><del>- <?php endif; ?>
</del><ins>+ <?php
+ endif;
</ins><span class="cx">
</span><del>- <?php
</del><span class="cx"> if ( 'post' == get_post_type() )
</span><span class="cx"> twentyfourteen_posted_on();
</span><ins>+
+ if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) :
</ins><span class="cx"> ?>
</span><ins>+ <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
+ <?php
+ endif;
</ins><span class="cx">
</span><del>- <?php if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
- <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
- <?php endif; ?>
-
- <?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?>
</del><ins>+ edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' );
+ ?>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx"> </header><!-- .entry-header -->
</span><span class="cx">
</span><span class="cx"> <?php if ( is_search() ) : ?>
</span><del>- <div class="entry-summary clearfix">
</del><ins>+ <div class="entry-summary">
</ins><span class="cx"> <?php the_excerpt(); ?>
</span><span class="cx"> </div><!-- .entry-summary -->
</span><span class="cx"> <?php else : ?>
</span><del>- <div class="entry-content clearfix">
- <?php the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyfourteen' ) ); ?>
</del><ins>+ <div class="entry-content">
</ins><span class="cx"> <?php
</span><ins>+ the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyfourteen' ) );
</ins><span class="cx"> wp_link_pages( array(
</span><span class="cx"> 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
</span><span class="cx"> 'after' => '</div>',
</span><span class="cx"> 'link_before' => '<span>',
</span><del>- 'link_after' => '</span>'
</del><ins>+ 'link_after' => '</span>',
</ins><span class="cx"> ) );
</span><span class="cx"> ?>
</span><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <?php
- $tag_list = get_the_tag_list();
- if ( '' != $tag_list && 'post' == get_post_type() ) :
- ?>
- <footer class="entry-meta">
- <span class="tag-links"><?php echo $tag_list; ?></span>
- </footer><!-- .entry-meta -->
- <?php endif; // End if $tag_list ?>
-</article><!-- #post-<?php the_ID(); ?> -->
</del><span class="cx">\ No newline at end of file
</span><ins>+ <?php if ( has_tag() ) : ?>
+ <footer class="entry-meta">
+ <span class="tag-links"><?php echo get_the_tag_list(); ?></span>
+ </footer><!-- .entry-meta -->
+ <?php endif; ?>
+</article><!-- #post-## -->
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenfeaturedcontentphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/featured-content.php (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/featured-content.php 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/featured-content.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> <div class="featured-content-wrapper">
</span><del>- <div id="featured-content" class="featured-content clearfix">
</del><ins>+ <div id="featured-content" class="featured-content">
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> do_action( 'twentyfourteen_featured_posts_before' );
</span><span class="lines">@@ -7,6 +7,7 @@
</span><span class="cx"> $featured_posts = twentyfourteen_get_featured_posts();
</span><span class="cx"> foreach ( (array) $featured_posts as $order => $post ) :
</span><span class="cx"> setup_postdata( $post );
</span><ins>+
</ins><span class="cx"> get_template_part( 'content', 'featured-post' );
</span><span class="cx"> endforeach;
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/footer.php (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/footer.php 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/footer.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -2,26 +2,25 @@
</span><span class="cx"> /**
</span><span class="cx"> * The template for displaying the footer.
</span><span class="cx"> *
</span><del>- * Contains the closing of the id=main div and all content after
</del><ins>+ * Contains footer content and the closing of the #main and #page div elements.
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Fourteen
</span><span class="cx"> */
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>- </div><!-- #main .site-main -->
</del><ins>+ </div><!-- #main -->
</ins><span class="cx">
</span><del>- <?php get_sidebar( 'footer' ); ?>
</del><ins>+ <?php get_sidebar( 'footer' ); ?>
</ins><span class="cx">
</span><del>- <footer id="colophon" class="site-footer" role="contentinfo">
- <div class="site-info">
- <?php do_action( 'twentyfourteen_credits' ); ?>
- <a href="<?php echo esc_url( __( 'http://wordpress.org/', 'twentythirteen' ) ); ?>" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentythirteen' ); ?>"><?php printf( __( 'Proudly powered by %s', 'twentythirteen' ), 'WordPress' ); ?></a>
- </div><!-- .site-info -->
- </footer><!-- #colophon .site-footer -->
-</div><!-- #page .hfeed .site -->
</del><ins>+ <footer id="colophon" class="site-footer" role="contentinfo">
+ <div class="site-info">
+ <?php do_action( 'twentyfourteen_credits' ); ?>
+ <a href="<?php echo esc_url( __( 'http://wordpress.org/', 'twentythirteen' ) ); ?>" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentythirteen' ); ?>"><?php printf( __( 'Proudly powered by %s', 'twentythirteen' ), 'WordPress' ); ?></a>
+ </div><!-- .site-info -->
+ </footer><!-- #colophon -->
+ </div><!-- #page -->
</ins><span class="cx">
</span><del>-<?php wp_footer(); ?>
-
</del><ins>+ <?php wp_footer(); ?>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenfrontpagephp"></a>
<div class="addfile"><h4>Added: trunk/src/wp-content/themes/twentyfourteen/front-page.php (0 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/front-page.php (rev 0)
+++ trunk/src/wp-content/themes/twentyfourteen/front-page.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+<?php
+/**
+ * The template for displaying the home page.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Fourteen
+ */
+
+get_header(); ?>
+
+ <div class="front-page-content-wrapper">
+ <div class="front-page-content-main">
+
+ <?php if ( twentyfourteen_has_featured_posts() ) : ?>
+ <?php get_template_part( 'featured-content' ); ?>
+ <?php endif; ?>
+
+ <div class="front-page-content-area">
+
+ <div id="primary" class="content-area no-sidebar">
+ <div id="content" class="site-content" role="main">
+ <?php
+ if ( have_posts() ) :
+ while ( have_posts() ) :
+ the_post();
+
+ twentyfourteen_get_template_part();
+
+ comments_template();
+ endwhile;
+
+ twentyfourteen_content_nav( 'nav-below' );
+
+ else :
+ get_template_part( 'no-results', 'index' );
+
+ endif;
+ ?>
+ </div><!-- #content .site-content -->
+ </div><!-- #primary .content-area -->
+
+ <?php get_template_part( 'recent-formatted-posts' ); ?>
+
+ </div><!-- .front-page-content-area -->
+
+ </div><!-- .front-page-content-main -->
+ </div><!-- .front-page-content-wrapper -->
+
+<?php
+get_sidebar();
+get_footer();
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenfullwidthpagephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/full-width-page.php (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/full-width-page.php 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/full-width-page.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -8,58 +8,22 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><del>-<?php if ( is_front_page() ) : ?>
-
- <div class="front-page-content-wrapper">
- <div class="front-page-content-main">
-
- <?php if ( twentyfourteen_has_featured_posts() ) : ?>
- <?php get_template_part( 'featured-content' ); ?>
- <?php endif; ?>
-
- <div class="front-page-content-area clearfix">
-
- <div id="primary" class="content-area no-sidebar">
- <div id="content" class="site-content full-width" role="main">
- <?php
- if ( have_posts() ) :
- while ( have_posts() ) :
- the_post();
- get_template_part( 'content', 'page' );
- comments_template( '', true );
- endwhile;
-
- twentyfourteen_content_nav( 'nav-below' );
- else :
- get_template_part( 'no-results', 'index' );
- endif;
- ?>
- </div><!-- #content .site-content -->
- </div><!-- #primary .content-area -->
-
- </div><!-- .front-page-content-area -->
-
- </div><!-- .front-page-content-main -->
- </div><!-- .front-page-content-wrapper -->
-
-<?php else : ?>
-
</del><span class="cx"> <div id="primary" class="content-area">
</span><span class="cx"> <div id="content" class="site-content full-width" role="main">
</span><ins>+ <?php
+ while ( have_posts() ) :
+ the_post();
</ins><span class="cx">
</span><del>- <?php while ( have_posts() ) : the_post(); ?>
</del><ins>+ get_template_part( 'content', 'page' );
</ins><span class="cx">
</span><del>- <?php get_template_part( 'content', 'page' ); ?>
</del><ins>+ // If comments are open or we have at least one comment, load up the comment template.
+ if ( comments_open() || get_comments_number() )
+ comments_template();
+ endwhile;
+ ?>
+ </div><!-- #content -->
+ </div><!-- #primary -->
</ins><span class="cx">
</span><del>- <?php comments_template( '', true ); ?>
-
- <?php endwhile; ?>
-
- </div><!-- #content .site-content -->
- </div><!-- #primary .content-area -->
-
-<?php endif; // is_front_page() check ?>
-
-<?php get_sidebar(); ?>
-
-<?php get_footer(); ?>
</del><ins>+<?php
+get_sidebar();
+get_footer();
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/functions.php (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/functions.php 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/functions.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -27,20 +27,10 @@
</span><span class="cx"> * Note that this function is hooked into the after_setup_theme hook, which runs
</span><span class="cx"> * before the init hook. The init hook is too late for some features, such as indicating
</span><span class="cx"> * support post thumbnails.
</span><del>- *
</del><span class="cx"> */
</span><span class="cx"> function twentyfourteen_setup() {
</span><del>- /**
- * Custom template tags for this theme.
- */
- require( get_template_directory() . '/inc/template-tags.php' );
</del><span class="cx">
</span><span class="cx"> /**
</span><del>- * Customizer additions
- */
- require( get_template_directory() . '/inc/customizer.php' );
-
- /**
</del><span class="cx"> * Make theme available for translation
</span><span class="cx"> * Translations can be filed in the /languages/ directory
</span><span class="cx"> * If you're building a theme based on Twenty Fourteen, use a find and replace
</span><span class="lines">@@ -81,15 +71,9 @@
</span><span class="cx"> /**
</span><span class="cx"> * This theme allows users to set a custom background.
</span><span class="cx"> */
</span><del>- $args = apply_filters( 'twentyfourteen_custom_background_args', array( 'default-color' => 'f5f5f5' ) );
-
- if ( function_exists( 'wp_get_theme' ) ) {
- add_theme_support( 'custom-background', $args );
- } else {
- // Compat: Versions of WordPress prior to 3.4.
- define( 'BACKGROUND_COLOR', $args['default-color'] );
- add_custom_background();
- }
</del><ins>+ add_theme_support( 'custom-background', apply_filters( 'twentyfourteen_custom_background_args', array(
+ 'default-color' => 'f5f5f5',
+ ) ) );
</ins><span class="cx"> }
</span><span class="cx"> endif; // twentyfourteen_setup
</span><span class="cx"> add_action( 'after_setup_theme', 'twentyfourteen_setup' );
</span><span class="lines">@@ -112,16 +96,9 @@
</span><span class="cx"> if ( is_paged() )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $minimum = absint( $minimum );
</del><span class="cx"> $featured_posts = apply_filters( 'twentyfourteen_get_featured_posts', array() );
</span><span class="cx">
</span><del>- if ( ! is_array( $featured_posts ) )
- return false;
-
- if ( $minimum > count( $featured_posts ) )
- return false;
-
- return true;
</del><ins>+ return is_array( $featured_posts ) && count( $featured_posts ) > absint( $minimum );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -191,18 +168,14 @@
</span><span class="cx"> add_action( 'widgets_init', 'twentyfourteen_widgets_init' );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Register Google fonts for Twenty Fourteen
</del><ins>+ * Register Google fonts for Twenty Fourteen.
</ins><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx"> function twentyfourteen_fonts() {
</span><span class="cx"> /* translators: If there are characters in your language that are not supported
</span><span class="cx"> by Lato, translate this to 'off'. Do not translate into your own language. */
</span><del>- if ( 'off' !== _x( 'on', 'Lato font: on or off', 'twentyfourteen' ) ) {
-
- $protocol = is_ssl() ? 'https' : 'http';
-
- wp_register_style( 'twentyfourteen-lato', "$protocol://fonts.googleapis.com/css?family=Lato:100,300,400,700,900,100italic,300italic,400italic,700italic,900italic", array(), null );
- }
</del><ins>+ if ( 'off' !== _x( 'on', 'Lato font: on or off', 'twentyfourteen' ) )
+ wp_register_style( 'twentyfourteen-lato', '//fonts.googleapis.com/css?family=Lato:100,300,400,700,900,100italic,300italic,400italic,700italic,900italic', array(), null );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'init', 'twentyfourteen_fonts' );
</span><span class="cx">
</span><span class="lines">@@ -215,13 +188,11 @@
</span><span class="cx">
</span><span class="cx"> wp_enqueue_style( 'twentyfourteen-lato' );
</span><span class="cx">
</span><del>- if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
</del><ins>+ if ( is_singular() && comments_open() && get_option( 'thread_comments' ) )
</ins><span class="cx"> wp_enqueue_script( 'comment-reply' );
</span><del>- }
</del><span class="cx">
</span><del>- if ( is_singular() && wp_attachment_is_image() ) {
</del><ins>+ if ( is_singular() && wp_attachment_is_image() )
</ins><span class="cx"> wp_enqueue_script( 'twentyfourteen-keyboard-image-navigation', get_template_directory_uri() . '/js/keyboard-image-navigation.js', array( 'jquery' ), '20130402' );
</span><del>- }
</del><span class="cx">
</span><span class="cx"> wp_enqueue_script( 'twentyfourteen-theme', get_template_directory_uri() . '/js/theme.js', array( 'jquery' ), '20130402', true );
</span><span class="cx"> }
</span><span class="lines">@@ -231,13 +202,10 @@
</span><span class="cx"> * Enqueue Google fonts style to admin screen for custom header display.
</span><span class="cx"> *
</span><span class="cx"> */
</span><del>-function twentyfourteen_admin_fonts( $hook_suffix ) {
- if ( 'appearance_page_custom-header' != $hook_suffix )
- return;
-
</del><ins>+function twentyfourteen_admin_fonts() {
</ins><span class="cx"> wp_enqueue_style( 'twentyfourteen-lato' );
</span><span class="cx"> }
</span><del>-add_action( 'admin_enqueue_scripts', 'twentyfourteen_admin_fonts' );
</del><ins>+add_action( 'admin_print_scripts-appearance_page_custom-header', 'twentyfourteen_admin_fonts' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Implement the Custom Header feature
</span><span class="lines">@@ -285,7 +253,63 @@
</span><span class="cx"> }
</span><span class="cx"> add_filter( 'get_the_excerpt', 'twentyfourteen_custom_excerpt_more' );
</span><span class="cx">
</span><ins>+if ( ! function_exists( 'twentyfourteen_the_attached_image' ) ) :
</ins><span class="cx"> /**
</span><ins>+ * Prints the attached image with a link to the next attached image.
+ *
+ * @since Twenty Thirteen 1.0
+ *
+ * @return void
+ */
+function twentyfourteen_the_attached_image() {
+ $post = get_post();
+ $attachment_size = apply_filters( 'twentyfourteen_attachment_size', array( 1200, 1200 ) );
+ $next_attachment_url = wp_get_attachment_url();
+
+ /**
+ * 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.
+ */
+ $attachment_ids = get_posts( array(
+ 'post_parent' => $post->post_parent,
+ 'fields' => 'ids',
+ 'numberposts' => -1,
+ 'post_status' => 'inherit',
+ 'post_type' => 'attachment',
+ 'post_mime_type' => 'image',
+ 'order' => 'ASC',
+ 'orderby' => 'menu_order ID'
+ ) );
+
+ // If there is more than 1 attachment in a gallery...
+ if ( count( $attachment_ids ) > 1 ) {
+ foreach ( $attachment_ids as $attachment_id ) {
+ if ( $attachment_id == $post->ID ) {
+ $next_id = current( $attachment_ids );
+ break;
+ }
+ }
+
+ // get the URL of the next image attachment...
+ if ( $next_id )
+ $next_attachment_url = get_attachment_link( $next_id );
+
+ // or get the URL of the first image attachment.
+ else
+ $next_attachment_url = get_attachment_link( array_shift( $attachment_ids ) );
+ }
+
+ printf( '<a href="%1$s" title="%2$s" rel="attachment">%3$s</a>',
+ esc_url( $next_attachment_url ),
+ the_title_attribute( array( 'echo' => false ) ),
+ wp_get_attachment_image( $post->ID, $attachment_size )
+ );
+}
+endif;
+
+/**
</ins><span class="cx"> * Count the number of footer sidebars to enable dynamic classes for the footer
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="lines">@@ -328,7 +352,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $class )
</span><del>- echo 'class="clearfix ' . $class . '"';
</del><ins>+ printf( 'class="%s"', $class );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -443,4 +467,14 @@
</span><span class="cx">
</span><span class="cx"> return $title;
</span><span class="cx"> }
</span><del>-add_filter( 'wp_title', 'twentyfourteen_wp_title', 10, 2 );
</del><span class="cx">\ No newline at end of file
</span><ins>+add_filter( 'wp_title', 'twentyfourteen_wp_title', 10, 2 );
+
+/**
+ * Custom template tags for this theme.
+ */
+require get_template_directory() . '/inc/template-tags.php';
+
+/**
+ * Customizer additions
+ */
+require get_template_directory() . '/inc/customizer.php';
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/header.php (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/header.php 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/header.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -10,13 +10,6 @@
</span><span class="cx"> ?><!DOCTYPE html>
</span><span class="cx"> <html <?php language_attributes(); ?> class="no-js">
</span><span class="cx"> <head>
</span><del>-<script>
-/**
- * Replaces class "no-js" with "js" in the <html>-tag when JavaScript is being used.
- * Allows easy styling for browsers [not] supporting/running JavaScript.
- */
-document.documentElement.className = document.documentElement.className.replace(/(\s|^)no-js(\s|$)/, '$1js$2');
-</script>
</del><span class="cx"> <meta charset="<?php bloginfo( 'charset' ); ?>" />
</span><span class="cx"> <meta name="viewport" content="width=device-width" />
</span><span class="cx"> <title><?php wp_title( '|', true, 'right' ); ?></title>
</span><span class="lines">@@ -59,16 +52,16 @@
</span><span class="cx"> <?php do_action( 'before' ); ?>
</span><span class="cx">
</span><span class="cx"> <?php $header_image = get_header_image();
</span><del>- if ( ! empty( $header_image ) ) { ?>
</del><ins>+ if ( ! empty( $header_image ) ) : ?>
</ins><span class="cx"> <div id="site-header">
</span><span class="cx"> <a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home">
</span><span class="cx"> <img src="<?php header_image(); ?>" width="<?php echo get_custom_header()->width; ?>" height="<?php echo get_custom_header()->height; ?>" alt="" />
</span><span class="cx"> </a>
</span><span class="cx"> </div>
</span><del>- <?php } ?>
</del><ins>+ <?php endif; ?>
</ins><span class="cx">
</span><del>- <header id="masthead" class="site-header clearfix" role="banner">
- <div class="header-main clearfix">
</del><ins>+ <header id="masthead" class="site-header" role="banner">
+ <div class="header-main clear">
</ins><span class="cx"> <h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
</span><span class="cx">
</span><span class="cx"> <div class="header-extra">
</span><span class="lines">@@ -84,8 +77,8 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <nav role="navigation" class="site-navigation primary-navigation">
</span><del>- <h1 class="assistive-text"><?php _e( 'Primary Menu', 'twentyfourteen' ); ?></h1>
- <div class="assistive-text skip-link"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentyfourteen' ); ?>"><?php _e( 'Skip to content', 'twentyfourteen' ); ?></a></div>
</del><ins>+ <h1 class="screen-reader-text"><?php _e( 'Primary Menu', 'twentyfourteen' ); ?></h1>
+ <div class="screen-reader-text skip-link"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentyfourteen' ); ?>"><?php _e( 'Skip to content', 'twentyfourteen' ); ?></a></div>
</ins><span class="cx"> <?php wp_nav_menu( array( 'theme_location' => 'primary' ) ); ?>
</span><span class="cx"> </nav>
</span><span class="cx">
</span><span class="lines">@@ -95,7 +88,7 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( $social_links ) : ?>
</span><span class="cx"> <div class="social-links-wrapper hide">
</span><del>- <ul class="social-links clearfix">
</del><ins>+ <ul class="social-links clear">
</ins><span class="cx"> <?php if ( is_email( $email_link ) ) : ?>
</span><span class="cx"> <li class="email-link">
</span><span class="cx"> <a href="mailto:<?php echo antispambot( sanitize_email( $email_link ) ); ?>" class="genericon" title="<?php esc_attr_e( 'Email', 'twentyfourteen' ); ?>" target="_blank">
</span><span class="lines">@@ -188,10 +181,10 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <div class="search-box-wrapper hide">
</span><del>- <div class="search-box clearfix">
</del><ins>+ <div class="search-box clear">
</ins><span class="cx"> <?php get_search_form(); ?>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><del>- </header><!-- #masthead .site-header -->
</del><ins>+ </header><!-- #masthead -->
</ins><span class="cx">
</span><del>- <div id="main" class="site-main clearfix">
</del><span class="cx">\ No newline at end of file
</span><ins>+ <div id="main" class="site-main">
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenimagephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/image.php (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/image.php 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/image.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -9,14 +9,14 @@
</span><span class="cx"> get_header();
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>-<div id="primary" class="content-area image-attachment">
</del><ins>+<section id="primary" class="content-area image-attachment">
</ins><span class="cx"> <div id="content" class="site-content full-width" role="main">
</span><span class="cx">
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="cx">
</span><span class="cx"> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx"> <header class="entry-header">
</span><del>- <h1 class="entry-title"><?php the_title(); ?></h1>
</del><ins>+ <?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
</ins><span class="cx">
</span><span class="cx"> <div class="entry-meta">
</span><span class="cx"> <?php $metadata = wp_get_attachment_metadata(); ?>
</span><span class="lines">@@ -31,77 +31,43 @@
</span><span class="cx"> </header><!-- .entry-header -->
</span><span class="cx">
</span><span class="cx"> <div class="entry-content">
</span><del>-
</del><span class="cx"> <div class="entry-attachment">
</span><span class="cx"> <div class="attachment">
</span><del>- <?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>
</del><ins>+ <?php twentyfourteen_the_attached_image(); ?>
</ins><span class="cx"> </div><!-- .attachment -->
</span><span class="cx">
</span><del>- <?php if ( ! empty( $post->post_excerpt ) ) : ?>
</del><ins>+ <?php if ( has_excerpt() ) : ?>
</ins><span class="cx"> <div class="entry-caption">
</span><span class="cx"> <?php the_excerpt(); ?>
</span><span class="cx"> </div><!-- .entry-caption -->
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </div><!-- .entry-attachment -->
</span><span class="cx">
</span><del>- <?php the_content(); ?>
</del><span class="cx"> <?php
</span><ins>+ the_content();
</ins><span class="cx"> wp_link_pages( array(
</span><span class="cx"> 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
</span><span class="cx"> 'after' => '</div>',
</span><span class="cx"> 'link_before' => '<span>',
</span><del>- 'link_after' => '</span>'
</del><ins>+ 'link_after' => '</span>',
</ins><span class="cx"> ) );
</span><span class="cx"> ?>
</span><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx">
</span><span class="cx"> <footer class="entry-meta">
</span><del>- <?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; ?>
</del><ins>+ <?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;
+ ?>
</ins><span class="cx"> </footer><!-- .entry-meta -->
</span><del>- </article><!-- #post-<?php the_ID(); ?> -->
</del><ins>+ </article><!-- #post-## -->
</ins><span class="cx">
</span><span class="cx"> <nav id="image-navigation" class="site-navigation">
</span><span class="cx"> <?php previous_image_link( false, __( '<div class="previous-image">Previous Image</div>', 'twentyfourteen' ) ); ?>
</span><span class="lines">@@ -112,9 +78,9 @@
</span><span class="cx">
</span><span class="cx"> <?php endwhile; // end of the loop. ?>
</span><span class="cx">
</span><del>- </div><!-- #content .site-content -->
-</div><!-- #primary .content-area .image-attachment -->
</del><ins>+ </div><!-- #content -->
+</section><!-- #primary -->
</ins><span class="cx">
</span><del>-<?php get_sidebar(); ?>
-
-<?php get_footer(); ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php
+get_sidebar();
+get_footer();
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteeninccustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -22,8 +22,7 @@
</span><span class="cx"> * @subpackage Twenty_Fourteen
</span><span class="cx"> */
</span><span class="cx"> function twentyfourteen_custom_header_setup() {
</span><del>- $args = array(
- 'default-image' => '',
</del><ins>+ add_theme_support( 'custom-header', apply_filters( 'twentyfourteen_custom_header_args', array(
</ins><span class="cx"> 'default-text-color' => 'fff',
</span><span class="cx"> 'width' => 1260,
</span><span class="cx"> 'height' => 240,
</span><span class="lines">@@ -31,49 +30,11 @@
</span><span class="cx"> 'wp-head-callback' => 'twentyfourteen_header_style',
</span><span class="cx"> 'admin-head-callback' => 'twentyfourteen_admin_header_style',
</span><span class="cx"> 'admin-preview-callback' => 'twentyfourteen_admin_header_image',
</span><del>- );
</del><ins>+ ) ) );
</ins><span class="cx">
</span><del>- $args = apply_filters( 'twentyfourteen_custom_header_args', $args );
-
- if ( function_exists( 'wp_get_theme' ) ) {
- add_theme_support( 'custom-header', $args );
- } else {
- // Compat: Versions of WordPress prior to 3.4.
- define( 'HEADER_TEXTCOLOR', $args['default-text-color'] );
- define( 'HEADER_IMAGE', $args['default-image'] );
- define( 'HEADER_IMAGE_WIDTH', $args['width'] );
- define( 'HEADER_IMAGE_HEIGHT', $args['height'] );
- add_custom_image_header( $args['wp-head-callback'], $args['admin-head-callback'], $args['admin-preview-callback'] );
- }
</del><span class="cx"> }
</span><span class="cx"> add_action( 'after_setup_theme', 'twentyfourteen_custom_header_setup' );
</span><span class="cx">
</span><del>-/**
- * Shiv for get_custom_header().
- *
- * get_custom_header() was introduced to WordPress
- * in version 3.4. To provide backward compatibility
- * with previous versions, we will define our own version
- * of this function.
- *
- * @todo Remove this function when WordPress 3.6 is released.
- * @return stdClass All properties represent attributes of the curent header image.
- *
- * @package WordPress
- * @subpackage Twenty_Fourteen
- */
-
-if ( ! function_exists( 'get_custom_header' ) ) {
- function get_custom_header() {
- return (object) array(
- 'url' => get_header_image(),
- 'thumbnail_url' => get_header_image(),
- 'width' => HEADER_IMAGE_WIDTH,
- 'height' => HEADER_IMAGE_HEIGHT,
- );
- }
-}
-
</del><span class="cx"> if ( ! function_exists( 'twentyfourteen_header_style' ) ) :
</span><span class="cx"> /**
</span><span class="cx"> * Styles the header image and text displayed on the blog
</span><span class="lines">@@ -82,17 +43,18 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx"> function twentyfourteen_header_style() {
</span><ins>+ $header_text_color = get_header_textcolor();
</ins><span class="cx">
</span><span class="cx"> // If no custom options for text are set, let's bail
</span><del>- // get_header_textcolor() options: HEADER_TEXTCOLOR is default, hide text (returns 'blank') or any hex value
- if ( HEADER_TEXTCOLOR == get_header_textcolor() )
</del><ins>+ // $header_text_color options: HEADER_TEXTCOLOR is default, hide text (returns 'blank') or any hex value
+ if ( HEADER_TEXTCOLOR == $header_text_color )
</ins><span class="cx"> return;
</span><span class="cx"> // If we get this far, we have custom styles. Let's do this.
</span><span class="cx"> ?>
</span><span class="cx"> <style type="text/css">
</span><span class="cx"> <?php
</span><span class="cx"> // Has the text been hidden?
</span><del>- if ( 'blank' == get_header_textcolor() ) :
</del><ins>+ if ( 'blank' == $header_text_color ) :
</ins><span class="cx"> ?>
</span><span class="cx"> .site-title {
</span><span class="cx"> position: absolute !important;
</span><span class="lines">@@ -104,7 +66,7 @@
</span><span class="cx"> else :
</span><span class="cx"> ?>
</span><span class="cx"> .site-title a {
</span><del>- color: #<?php echo get_header_textcolor(); ?> !important;
</del><ins>+ color: #<?php echo $header_text_color; ?> !important;
</ins><span class="cx"> }
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </style>
</span><span class="lines">@@ -153,19 +115,15 @@
</span><span class="cx"> * @see twentyfourteen_custom_header_setup().
</span><span class="cx"> *
</span><span class="cx"> */
</span><del>-function twentyfourteen_admin_header_image() { ?>
</del><ins>+function twentyfourteen_admin_header_image() {
+ $header_image = get_header_image();
+?>
</ins><span class="cx"> <div id="headimg">
</span><del>- <?php
- if ( 'blank' == get_header_textcolor() || '' == get_header_textcolor() )
- $style = ' style="display:none;"';
- else
- $style = ' style="color:#' . get_header_textcolor() . ';"';
- ?>
- <?php $header_image = get_header_image();
- if ( ! empty( $header_image ) ) : ?>
- <img src="<?php echo esc_url( $header_image ); ?>" alt="" />
</del><ins>+ <?php if ( ! empty( $header_image ) ) : ?>
+ <img src="<?php echo esc_url( $header_image ); ?>" alt="">
</ins><span class="cx"> <?php endif; ?>
</span><del>- <h1><a id="name"<?php echo $style; ?> onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a></h1>
</del><ins>+ <h1 class="displaying-header-text"><a id="name"<?php echo sprintf( ' style="color:#%s;"', get_header_textcolor() ); ?> onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a></h1>
</ins><span class="cx"> </div>
</span><del>-<?php }
-endif; // twentyfourteen_admin_header_image
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php
+}
+endif; // twentyfourteen_admin_header_image
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteeninccustomizerphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -184,4 +184,4 @@
</span><span class="cx"> function twentyfourteen_customize_preview_js() {
</span><span class="cx"> wp_enqueue_script( 'twentyfourteen_customizer', get_template_directory_uri() . '/js/customizer.js', array( 'customize-preview' ), '20120827', true );
</span><span class="cx"> }
</span><del>-add_action( 'customize_preview_init', 'twentyfourteen_customize_preview_js' );
</del><span class="cx">\ No newline at end of file
</span><ins>+add_action( 'customize_preview_init', 'twentyfourteen_customize_preview_js' );
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteeninctemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx"> <nav role="navigation" id="<?php echo $nav_id; ?>" class="<?php echo $nav_class; ?>">
</span><del>- <h1 class="assistive-text"><?php _e( 'Post navigation', 'twentyfourteen' ); ?></h1>
</del><ins>+ <h1 class="screen-reader-text"><?php _e( 'Post navigation', 'twentyfourteen' ); ?></h1>
</ins><span class="cx">
</span><span class="cx"> <?php if ( is_single() ) : // navigation links for single posts ?>
</span><span class="cx">
</span><span class="lines">@@ -182,27 +182,15 @@
</span><span class="cx"> delete_transient( 'all_the_cool_cats' );
</span><span class="cx"> }
</span><span class="cx"> add_action( 'edit_category', 'twentyfourteen_category_transient_flusher' );
</span><del>-add_action( 'save_post', 'twentyfourteen_category_transient_flusher' );
</del><ins>+add_action( 'save_post', 'twentyfourteen_category_transient_flusher' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Include the Post-Format-specific template for the content.
</span><span class="cx"> * This is called in index.php and single.php
</span><span class="cx"> */
</span><span class="cx"> function twentyfourteen_get_template_part() {
</span><del>-
- $format = get_post_format();
-
- switch( $format ) {
- case 'aside':
- case 'quote':
- case 'link':
- case 'video':
- case 'image':
- get_template_part( 'content', 'post-format' );
- break;
- default:
- get_template_part( 'content', get_post_format() );
- break;
- }
-
-}
</del><span class="cx">\ No newline at end of file
</span><ins>+ if ( has_post_format( array( 'aside', 'quote', 'link', 'video', 'image' ) ) )
+ get_template_part( 'content', 'post-format' );
+ else
+ get_template_part( 'content', get_post_format() );
+}
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenindexphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/index.php (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/index.php 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/index.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -14,71 +14,28 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><del>-<?php if ( is_front_page() ) : ?>
-
- <div class="front-page-content-wrapper">
- <div class="front-page-content-main">
-
- <?php if ( twentyfourteen_has_featured_posts() ) : ?>
- <?php get_template_part( 'featured-content' ); ?>
- <?php endif; ?>
-
- <div class="front-page-content-area clearfix">
-
- <div id="primary" class="content-area no-sidebar">
- <div id="content" class="site-content" role="main">
- <?php
- if ( have_posts() ) :
- while ( have_posts() ) :
- the_post();
- twentyfourteen_get_template_part();
- endwhile;
-
- twentyfourteen_content_nav( 'nav-below' );
- else :
- get_template_part( 'no-results', 'index' );
- endif;
- ?>
- </div><!-- #content .site-content -->
- </div><!-- #primary .content-area -->
-
- <?php get_template_part( 'recent-formatted-posts' ); ?>
-
- </div><!-- .front-page-content-area -->
-
- </div><!-- .front-page-content-main -->
- </div><!-- .front-page-content-wrapper -->
-
- <?php get_sidebar(); ?>
-
-<?php else : ?>
-
</del><span class="cx"> <div id="primary" class="content-area">
</span><span class="cx"> <div id="content" class="site-content" role="main">
</span><span class="cx">
</span><del>- <?php if ( have_posts() ) : ?>
</del><ins>+ <?php
+ if ( have_posts() ) :
+ while ( have_posts() ) :
+ the_post();
</ins><span class="cx">
</span><del>- <?php while ( have_posts() ) : the_post(); ?>
</del><ins>+ twentyfourteen_get_template_part();
+ endwhile;
+ twentyfourteen_content_nav( 'nav-below' );
</ins><span class="cx">
</span><del>- <?php twentyfourteen_get_template_part(); ?>
</del><ins>+ else :
+ get_template_part( 'no-results', 'index' );
</ins><span class="cx">
</span><del>- <?php endwhile; ?>
</del><ins>+ endif;
+ ?>
</ins><span class="cx">
</span><del>- <?php twentyfourteen_content_nav( 'nav-below' ); ?>
</del><ins>+ </div><!-- #content -->
+ </div><!-- #primary -->
</ins><span class="cx">
</span><del>- <?php else : ?>
-
- <?php get_template_part( 'no-results', 'index' ); ?>
-
- <?php endif; ?>
-
- </div><!-- #content .site-content -->
- </div><!-- #primary .content-area -->
-
- <?php get_sidebar( 'content' ); ?>
-
- <?php get_sidebar(); ?>
-
-<?php endif; // is_front_page() check ?>
-
-<?php get_footer(); ?>
</del><ins>+<?php
+get_sidebar( 'content' );
+get_sidebar();
+get_footer();
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteennoresultsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/no-results.php (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/no-results.php 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/no-results.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -1,34 +1,30 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template part for displaying a message that posts cannot be found.
</del><ins>+ * The template for displaying a "No posts found" message.
</ins><span class="cx"> *
</span><del>- * Learn more: http://codex.wordpress.org/Template_Hierarchy
- *
</del><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Fourteen
</span><span class="cx"> */
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>-<article id="post-0" class="post no-results not-found">
- <header class="entry-header">
- <h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyfourteen' ); ?></h1>
- </header><!-- .entry-header -->
</del><ins>+<header class="page-header">
+ <h1 class="page-title"><?php _e( 'Nothing Found', 'twentyfourteen' ); ?></h1>
+</header>
</ins><span class="cx">
</span><del>- <div class="entry-content">
- <?php if ( is_home() && current_user_can( 'publish_posts' ) ) : ?>
</del><ins>+<div class="page-content">
+ <?php if ( is_home() && current_user_can( 'publish_posts' ) ) : ?>
</ins><span class="cx">
</span><del>- <p><?php printf( __( 'Ready to publish your first post? <a href="%1$s">Get started here</a>.', 'twentyfourteen' ), admin_url( 'post-new.php' ) ); ?></p>
</del><ins>+ <p><?php printf( __( 'Ready to publish your first post? <a href="%1$s">Get started here</a>.', 'twentyfourteen' ), admin_url( 'post-new.php' ) ); ?></p>
</ins><span class="cx">
</span><del>- <?php elseif ( is_search() ) : ?>
</del><ins>+ <?php elseif ( is_search() ) : ?>
</ins><span class="cx">
</span><del>- <p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'twentyfourteen' ); ?></p>
- <?php get_search_form(); ?>
</del><ins>+ <p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'twentyfourteen' ); ?></p>
+ <?php get_search_form(); ?>
</ins><span class="cx">
</span><del>- <?php else : ?>
</del><ins>+ <?php else : ?>
</ins><span class="cx">
</span><del>- <p><?php _e( 'It seems we can’t find what you’re looking for. Perhaps searching can help.', 'twentyfourteen' ); ?></p>
- <?php get_search_form(); ?>
</del><ins>+ <p><?php _e( 'It seems we can’t find what you’re looking for. Perhaps searching can help.', 'twentyfourteen' ); ?></p>
+ <?php get_search_form(); ?>
</ins><span class="cx">
</span><del>- <?php endif; ?>
- </div><!-- .entry-content -->
-</article><!-- #post-0 .post .no-results .not-found -->
</del><ins>+ <?php endif; ?>
+</div><!-- .page-content -->
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenpagephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/page.php (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/page.php 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/page.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -13,64 +13,25 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><del>-<?php if ( is_front_page() ) : ?>
-
- <div class="front-page-content-wrapper">
- <div class="front-page-content-main">
-
- <?php if ( twentyfourteen_has_featured_posts() ) : ?>
- <?php get_template_part( 'featured-content' ); ?>
- <?php endif; ?>
-
- <div class="front-page-content-area clearfix">
-
- <div id="primary" class="content-area no-sidebar">
- <div id="content" class="site-content" role="main">
- <?php
- if ( have_posts() ) :
- while ( have_posts() ) :
- the_post();
- get_template_part( 'content', 'page' );
- comments_template( '', true );
- endwhile;
-
- twentyfourteen_content_nav( 'nav-below' );
- else :
- get_template_part( 'no-results', 'index' );
- endif;
- ?>
- </div><!-- #content .site-content -->
- </div><!-- #primary .content-area -->
-
- <?php get_template_part( 'recent-formatted-posts' ); ?>
-
- </div><!-- .front-page-content-area -->
-
- </div><!-- .front-page-content-main -->
- </div><!-- .front-page-content-wrapper -->
-
- <?php get_sidebar(); ?>
-
-<?php else : ?>
-
</del><span class="cx"> <div id="primary" class="content-area">
</span><span class="cx"> <div id="content" class="site-content" role="main">
</span><span class="cx">
</span><del>- <?php while ( have_posts() ) : the_post(); ?>
</del><ins>+ <?php
+ while ( have_posts() ) :
+ the_post();
</ins><span class="cx">
</span><del>- <?php get_template_part( 'content', 'page' ); ?>
</del><ins>+ get_template_part( 'content', 'page' );
</ins><span class="cx">
</span><del>- <?php comments_template( '', true ); ?>
</del><ins>+ // If comments are open or we have at least one comment, load up the comment template.
+ if ( comments_open() || get_comments_number() )
+ comments_template();
+ endwhile;
+ ?>
</ins><span class="cx">
</span><del>- <?php endwhile; ?>
-
</del><span class="cx"> </div><!-- #content .site-content -->
</span><span class="cx"> </div><!-- #primary .content-area -->
</span><span class="cx">
</span><del>- <?php get_sidebar( 'content' ); ?>
-
- <?php get_sidebar(); ?>
-
-<?php endif; // is_front_page() check ?>
-
-<?php get_footer(); ?>
</del><ins>+<?php
+get_sidebar( 'content' );
+get_sidebar();
+get_footer();
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteensearchphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/search.php (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/search.php 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/search.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -11,31 +11,31 @@
</span><span class="cx"> <section id="primary" class="content-area">
</span><span class="cx"> <div id="content" class="site-content" role="main">
</span><span class="cx">
</span><del>- <?php if ( have_posts() ) : ?>
</del><ins>+ <?php if ( have_posts() ) : ?>
</ins><span class="cx">
</span><span class="cx"> <header class="page-header">
</span><del>- <h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'twentyfourteen' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
</del><ins>+ <h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'twentyfourteen' ), get_search_query() ); ?></h1>
</ins><span class="cx"> </header><!-- .page-header -->
</span><span class="cx">
</span><del>- <?php while ( have_posts() ) : the_post(); ?>
</del><ins>+ <?php
+ while ( have_posts() ) :
+ the_post();
</ins><span class="cx">
</span><del>- <?php twentyfourteen_get_template_part(); ?>
</del><ins>+ twentyfourteen_get_template_part();
+ endwhile;
</ins><span class="cx">
</span><del>- <?php endwhile; ?>
</del><ins>+ twentyfourteen_content_nav( 'nav-below' );
</ins><span class="cx">
</span><del>- <?php twentyfourteen_content_nav( 'nav-below' ); ?>
</del><ins>+ else :
+ get_template_part( 'no-results', 'search' );
</ins><span class="cx">
</span><del>- <?php else : ?>
</del><ins>+ endif;
+ ?>
</ins><span class="cx">
</span><del>- <?php get_template_part( 'no-results', 'search' ); ?>
</del><ins>+ </div><!-- #content -->
+</section><!-- #primary -->
</ins><span class="cx">
</span><del>- <?php endif; ?>
-
- </div><!-- #content .site-content -->
-</section><!-- #primary .content-area -->
-
-<?php get_sidebar( 'content' ); ?>
-
-<?php get_sidebar(); ?>
-
-<?php get_footer(); ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php
+get_sidebar( 'content' );
+get_sidebar();
+get_footer();
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteensearchformphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/searchform.php (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/searchform.php 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/searchform.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -6,8 +6,10 @@
</span><span class="cx"> * @subpackage Twenty_Fourteen
</span><span class="cx"> */
</span><span class="cx"> ?>
</span><del>- <form method="get" id="searchform" action="<?php echo esc_url( home_url( '/' ) ); ?>" role="search">
- <label for="s" class="assistive-text"><?php _e( 'Search', 'twentyfourteen' ); ?></label>
- <input type="text" class="field" name="s" value="<?php echo esc_attr( get_search_query() ); ?>" id="s" placeholder="<?php esc_attr_e( 'Search …', 'twentyfourteen' ); ?>" />
- <input type="submit" class="submit" name="submit" id="searchsubmit" value="<?php esc_attr_e( 'Search', 'twentyfourteen' ); ?>" />
- </form>
</del><ins>+<form role="search" method="get" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">
+ <label>
+ <span class="screen-reader-text"><?php _ex( 'Search for:', 'label', 'twentyfourteen' ); ?></span>
+ <input type="search" class="search-field" placeholder="<?php echo esc_attr_x( 'Search …', 'placeholder', 'twentyfourteen' ); ?>" value="<?php echo esc_attr( get_search_query() ); ?>" name="s" title="<?php _ex( 'Search for:', 'label', 'twentyfourteen' ); ?>">
+ </label>
+ <input type="submit" class="search-submit" value="<?php echo esc_attr_x( 'Search', 'submit button', 'twentyfourteen' ); ?>">
+</form>
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteensidebarphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/sidebar.php (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/sidebar.php 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/sidebar.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -8,36 +8,24 @@
</span><span class="cx"> ?>
</span><span class="cx"> <div id="secondary">
</span><span class="cx"> <div id="secondary-top">
</span><del>- <?php
- $description = get_bloginfo( 'description' );
- if ( ! empty ( $description ) ) : ?>
</del><ins>+ <?php
+ $description = get_bloginfo( 'description' );
+ if ( ! empty ( $description ) ) :
+ ?>
</ins><span class="cx"> <h2 class="site-description"><?php echo esc_html( $description ); ?></h2>
</span><del>- <?php endif; ?>
</del><ins>+ <?php endif; ?>
</ins><span class="cx">
</span><del>- <?php if ( has_nav_menu( 'secondary' ) ) : ?>
- <nav role="navigation" class="site-navigation secondary-navigation">
</del><ins>+ <?php if ( has_nav_menu( 'secondary' ) ) : ?>
+ <nav role="navigation" class="navigation secondary-navigation">
</ins><span class="cx"> <?php wp_nav_menu( array( 'theme_location' => 'secondary' ) ); ?>
</span><span class="cx"> </nav>
</span><del>- <?php endif; ?>
</del><ins>+ <?php endif; ?>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="secondary-bottom" class="widget-area" role="complementary">
</span><del>- <?php do_action( 'before_sidebar' ); ?>
-
- <?php if ( ! dynamic_sidebar( 'sidebar-1' ) ) : ?>
- <aside id="categories" class="widget widget_categories">
- <h1 class="widget-title"><?php _e( 'Categories', 'twentyfourteen' ); ?></h1>
- <ul>
- <?php wp_list_categories( array( 'title_li' => '' ) ); ?>
- </ul>
- </aside>
-
- <aside id="archives" class="widget widget_archive">
- <h1 class="widget-title"><?php _e( 'Archives', 'twentyfourteen' ); ?></h1>
- <ul>
- <?php wp_get_archives( array( 'type' => 'monthly' ) ); ?>
- </ul>
- </aside>
- <?php endif; // end sidebar widget area ?>
</del><ins>+ <?php
+ do_action( 'before_sidebar' );
+ dynamic_sidebar( 'sidebar-1' );
+ ?>
</ins><span class="cx"> </div><!-- .widget-area -->
</span><span class="cx"> </div><!-- #secondary -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteensinglephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/single.php (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/single.php 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/single.php 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -10,26 +10,23 @@
</span><span class="cx">
</span><span class="cx"> <div id="primary" class="content-area">
</span><span class="cx"> <div id="content" class="site-content" role="main">
</span><ins>+ <?php
+ while ( have_posts() ) :
+ the_post();
</ins><span class="cx">
</span><del>- <?php while ( have_posts() ) : the_post(); ?>
</del><ins>+ get_template_part( 'content', 'single' );
</ins><span class="cx">
</span><del>- <?php get_template_part( 'content', 'single' ); ?>
</del><ins>+ twentyfourteen_content_nav( 'nav-below' );
</ins><span class="cx">
</span><del>- <?php twentyfourteen_content_nav( 'nav-below' ); ?>
-
- <?php
- // If comments are open or we have at least one comment, load up the comment template
- if ( comments_open() || '0' != get_comments_number() )
- comments_template( '', true );
</del><ins>+ // If comments are open or we have at least one comment, load up the comment template.
+ if ( comments_open() || get_comments_number() )
+ comments_template();
+ endwhile;
</ins><span class="cx"> ?>
</span><ins>+ </div><!-- #content -->
+</div><!-- #primary -->
</ins><span class="cx">
</span><del>- <?php endwhile; // end of the loop. ?>
-
- </div><!-- #content .site-content -->
-</div><!-- #primary .content-area -->
-
-<?php get_sidebar( 'content' ); ?>
-
-<?php get_sidebar(); ?>
-
-<?php get_footer(); ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php
+get_sidebar( 'content' );
+get_sidebar();
+get_footer();
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenstylecss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/style.css (25020 => 25021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/style.css 2013-08-14 15:43:03 UTC (rev 25020)
+++ trunk/src/wp-content/themes/twentyfourteen/style.css 2013-08-14 16:38:01 UTC (rev 25021)
</span><span class="lines">@@ -434,7 +434,7 @@
</span><span class="cx"> vertical-align: top; /* Improves readability and alignment in all browsers */
</span><span class="cx"> width: 100%;
</span><span class="cx"> }
</span><del>-#searchform input[type="text"] {
</del><ins>+.search-field {
</ins><span class="cx"> width: 100%;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -487,29 +487,55 @@
</span><span class="cx"> margin: 0 auto;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* Text meant only for screen readers */
-.assistive-text {
- clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
</del><ins>+/* Assistive text */
+.screen-reader-text {
</ins><span class="cx"> clip: rect(1px, 1px, 1px, 1px);
</span><span class="cx"> position: absolute !important;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.screen-reader-text:focus {
+ background-color: #f1f1f1;
+ border-radius: 3px;
+ box-shadow: 0 0 2px 2px rgba(0, 0, 0, 0.6);
+ clip: auto !important;
+ color: #21759b;
+ display: block;
+ font-size: 14px;
+ font-weight: bold;
+ height: auto;
+ line-height: normal;
+ padding: 15px 23px 14px;
+ position: absolute;
+ left: 5px;
+ top: 5px;
+ text-decoration: none;
+ width: auto;
+ z-index: 100000; /* Above WP toolbar */
+}
+
</ins><span class="cx"> /* Hidden */
</span><span class="cx"> .hide {
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* Clearing floats */
-.clearfix:after {
- clear: both;
-}
-.clearfix:before,
-.clearfix:after {
</del><ins>+/* Clearing */
+.clear:before,
+.clear:after,
+[class*="content"]:before,
+[class*="content"]:after,
+[class*="site"]:before,
+[class*="site"]:after {
+ content: '';
</ins><span class="cx"> display: table;
</span><del>- content: "";
</del><span class="cx"> }
</span><span class="cx">
</span><ins>+.clear:after,
+[class*="content"]:after,
+[class*="site"]:after {
+ clear: both;
+}
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> /* =Basic Structure
</span><span class="cx"> ----------------------------------------------- */
</span><span class="cx">
</span><span class="lines">@@ -771,7 +797,7 @@
</span><span class="cx"> .search-box {
</span><span class="cx"> background-color: #35921f;
</span><span class="cx"> }
</span><del>-.search-box #searchform input[type="text"] {
</del><ins>+.search-box .search-field {
</ins><span class="cx"> background-color: #fff;
</span><span class="cx"> float: right;
</span><span class="cx"> font-size: 13px;
</span><span class="lines">@@ -1032,11 +1058,13 @@
</span><span class="cx"> content: '\0020\007c\0020';
</span><span class="cx"> }
</span><span class="cx"> .entry-content,
</span><ins>+.page-content,
</ins><span class="cx"> .entry-summary {
</span><span class="cx"> position: relative;
</span><span class="cx"> z-index: 2;
</span><span class="cx"> }
</span><del>-.entry-content a {
</del><ins>+.entry-content a,
+.page-content a, {
</ins><span class="cx"> text-decoration: underline;
</span><span class="cx"> }
</span><span class="cx"> .entry-content table,
</span><span class="lines">@@ -1075,12 +1103,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* #primary specific styles */
</span><del>-#primary .entry-header {
</del><ins>+#primary .entry-header,
+#primary .page-header {
</ins><span class="cx"> background-color: #fff;
</span><span class="cx"> padding: 24px 10px 12px;
</span><span class="cx"> padding: 2.4rem 1.0rem 1.2rem;
</span><span class="cx"> }
</span><del>-#primary .entry-title {
</del><ins>+#primary .entry-title,
+#primary .page-title {
</ins><span class="cx"> font-size: 33px;
</span><span class="cx"> font-size: 3.3rem;
</span><span class="cx"> font-weight: 300;
</span><span class="lines">@@ -1096,6 +1126,7 @@
</span><span class="cx"> text-transform: uppercase;
</span><span class="cx"> }
</span><span class="cx"> #primary .entry-content,
</span><ins>+#primary .page-content,
</ins><span class="cx"> #primary .entry-summary {
</span><span class="cx"> background-color: #fff;
</span><span class="cx"> padding: 12px 10px 0;
</span><span class="lines">@@ -1165,10 +1196,10 @@
</span><span class="cx">
</span><span class="cx"> /* Page specific styles */
</span><span class="cx"> .page #primary .entry-header,
</span><del>-.error404 #primary .entry-header,
</del><ins>+.error404 #primary .page-header,
</ins><span class="cx"> .single-attachment #primary .entry-header,
</span><span class="cx"> .page #primary .entry-content,
</span><del>-.error404 #primary .entry-content,
</del><ins>+.error404 #primary .page-content,
</ins><span class="cx"> .single-attachment #primary .entry-content {
</span><span class="cx"> padding-top: 0;
</span><span class="cx"> }
</span><span class="lines">@@ -1275,11 +1306,11 @@
</span><span class="cx"> }
</span><span class="cx"> /* For Firefox to avoid jagged edge */
</span><span class="cx"> @-moz-document url-prefix() {
</span><del>- .tag-links a:before {
- border-right: 10px solid #8c8c8c;
</del><ins>+ .tag-links a:before {
+ border-right: 10px solid #8c8c8c;
</ins><span class="cx"> left: -10px;
</span><span class="cx"> left: -1.0rem;
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> .tag-links a:hover:before {
</span><span class="cx"> border-right-color: #2b2b2b;
</span><span class="lines">@@ -1552,12 +1583,12 @@
</span><span class="cx"> /* =404 Page
</span><span class="cx"> ----------------------------------------------- */
</span><span class="cx">
</span><del>-.error404 .entry-content #searchform {
</del><ins>+.error404 .page-content .search-form {
</ins><span class="cx"> margin-bottom: 36px;
</span><span class="cx"> margin-bottom: 3.6rem;
</span><span class="cx"> }
</span><del>-.error404 .entry-content .widget-title,
-.error404 .entry-content .widgettitle {
</del><ins>+.error404 .page-content .widget-title,
+.error404 .page-content .widgettitle {
</ins><span class="cx"> border-top: 5px solid #000;
</span><span class="cx"> color: #2b2b2b;
</span><span class="cx"> padding-top: 7px;
</span><span class="lines">@@ -1568,30 +1599,17 @@
</span><span class="cx"> /* =Media
</span><span class="cx"> ----------------------------------------------- */
</span><span class="cx">
</span><ins>+img {
+ max-width: 100%;
+ height: auto;
+}
</ins><span class="cx"> #site-header img,
</span><span class="cx"> .attachment-featured-thumbnail-large,
</span><span class="cx"> .entry-content img,
</span><span class="cx"> .comment-content img,
</span><span class="cx"> .widget img {
</span><del>- max-width: 100%;
</del><span class="cx"> vertical-align: middle;
</span><span class="cx"> }
</span><del>-#site-header img,
-.entry-content img,
-.attachment-featured-thumbnail-large,
-img[class*="align"],
-img[class*="wp-image-"],
-.widget img {
- height: auto;
-}
-#site-header img,
-.entry-content img,
-img.size-full,
-img.size-large,
-img.wp-post-image {
- max-width: 100%;
- height: auto;
-}
</del><span class="cx"> .attachment-featured-featured img,
</span><span class="cx"> .attachment-featured-thumbnail img {
</span><span class="cx"> height: auto;
</span><span class="lines">@@ -1615,8 +1633,7 @@
</span><span class="cx"> margin-bottom: 7px;
</span><span class="cx"> margin-bottom: 0.7rem;
</span><span class="cx"> }
</span><del>-.entry-content img.wp-smiley,
-.comment-content img.wp-smiley {
</del><ins>+.wp-smiley {
</ins><span class="cx"> border: none;
</span><span class="cx"> margin-bottom: 0;
</span><span class="cx"> margin-top: 0;
</span><span class="lines">@@ -1851,7 +1868,7 @@
</span><span class="cx"> padding: 0 10px;
</span><span class="cx"> padding: 0 1.0rem;
</span><span class="cx"> }
</span><del>-.commentlist {
</del><ins>+.comment-list {
</ins><span class="cx"> list-style: none;
</span><span class="cx"> margin: 0 0 48px 0;
</span><span class="cx"> margin: 0 0 4.8rem 0;
</span><span class="lines">@@ -1870,14 +1887,14 @@
</span><span class="cx"> color: #2b2b2b;
</span><span class="cx"> }
</span><span class="cx"> .comment-meta a,
</span><del>-.commentlist li.trackback a,
-.commentlist li.pingback a {
</del><ins>+.comment-list li.trackback a,
+.comment-list li.pingback a {
</ins><span class="cx"> color: #8c8c8c;
</span><span class="cx"> }
</span><span class="cx"> .comment-author a:hover,
</span><span class="cx"> .comment-meta a:hover,
</span><del>-.commentlist li.trackback a:hover,
-.commentlist li.pingback a:hover {
</del><ins>+.comment-list li.trackback a:hover,
+.comment-list li.pingback a:hover {
</ins><span class="cx"> color: #41a62a;
</span><span class="cx"> text-decoration: none;
</span><span class="cx"> }
</span><span class="lines">@@ -1887,15 +1904,15 @@
</span><span class="cx"> content: '\007c\0020';
</span><span class="cx"> }
</span><span class="cx"> .comments-area article,
</span><del>-.commentlist li.trackback,
-.commentlist li.pingback {
</del><ins>+.comment-list li.trackback,
+.comment-list li.pingback {
</ins><span class="cx"> border-top: 1px solid rgba(0, 0, 0, 0.1);
</span><span class="cx"> margin-bottom: 24px;
</span><span class="cx"> margin-bottom: 2.4rem;
</span><span class="cx"> padding: 24px 10px 0;
</span><span class="cx"> padding: 2.4rem 1.0rem 0;
</span><span class="cx"> }
</span><del>-.commentlist li:first-child article {
</del><ins>+.comment-list li:first-child article {
</ins><span class="cx"> border: none;
</span><span class="cx"> }
</span><span class="cx"> .comments-area article {
</span><span class="lines">@@ -1958,7 +1975,7 @@
</span><span class="cx"> .comment-content ol ul {
</span><span class="cx"> margin-bottom: 0;
</span><span class="cx"> }
</span><del>-.commentlist .children {
</del><ins>+.comment-list .children {
</ins><span class="cx"> list-style: none;
</span><span class="cx"> margin-left: 20px;
</span><span class="cx"> margin-left: 2.0rem;
</span><span class="lines">@@ -2315,7 +2332,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Search widget */
</span><del>-#searchsubmit {
</del><ins>+.search-submit {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2852,7 +2869,7 @@
</span><span class="cx"> padding: 0 4.46428571%;
</span><span class="cx"> }
</span><span class="cx"> .page #primary .entry-header,
</span><del>- .error404 #primary .entry-header {
</del><ins>+ .error404 #primary .page-header {
</ins><span class="cx"> margin: 0 4.59183673%;
</span><span class="cx"> padding: 0 4.46428571% 12px;
</span><span class="cx"> padding: 0 4.46428571% 1.2rem;
</span><span class="lines">@@ -2886,8 +2903,8 @@
</span><span class="cx"> margin-top: 0;
</span><span class="cx"> }
</span><span class="cx"> .comments-area article,
</span><del>- .commentlist li.trackback,
- .commentlist li.pingback {
</del><ins>+ .comment-list li.trackback,
+ .comment-list li.pingback {
</ins><span class="cx"> margin-bottom: 36px;
</span><span class="cx"> margin-bottom: 3.6rem;
</span><span class="cx"> padding-top: 36px;
</span><span class="lines">@@ -2913,8 +2930,8 @@
</span><span class="cx"> .nocomments,
</span><span class="cx"> #comments #respond,
</span><span class="cx"> .comments-area article,
</span><del>- .commentlist li.trackback,
- .commentlist li.pingback,
</del><ins>+ .comment-list li.trackback,
+ .comment-list li.pingback,
</ins><span class="cx"> .post-navigation .nav-previous,
</span><span class="cx"> .post-navigation .nav-next {
</span><span class="cx"> padding-right: 9.12778904%;
</span><span class="lines">@@ -2933,8 +2950,8 @@
</span><span class="cx"> .full-width .comments-title,
</span><span class="cx"> .full-width #comments #respond,
</span><span class="cx"> .full-width .comments-area article,
</span><del>- .full-width .commentlist li.trackback,
- .full-width .commentlist li.pingback {
</del><ins>+ .full-width .comment-list li.trackback,
+ .full-width .comment-list li.pingback {
</ins><span class="cx"> padding-right: 6.04307432%;
</span><span class="cx"> padding-left: 6.04307432%;
</span><span class="cx"> }
</span><span class="lines">@@ -2987,7 +3004,7 @@
</span><span class="cx"> margin: 1.2rem 8.03571428% 2.4rem 12.5%;
</span><span class="cx"> }
</span><span class="cx"> .page #primary .entry-header,
</span><del>- .error404 #primary .entry-header {
</del><ins>+ .error404 #primary .page-header {
</ins><span class="cx"> margin: 0 8.03571428% 0 12.5%;
</span><span class="cx"> }
</span><span class="cx"> #primary .full-width .entry-header,
</span><span class="lines">@@ -3016,8 +3033,8 @@
</span><span class="cx"> .nocomments,
</span><span class="cx"> #comments #respond,
</span><span class="cx"> .comments-area article,
</span><del>- .commentlist li.trackback,
- .commentlist li.pingback,
</del><ins>+ .comment-list li.trackback,
+ .comment-list li.pingback,
</ins><span class="cx"> .post-navigation .nav-previous,
</span><span class="cx"> .post-navigation .nav-next {
</span><span class="cx"> padding-right: 12.39493534%;
</span><span class="lines">@@ -3026,8 +3043,8 @@
</span><span class="cx"> #comments #respond {
</span><span class="cx"> padding-right: 13.8900862%;
</span><span class="cx"> }
</span><del>- .commentlist,
- .full-width .commentlist {
</del><ins>+ .comment-list,
+ .full-width .comment-list {
</ins><span class="cx"> margin-left: -70px;
</span><span class="cx"> margin-left: -7.0rem;
</span><span class="cx"> }
</span><span class="lines">@@ -3040,8 +3057,8 @@
</span><span class="cx"> .full-width .comments-title,
</span><span class="cx"> .full-width #comments #respond,
</span><span class="cx"> .full-width .comments-area article,
</span><del>- .full-width .commentlist li.trackback,
- .full-width .commentlist li.pingback {
</del><ins>+ .full-width .comment-list li.trackback,
+ .full-width .comment-list li.pingback {
</ins><span class="cx"> padding-right: 11.30926724%;
</span><span class="cx"> padding-left: 11.30926724%;
</span><span class="cx"> }
</span><span class="lines">@@ -3066,6 +3083,7 @@
</span><span class="cx"> #page:before {
</span><span class="cx"> background-color: #000;
</span><span class="cx"> content: '';
</span><ins>+ display: block;
</ins><span class="cx"> height: 100%;
</span><span class="cx"> min-height: 100%;
</span><span class="cx"> position: absolute;
</span><span class="lines">@@ -3119,13 +3137,15 @@
</span><span class="cx"> margin: 0 0 0 -27.31707317%;
</span><span class="cx"> width: 24.87804878%;
</span><span class="cx"> }
</span><del>- #primary .entry-header {
</del><ins>+ #primary .entry-header,
+ #primary .page-header {
</ins><span class="cx"> margin: -48px 4.59183673% 0;
</span><span class="cx"> margin: -4.8rem 4.59183673% 0;
</span><span class="cx"> padding: 24px 4.46428571% 12px;
</span><span class="cx"> padding: 2.4rem 4.46428571% 1.2rem;
</span><span class="cx"> }
</span><span class="cx"> #primary .entry-content,
</span><ins>+ #primary .page-content,
</ins><span class="cx"> #primary .entry-summary {
</span><span class="cx"> margin: 0 4.59183673%;
</span><span class="cx"> padding: 12px 4.46428571% 0;
</span><span class="lines">@@ -3185,7 +3205,7 @@
</span><span class="cx"> display: block;
</span><span class="cx"> }
</span><span class="cx"> .page #primary .entry-header,
</span><del>- .error404 #primary .entry-header {
</del><ins>+ .error404 #primary .page-header {
</ins><span class="cx"> margin: 0 4.59183673%;
</span><span class="cx"> padding: 0 4.46428571% 12px;
</span><span class="cx"> padding: 0 4.46428571% 1.2rem;
</span><span class="lines">@@ -3200,6 +3220,7 @@
</span><span class="cx"> }
</span><span class="cx"> #primary .full-width .entry-header,
</span><span class="cx"> #primary .full-width .entry-content,
</span><ins>+ #primary .full-width .page-content,
</ins><span class="cx"> #primary .full-width footer.entry-meta {
</span><span class="cx"> margin: 0 5.882236%;
</span><span class="cx"> }
</span><span class="lines">@@ -3207,15 +3228,15 @@
</span><span class="cx"> .nocomments,
</span><span class="cx"> #comments #respond,
</span><span class="cx"> .comments-area article,
</span><del>- .commentlist li.trackback,
- .commentlist li.pingback,
</del><ins>+ .comment-list li.trackback,
+ .comment-list li.pingback,
</ins><span class="cx"> .post-navigation .nav-previous,
</span><span class="cx"> .post-navigation .nav-next {
</span><span class="cx"> padding-right: 9.87001616%;
</span><span class="cx"> padding-left: 9.19765166%;
</span><span class="cx"> }
</span><del>- .commentlist,
- .full-width .commentlist {
</del><ins>+ .comment-list,
+ .full-width .comment-list {
</ins><span class="cx"> margin-left: 0;
</span><span class="cx"> }
</span><span class="cx"> .comment-navigation {
</span><span class="lines">@@ -3227,8 +3248,8 @@
</span><span class="cx"> .full-width .comments-title,
</span><span class="cx"> .full-width #comments #respond,
</span><span class="cx"> .full-width .comments-area article,
</span><del>- .full-width .commentlist li.trackback,
- .full-width .commentlist li.pingback {
</del><ins>+ .full-width .comment-list li.trackback,
+ .full-width .comment-list li.pingback {
</ins><span class="cx"> padding-right: 5.882236%;
</span><span class="cx"> padding-left: 5.882236%;
</span><span class="cx"> }
</span><span class="lines">@@ -3282,11 +3303,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @media screen and (min-width: 1150px) {
</span><del>- #primary .entry-header {
</del><ins>+ #primary .entry-header,
+ #primary .page-header {
</ins><span class="cx"> margin: -48px 8.03571428% 0 12.5%;
</span><span class="cx"> margin: -4.8rem 8.03571428% 0 12.5%;
</span><span class="cx"> }
</span><span class="cx"> #primary .entry-content,
</span><ins>+ #primary .page-content,
</ins><span class="cx"> #primary .entry-summary {
</span><span class="cx"> margin: 0 8.03571428% 0 12.5%;
</span><span class="cx"> }
</span><span class="lines">@@ -3298,8 +3321,8 @@
</span><span class="cx"> .nocomments,
</span><span class="cx"> #comments #respond,
</span><span class="cx"> .comments-area article,
</span><del>- .commentlist li.trackback,
- .commentlist li.pingback,
</del><ins>+ .comment-list li.trackback,
+ .comment-list li.pingback,
</ins><span class="cx"> .post-navigation .nav-previous,
</span><span class="cx"> .post-navigation .nav-next {
</span><span class="cx"> padding-right: 12.44146986%;
</span><span class="lines">@@ -3308,8 +3331,8 @@
</span><span class="cx"> #comments #respond {
</span><span class="cx"> padding-right: 13.73697916%;
</span><span class="cx"> }
</span><del>- .commentlist,
- .full-width .commentlist {
</del><ins>+ .comment-list,
+ .full-width .comment-list {
</ins><span class="cx"> margin-left: -70px;
</span><span class="cx"> margin-left: -7.0rem;
</span><span class="cx"> }
</span><span class="lines">@@ -3321,11 +3344,12 @@
</span><span class="cx"> margin: 0 8.03571428% 2.4rem 12.5%;
</span><span class="cx"> }
</span><span class="cx"> .page #primary .entry-header,
</span><del>- .error404 #primary .entry-header {
</del><ins>+ .error404 #primary .page-header {
</ins><span class="cx"> margin: 0 8.03571428% 0 12.5%;
</span><span class="cx"> }
</span><span class="cx"> #primary .full-width .entry-header,
</span><span class="cx"> #primary .full-width .entry-content,
</span><ins>+ #primary .full-width .page-content,
</ins><span class="cx"> #primary .full-width footer.entry-meta {
</span><span class="cx"> margin: 0 11.21868265%;
</span><span class="cx"> }
</span><span class="lines">@@ -3335,8 +3359,8 @@
</span><span class="cx"> .full-width .comments-title,
</span><span class="cx"> .full-width #comments #respond,
</span><span class="cx"> .full-width .comments-area article,
</span><del>- .full-width .commentlist li.trackback,
- .full-width .commentlist li.pingback {
</del><ins>+ .full-width .comment-list li.trackback,
+ .full-width .comment-list li.pingback {
</ins><span class="cx"> padding-right: 11.21868265%;
</span><span class="cx"> padding-left: 11.21868265%;
</span><span class="cx"> }
</span><span class="lines">@@ -3365,6 +3389,7 @@
</span><span class="cx"> }
</span><span class="cx"> #primary .full-width .entry-header,
</span><span class="cx"> #primary .full-width .entry-content,
</span><ins>+ #primary .full-width .page-content,
</ins><span class="cx"> #primary .full-width footer.entry-meta {
</span><span class="cx"> margin: 0 0 0 11.21868265%;
</span><span class="cx"> }
</span><span class="lines">@@ -3374,8 +3399,8 @@
</span><span class="cx"> .full-width .comments-title,
</span><span class="cx"> .full-width #comments #respond,
</span><span class="cx"> .full-width .comments-area article,
</span><del>- .full-width .commentlist li.trackback,
- .full-width .commentlist li.pingback {
</del><ins>+ .full-width .comment-list li.trackback,
+ .full-width .comment-list li.pingback {
</ins><span class="cx"> padding-right: 0;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>