<!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>[25088] trunk/src/wp-content/themes/twentyfourteen: Twenty Fourteen: Align post format handling with Twenty Thirteen.</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/25088">25088</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-08-22 17:02:34 +0000 (Thu, 22 Aug 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Fourteen: Align post format handling with Twenty Thirteen. Props Frank Klein and obenland, see <a href="http://core.trac.wordpress.org/ticket/24877">#24877</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfourteenarchivephp">trunk/src/wp-content/themes/twentyfourteen/archive.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentpostformatphp">trunk/src/wp-content/themes/twentyfourteen/content-post-format.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="#trunksrcwpcontentthemestwentyfourteenfrontpagephp">trunk/src/wp-content/themes/twentyfourteen/front-page.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="#trunksrcwpcontentthemestwentyfourteensearchphp">trunk/src/wp-content/themes/twentyfourteen/search.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="#trunksrcwpcontentthemestwentyfourteencontentasidephp">trunk/src/wp-content/themes/twentyfourteen/content-aside.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentgalleryphp">trunk/src/wp-content/themes/twentyfourteen/content-gallery.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentimagephp">trunk/src/wp-content/themes/twentyfourteen/content-image.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentlinkphp">trunk/src/wp-content/themes/twentyfourteen/content-link.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentquotephp">trunk/src/wp-content/themes/twentyfourteen/content-quote.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentvideophp">trunk/src/wp-content/themes/twentyfourteen/content-video.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyfourteenarchivephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/archive.php (25087 => 25088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/archive.php 2013-08-22 17:00:36 UTC (rev 25087)
+++ trunk/src/wp-content/themes/twentyfourteen/archive.php 2013-08-22 17:02:34 UTC (rev 25088)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> while ( have_posts() ) :
</span><span class="cx"> the_post();
</span><span class="cx">
</span><del>- twentyfourteen_get_template_part();
</del><ins>+ get_template_part( 'content', get_post_format() );
</ins><span class="cx"> endwhile;
</span><span class="cx"> twentyfourteen_paging_nav();
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentasidephp"></a>
<div class="addfile"><h4>Added: trunk/src/wp-content/themes/twentyfourteen/content-aside.php (0 => 25088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/content-aside.php (rev 0)
+++ trunk/src/wp-content/themes/twentyfourteen/content-aside.php 2013-08-22 17:02:34 UTC (rev 25088)
</span><span class="lines">@@ -0,0 +1,60 @@
</span><ins>+<?php
+/**
+ * The template for displaying posts in the Aside post format.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Fourteen
+ */
+?>
+
+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <header class="entry-header">
+ <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
+ <div class="entry-meta">
+ <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
+ </div><!-- .entry-meta -->
+ <?php endif; ?>
+
+ <div class="entry-meta">
+ <span class="post-format">
+ <a class="entry-format" href="<?php echo esc_url( get_post_format_link( 'aside' ) ); ?>" title="<?php echo esc_attr( sprintf( __( 'All %s posts', 'twentyfourteen' ), get_post_format_string( 'aside' ) ) ); ?>"><?php echo get_post_format_string( 'aside' ); ?></a>
+ </span>
+
+ <?php twentyfourteen_posted_on(); ?>
+
+ <?php if ( ! post_password_required() && ( comments_open() || 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>' ); ?>
+ </div><!-- .entry-meta -->
+ </header><!-- .entry-header -->
+
+ <div class="entry-content">
+ <?php
+ the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyfourteen' ) );
+ wp_link_pages( array(
+ 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+ 'after' => '</div>',
+ 'link_before' => '<span>',
+ 'link_after' => '</span>',
+ ) );
+ ?>
+ </div><!-- .entry-content -->
+
+ <footer class="entry-meta">
+ <div class="entry-meta">
+ <?php
+ if ( is_single() ) :
+ the_title( '<h1 class="entry-title">', '</h1>' );
+ else :
+ the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
+ endif;
+ ?>
+ </div>
+
+ <?php if ( has_tag() ) : ?>
+ <span class="tag-links"><?php echo get_the_tag_list(); ?></span>
+ <?php endif; ?>
+ </footer><!-- .entry-meta -->
+</article><!-- #post-## -->
</ins><span class="cx">Property changes on: trunk/src/wp-content/themes/twentyfourteen/content-aside.php
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+native
</ins><span class="cx">\ No newline at end of property
</span><a id="trunksrcwpcontentthemestwentyfourteencontentgalleryphp"></a>
<div class="addfile"><h4>Added: trunk/src/wp-content/themes/twentyfourteen/content-gallery.php (0 => 25088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/content-gallery.php (rev 0)
+++ trunk/src/wp-content/themes/twentyfourteen/content-gallery.php 2013-08-22 17:02:34 UTC (rev 25088)
</span><span class="lines">@@ -0,0 +1,84 @@
</span><ins>+<?php
+/**
+ * The template for displaying posts in the Gallery post format.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Fourteen
+ */
+
+if ( has_post_thumbnail() ) :
+ $image = get_post_thumbnail_id();
+else :
+ $images = get_posts( array(
+ 'post_parent' => get_the_ID(),
+ 'fields' => 'ids',
+ 'numberposts' => 1,
+ 'post_status' => 'inherit',
+ 'post_type' => 'attachment',
+ 'post_mime_type' => 'image',
+ 'order' => 'ASC',
+ 'orderby' => 'menu_order ID',
+ ) );
+ $image = array_shift( $images );
+endif;
+?>
+
+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <?php if( is_single() && $image ) : ?>
+ <div class="attachment-featured-thumbnail">
+ <?php echo wp_get_attachment_image( $image, 'featured-thumbnail-large' ); ?>
+ </div>
+ <?php elseif ( $image ) : ?>
+ <a class="attachment-featured-thumbnail" href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyfourteen' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="<?php the_ID(); ?>">
+ <?php echo wp_get_attachment_image( $image, 'featured-thumbnail-large' ); ?>
+ </a>
+ <?php endif; ?>
+
+ <header class="entry-header">
+ <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
+ <div class="entry-meta">
+ <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
+ </div><!-- .entry-meta -->
+ <?php
+ endif;
+
+ if ( is_single() ) :
+ the_title( '<h1 class="entry-title">', '</h1>' );
+ else :
+ the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
+ endif;
+ ?>
+
+ <div class="entry-meta">
+ <span class="post-format">
+ <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>
+ </span>
+
+ <?php twentyfourteen_posted_on(); ?>
+
+ <?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>' ); ?>
+ </div><!-- .entry-meta -->
+ </header><!-- .entry-header -->
+
+ <div class="entry-content">
+ <?php
+ the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyfourteen' ) );
+ wp_link_pages( array(
+ 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+ 'after' => '</div>',
+ 'link_before' => '<span>',
+ 'link_after' => '</span>',
+ ) );
+ ?>
+ </div><!-- .entry-content -->
+
+ <?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 class="cx">Property changes on: trunk/src/wp-content/themes/twentyfourteen/content-gallery.php
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+native
</ins><span class="cx">\ No newline at end of property
</span><a id="trunksrcwpcontentthemestwentyfourteencontentimagephp"></a>
<div class="addfile"><h4>Added: trunk/src/wp-content/themes/twentyfourteen/content-image.php (0 => 25088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/content-image.php (rev 0)
+++ trunk/src/wp-content/themes/twentyfourteen/content-image.php 2013-08-22 17:02:34 UTC (rev 25088)
</span><span class="lines">@@ -0,0 +1,60 @@
</span><ins>+<?php
+/**
+ * The template for displaying posts in the Image post format.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Fourteen
+ */
+?>
+
+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <header class="entry-header">
+ <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
+ <div class="entry-meta">
+ <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
+ </div><!-- .entry-meta -->
+ <?php
+ endif;
+
+ if ( is_single() ) :
+ the_title( '<h1 class="entry-title">', '</h1>' );
+ else :
+ the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
+ endif;
+ ?>
+
+ <div class="entry-meta">
+ <span class="post-format">
+ <a class="entry-format" href="<?php echo esc_url( get_post_format_link( 'image' ) ); ?>" title="<?php echo esc_attr( sprintf( __( 'All %s posts', 'twentyfourteen' ), get_post_format_string( 'image' ) ) ); ?>"><?php echo get_post_format_string( 'image' ); ?></a>
+ </span>
+
+ <?php twentyfourteen_posted_on(); ?>
+
+ <?php if ( ! post_password_required() && ( comments_open() || 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>' ); ?>
+ </div><!-- .entry-meta -->
+ </header><!-- .entry-header -->
+
+ <div class="entry-content">
+ <?php
+ the_content();
+ wp_link_pages( array(
+ 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+ 'after' => '</div>',
+ 'link_before' => '<span>',
+ 'link_after' => '</span>',
+ ) );
+ ?>
+ </div><!-- .entry-content -->
+
+ <?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 class="cx">Property changes on: trunk/src/wp-content/themes/twentyfourteen/content-image.php
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+native
</ins><span class="cx">\ No newline at end of property
</span><a id="trunksrcwpcontentthemestwentyfourteencontentlinkphp"></a>
<div class="addfile"><h4>Added: trunk/src/wp-content/themes/twentyfourteen/content-link.php (0 => 25088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/content-link.php (rev 0)
+++ trunk/src/wp-content/themes/twentyfourteen/content-link.php 2013-08-22 17:02:34 UTC (rev 25088)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+<?php
+/**
+ * The template for displaying posts in the Link post format.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Fourteen
+ */
+?>
+
+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <header class="entry-header">
+ <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
+ <div class="entry-meta">
+ <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
+ </div><!-- .entry-meta -->
+ <?php endif; ?>
+
+ <div class="entry-meta">
+ <span class="post-format">
+ <a class="entry-format" href="<?php echo esc_url( get_post_format_link( 'link' ) ); ?>" title="<?php echo esc_attr( sprintf( __( 'All %s posts', 'twentyfourteen' ), get_post_format_string( 'link' ) ) ); ?>"><?php echo get_post_format_string( 'link' ); ?></a>
+ </span>
+
+ <?php twentyfourteen_posted_on(); ?>
+
+ <?php if ( ! post_password_required() && ( comments_open() || 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>' ); ?>
+ </div><!-- .entry-meta -->
+ </header><!-- .entry-header -->
+
+ <div class="entry-content">
+ <?php
+ the_content();
+ wp_link_pages( array(
+ 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+ 'after' => '</div>',
+ 'link_before' => '<span>',
+ 'link_after' => '</span>',
+ ) );
+ ?>
+ </div><!-- .entry-content -->
+
+ <?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 class="cx">Property changes on: trunk/src/wp-content/themes/twentyfourteen/content-link.php
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+native
</ins><span class="cx">\ No newline at end of property
</span><a id="trunksrcwpcontentthemestwentyfourteencontentpostformatphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/content-post-format.php (25087 => 25088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/content-post-format.php 2013-08-22 17:00:36 UTC (rev 25087)
+++ trunk/src/wp-content/themes/twentyfourteen/content-post-format.php 2013-08-22 17:02:34 UTC (rev 25088)
</span><span class="lines">@@ -1,73 +0,0 @@
</span><del>-<?php
-/**
- * @package WordPress
- * @subpackage Twenty_Fourteen
- */
-?>
-
-<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
- <?php
- if ( has_post_format( 'gallery' ) ) :
- $images = get_children( array( 'post_parent' => get_the_ID(), 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC' ) );
- if ( $images ) :
- $image = array_shift( $images );
- ?>
- <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">
- <?php echo wp_get_attachment_image( $image->ID, 'featured-thumbnail-large' ); ?>
- </a>
- <?php
- endif;
- endif;
- ?>
-
- <header class="entry-header">
- <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
- <div class="entry-meta">
- <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
- </div><!-- .entry-meta -->
- <?php endif; ?>
-
- <?php the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' ); ?>
-
- <div class="entry-meta">
- <span class="post-format">
- <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>
-
- <?php
- if ( 'post' == get_post_type() )
- twentyfourteen_posted_on();
-
- 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>' ); ?>
- </div><!-- .entry-meta -->
- </header><!-- .entry-header -->
-
- <div class="entry-content">
- <?php
- the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyfourteen' ) );
- wp_link_pages( array(
- 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
- 'after' => '</div>',
- 'link_before' => '<span>',
- 'link_after' => '</span>',
- ) );
- ?>
- </div><!-- .entry-content -->
-
- <footer class="entry-meta">
- <?php if ( has_post_format( array( 'quote', 'aside' ) ) ) : ?>
- <div class="entry-meta">
- <?php the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' ); ?>
- </div>
- <?php endif; ?>
-
- <?php if ( has_tag() ) : ?>
- <span class="tag-links"><?php echo get_the_tag_list(); ?></span>
- <?php endif; ?>
- </footer><!-- .entry-meta -->
-</article><!-- #post-## -->
</del></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentquotephp"></a>
<div class="addfile"><h4>Added: trunk/src/wp-content/themes/twentyfourteen/content-quote.php (0 => 25088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/content-quote.php (rev 0)
+++ trunk/src/wp-content/themes/twentyfourteen/content-quote.php 2013-08-22 17:02:34 UTC (rev 25088)
</span><span class="lines">@@ -0,0 +1,60 @@
</span><ins>+<?php
+/**
+ * The template for displaying posts in the Quote post format.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Fourteen
+ */
+?>
+
+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <header class="entry-header">
+ <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
+ <div class="entry-meta">
+ <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
+ </div><!-- .entry-meta -->
+ <?php endif; ?>
+
+ <div class="entry-meta">
+ <span class="post-format">
+ <a class="entry-format" href="<?php echo esc_url( get_post_format_link( 'quote' ) ); ?>" title="<?php echo esc_attr( sprintf( __( 'All %s posts', 'twentyfourteen' ), get_post_format_string( 'quote' ) ) ); ?>"><?php echo get_post_format_string( 'quote' ); ?></a>
+ </span>
+
+ <?php twentyfourteen_posted_on(); ?>
+
+ <?php if ( ! post_password_required() && ( comments_open() || 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>' ); ?>
+ </div><!-- .entry-meta -->
+ </header><!-- .entry-header -->
+
+ <div class="entry-content">
+ <?php
+ the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyfourteen' ) );
+ wp_link_pages( array(
+ 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+ 'after' => '</div>',
+ 'link_before' => '<span>',
+ 'link_after' => '</span>',
+ ) );
+ ?>
+ </div><!-- .entry-content -->
+
+ <footer class="entry-meta">
+ <div class="entry-meta">
+ <?php
+ if ( is_single() ) :
+ the_title( '<h1 class="entry-title">', '</h1>' );
+ else :
+ the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
+ endif;
+ ?>
+ </div>
+
+ <?php if ( has_tag() ) : ?>
+ <span class="tag-links"><?php echo get_the_tag_list(); ?></span>
+ <?php endif; ?>
+ </footer><!-- .entry-meta -->
+</article><!-- #post-## -->
</ins><span class="cx">Property changes on: trunk/src/wp-content/themes/twentyfourteen/content-quote.php
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+native
</ins><span class="cx">\ No newline at end of property
</span><a id="trunksrcwpcontentthemestwentyfourteencontentsinglephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/content-single.php (25087 => 25088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/content-single.php 2013-08-22 17:00:36 UTC (rev 25087)
+++ trunk/src/wp-content/themes/twentyfourteen/content-single.php 2013-08-22 17:02:34 UTC (rev 25088)
</span><span class="lines">@@ -1,70 +0,0 @@
</span><del>-<?php
-/**
- * @package WordPress
- * @subpackage Twenty_Fourteen
- */
-?>
-
-<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
- <?php if ( has_post_thumbnail() && ! has_post_format( array( 'video', 'image', 'aside', 'link', 'quote' ) ) ) : ?>
- <div class="attachment-featured-thumbnail">
- <?php the_post_thumbnail( 'featured-thumbnail-large' ); ?>
- </div>
- <?php endif; ?>
-
- <header class="entry-header">
- <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
- <div class="entry-meta">
- <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
- </div><!-- .entry-meta -->
- <?php
- endif;
-
- if ( ! has_post_format( array( 'status', 'chat', 'aside', 'link', 'quote', 'audio' ) ) ) :
- the_title( '<h1 class="entry-title">', '</h1>' );
- endif;
- ?>
-
- <div class="entry-meta">
- <?php if ( has_post_format( array( 'status', 'chat', 'aside', 'link', 'quote', 'audio' ) ) ) : ?>
- <span class="post-format">
- <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>
- <?php endif; ?>
-
- <?php twentyfourteen_posted_on(); ?>
-
- <?php if ( ! post_password_required() && ( comments_open() || 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>' ); ?>
- </div><!-- .entry-meta -->
- </header><!-- .entry-header -->
-
- <div class="entry-content">
- <?php
- the_content();
- wp_link_pages( array(
- 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
- 'after' => '</div>',
- 'link_before' => '<span>',
- 'link_after' => '</span>',
- ) );
- ?>
- </div><!-- .entry-content -->
-
- <footer class="entry-meta">
- <?php if ( has_post_format( array( 'quote', 'aside' ) ) ) : ?>
- <div class="entry-meta">
- <?php the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' ); ?>
- </div><!-- .entry-meta -->
- <?php endif; ?>
-
- <?php if ( has_tag() ) : ?>
- <span class="tag-links">
- <?php echo get_the_tag_list(); ?>
- </span>
- <?php endif; ?>
- </footer><!-- .entry-meta -->
-</article><!-- #post-## -->
</del></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentvideophp"></a>
<div class="addfile"><h4>Added: trunk/src/wp-content/themes/twentyfourteen/content-video.php (0 => 25088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/content-video.php (rev 0)
+++ trunk/src/wp-content/themes/twentyfourteen/content-video.php 2013-08-22 17:02:34 UTC (rev 25088)
</span><span class="lines">@@ -0,0 +1,60 @@
</span><ins>+<?php
+/**
+ * The template for displaying posts in the Video post format.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Fourteen
+ */
+?>
+
+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <header class="entry-header">
+ <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
+ <div class="entry-meta">
+ <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
+ </div><!-- .entry-meta -->
+ <?php
+ endif;
+
+ if ( is_single() ) :
+ the_title( '<h1 class="entry-title">', '</h1>' );
+ else :
+ the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
+ endif;
+ ?>
+
+ <div class="entry-meta">
+ <span class="post-format">
+ <a class="entry-format" href="<?php echo esc_url( get_post_format_link( 'video' ) ); ?>" title="<?php echo esc_attr( sprintf( __( 'All %s posts', 'twentyfourteen' ), get_post_format_string( 'video' ) ) ); ?>"><?php echo get_post_format_string( 'video' ); ?></a>
+ </span>
+
+ <?php twentyfourteen_posted_on(); ?>
+
+ <?php if ( ! post_password_required() && ( comments_open() || 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>' ); ?>
+ </div><!-- .entry-meta -->
+ </header><!-- .entry-header -->
+
+ <div class="entry-content">
+ <?php
+ the_content();
+ wp_link_pages( array(
+ 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+ 'after' => '</div>',
+ 'link_before' => '<span>',
+ 'link_after' => '</span>',
+ ) );
+ ?>
+ </div><!-- .entry-content -->
+
+ <?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 class="cx">Property changes on: trunk/src/wp-content/themes/twentyfourteen/content-video.php
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+native
</ins><span class="cx">\ No newline at end of property
</span><a id="trunksrcwpcontentthemestwentyfourteencontentphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/content.php (25087 => 25088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/content.php 2013-08-22 17:00:36 UTC (rev 25087)
+++ trunk/src/wp-content/themes/twentyfourteen/content.php 2013-08-22 17:02:34 UTC (rev 25088)
</span><span class="lines">@@ -18,16 +18,10 @@
</span><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <h1 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></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">
</span><span class="cx"> <div class="entry-meta">
</span><del>- <?php if ( has_post_format( 'gallery' ) ) : ?>
- <span class="post-format">
- <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>
- </span>
</del><span class="cx"> <?php
</span><del>- endif;
-
</del><span class="cx"> if ( 'post' == get_post_type() )
</span><span class="cx"> twentyfourteen_posted_on();
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenfrontpagephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/front-page.php (25087 => 25088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/front-page.php 2013-08-22 17:00:36 UTC (rev 25087)
+++ trunk/src/wp-content/themes/twentyfourteen/front-page.php 2013-08-22 17:02:34 UTC (rev 25088)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> while ( have_posts() ) :
</span><span class="cx"> the_post();
</span><span class="cx">
</span><del>- twentyfourteen_get_template_part();
</del><ins>+ get_template_part( 'content', get_post_format() );
</ins><span class="cx">
</span><span class="cx"> comments_template();
</span><span class="cx"> endwhile;
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteeninctemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php (25087 => 25088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php 2013-08-22 17:00:36 UTC (rev 25087)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php 2013-08-22 17:02:34 UTC (rev 25088)
</span><span class="lines">@@ -143,14 +143,3 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'edit_category', 'twentyfourteen_category_transient_flusher' );
</span><span class="cx"> add_action( 'save_post', 'twentyfourteen_category_transient_flusher' );
</span><del>-
-/**
- * Include the Post-Format-specific template for the content.
- * This is called in index.php and single.php
- */
-function twentyfourteen_get_template_part() {
- if ( has_post_format( array( 'aside', 'quote', 'link', 'video', 'image' ) ) )
- get_template_part( 'content', 'post-format' );
- else
- get_template_part( 'content', get_post_format() );
-}
</del></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenindexphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/index.php (25087 => 25088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/index.php 2013-08-22 17:00:36 UTC (rev 25087)
+++ trunk/src/wp-content/themes/twentyfourteen/index.php 2013-08-22 17:02:34 UTC (rev 25088)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> while ( have_posts() ) :
</span><span class="cx"> the_post();
</span><span class="cx">
</span><del>- twentyfourteen_get_template_part();
</del><ins>+ get_template_part( 'content', get_post_format() );
</ins><span class="cx"> endwhile;
</span><span class="cx"> twentyfourteen_paging_nav();
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteensearchphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/search.php (25087 => 25088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/search.php 2013-08-22 17:00:36 UTC (rev 25087)
+++ trunk/src/wp-content/themes/twentyfourteen/search.php 2013-08-22 17:02:34 UTC (rev 25088)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> while ( have_posts() ) :
</span><span class="cx"> the_post();
</span><span class="cx">
</span><del>- twentyfourteen_get_template_part();
</del><ins>+ get_template_part( 'content', get_post_format() );
</ins><span class="cx"> endwhile;
</span><span class="cx"> twentyfourteen_paging_nav();
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteensinglephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/single.php (25087 => 25088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/single.php 2013-08-22 17:00:36 UTC (rev 25087)
+++ trunk/src/wp-content/themes/twentyfourteen/single.php 2013-08-22 17:02:34 UTC (rev 25088)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> while ( have_posts() ) :
</span><span class="cx"> the_post();
</span><span class="cx">
</span><del>- get_template_part( 'content', 'single' );
</del><ins>+ get_template_part( 'content', get_post_format() );
</ins><span class="cx">
</span><span class="cx"> twentyfourteen_post_nav();
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenstylecss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/style.css (25087 => 25088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/style.css 2013-08-22 17:00:36 UTC (rev 25087)
+++ trunk/src/wp-content/themes/twentyfourteen/style.css 2013-08-22 17:02:34 UTC (rev 25088)
</span><span class="lines">@@ -1025,7 +1025,7 @@
</span><span class="cx"> display: inline;
</span><span class="cx"> }
</span><span class="cx"> .post-formatted-posts .entry-title:after,
</span><del>-.content-area span + span.entry-date:before,
</del><ins>+.content-area span + .entry-date:before,
</ins><span class="cx"> span + .byline:before,
</span><span class="cx"> span + .comments-link:before,
</span><span class="cx"> span + .edit-link:before,
</span><span class="lines">@@ -1140,11 +1140,6 @@
</span><span class="cx"> .format-video {
</span><span class="cx"> border-top: 1px solid rgba(0, 0, 0, 0.1);
</span><span class="cx"> }
</span><del>-.format-aside .entry-title,
-.format-quote .entry-title,
-.format-link .entry-title {
- display: none;
-}
</del><span class="cx"> .format-aside .entry-content,
</span><span class="cx"> .format-aside .entry-summary,
</span><span class="cx"> .format-quote .entry-content,
</span></span></pre>
</div>
</div>
</body>
</html>