From 976df5f9edc485f46e1781c2e0fd5a7ade6dfcd5 Mon Sep 17 00:00:00 2001
From: Lance Willett <lancewillett@git.wordpress.org>
Date: Thu, 7 Nov 2013 19:04:56 +0000
Subject: [PATCH] Twenty Fourteen: clean up inconsistencies in content template
 files. Props iamtakashi, fixes #25868.

git-svn-id: https://develop.svn.wordpress.org/trunk@26036 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../themes/twentyfourteen/content-aside.php          | 12 +++++++-----
 .../themes/twentyfourteen/content-audio.php          |  2 +-
 .../themes/twentyfourteen/content-gallery.php        |  6 ++++--
 .../themes/twentyfourteen/content-image.php          |  2 +-
 .../themes/twentyfourteen/content-link.php           |  6 +++---
 .../themes/twentyfourteen/content-quote.php          | 12 +++++++-----
 .../themes/twentyfourteen/content-video.php          |  2 +-
 src/wp-content/themes/twentyfourteen/content.php     |  8 +++++---
 8 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/wp-content/themes/twentyfourteen/content-aside.php b/src/wp-content/themes/twentyfourteen/content-aside.php
index b7244e7e7e..523e15665d 100644
--- a/src/wp-content/themes/twentyfourteen/content-aside.php
+++ b/src/wp-content/themes/twentyfourteen/content-aside.php
@@ -16,9 +16,9 @@
 		<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
+			endif;
+
 			if ( is_single() ) :
 				the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
@@ -53,9 +53,11 @@
 		?>
 	</div><!-- .entry-content -->
 
+	<?php if ( has_tag() ) : ?>
 	<footer class="entry-meta">
-		<?php if ( has_tag() ) : ?>
-		<span class="tag-links"><?php echo get_the_tag_list(); ?></span>
-		<?php endif; ?>
+		<span class="tag-links">
+			<?php echo get_the_tag_list(); ?>
+		</span>
 	</footer><!-- .entry-meta -->
+	<?php endif; ?>
 </article><!-- #post-## -->
diff --git a/src/wp-content/themes/twentyfourteen/content-audio.php b/src/wp-content/themes/twentyfourteen/content-audio.php
index 62e4965b6d..5bec8c0f0f 100644
--- a/src/wp-content/themes/twentyfourteen/content-audio.php
+++ b/src/wp-content/themes/twentyfourteen/content-audio.php
@@ -43,7 +43,7 @@
 
 	<div class="entry-content">
 		<?php
-			the_content();
+			the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) );
 			wp_link_pages( array(
 				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
 				'after'       => '</div>',
diff --git a/src/wp-content/themes/twentyfourteen/content-gallery.php b/src/wp-content/themes/twentyfourteen/content-gallery.php
index fc3639f8bb..cee0a5250f 100644
--- a/src/wp-content/themes/twentyfourteen/content-gallery.php
+++ b/src/wp-content/themes/twentyfourteen/content-gallery.php
@@ -33,7 +33,7 @@
 
 			<?php twentyfourteen_posted_on(); ?>
 
-			<?php if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
+			<?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; ?>
 
@@ -55,7 +55,9 @@
 
 	<?php if ( has_tag() ) : ?>
 	<footer class="entry-meta">
-		<span class="tag-links"><?php echo get_the_tag_list(); ?></span>
+		<span class="tag-links">
+			<?php echo get_the_tag_list(); ?>
+		</span>
 	</footer><!-- .entry-meta -->
 	<?php endif; ?>
 </article><!-- #post-## -->
diff --git a/src/wp-content/themes/twentyfourteen/content-image.php b/src/wp-content/themes/twentyfourteen/content-image.php
index c600a181c4..88c2b466a2 100644
--- a/src/wp-content/themes/twentyfourteen/content-image.php
+++ b/src/wp-content/themes/twentyfourteen/content-image.php
@@ -43,7 +43,7 @@
 
 	<div class="entry-content">
 		<?php
-			the_content();
+			the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) );
 			wp_link_pages( array(
 				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
 				'after'       => '</div>',
diff --git a/src/wp-content/themes/twentyfourteen/content-link.php b/src/wp-content/themes/twentyfourteen/content-link.php
index 2e83c3a477..ad2c3891d4 100644
--- a/src/wp-content/themes/twentyfourteen/content-link.php
+++ b/src/wp-content/themes/twentyfourteen/content-link.php
@@ -16,9 +16,9 @@
 		<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
+			endif;
+
 			if ( is_single() ) :
 				the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
@@ -43,7 +43,7 @@
 
 	<div class="entry-content">
 		<?php
-			the_content();
+			the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) );
 			wp_link_pages( array(
 				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
 				'after'       => '</div>',
diff --git a/src/wp-content/themes/twentyfourteen/content-quote.php b/src/wp-content/themes/twentyfourteen/content-quote.php
index 4a00b47332..6b9c059c9b 100644
--- a/src/wp-content/themes/twentyfourteen/content-quote.php
+++ b/src/wp-content/themes/twentyfourteen/content-quote.php
@@ -16,9 +16,9 @@
 		<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
+			endif;
+
 			if ( is_single() ) :
 				the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
@@ -53,9 +53,11 @@
 		?>
 	</div><!-- .entry-content -->
 
+	<?php if ( has_tag() ) : ?>
 	<footer class="entry-meta">
-		<?php if ( has_tag() ) : ?>
-		<span class="tag-links"><?php echo get_the_tag_list(); ?></span>
-		<?php endif; ?>
+		<span class="tag-links">
+			<?php echo get_the_tag_list(); ?>
+		</span>
 	</footer><!-- .entry-meta -->
+	<?php endif; ?>
 </article><!-- #post-## -->
diff --git a/src/wp-content/themes/twentyfourteen/content-video.php b/src/wp-content/themes/twentyfourteen/content-video.php
index 1e6c3aa56e..a6049b195c 100644
--- a/src/wp-content/themes/twentyfourteen/content-video.php
+++ b/src/wp-content/themes/twentyfourteen/content-video.php
@@ -43,7 +43,7 @@
 
 	<div class="entry-content">
 		<?php
-			the_content();
+			the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) );
 			wp_link_pages( array(
 				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
 				'after'       => '</div>',
diff --git a/src/wp-content/themes/twentyfourteen/content.php b/src/wp-content/themes/twentyfourteen/content.php
index b3e0f4ca41..2d427f3672 100644
--- a/src/wp-content/themes/twentyfourteen/content.php
+++ b/src/wp-content/themes/twentyfourteen/content.php
@@ -18,9 +18,9 @@
 		<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>
-		<?php endif; ?>
-
 		<?php
+			endif;
+
 			if ( is_single() ) :
 				the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
@@ -64,7 +64,9 @@
 
 	<?php if ( has_tag() ) : ?>
 	<footer class="entry-meta">
-		<span class="tag-links"><?php echo get_the_tag_list(); ?></span>
+		<span class="tag-links">
+			<?php echo get_the_tag_list(); ?>
+		</span>
 	</footer><!-- .entry-meta -->
 	<?php endif; ?>
 </article><!-- #post-## -->