From 6be421fb37c5da9743be200ad8da96ad3dd59a23 Mon Sep 17 00:00:00 2001
From: Ian Stewart <ian@themeshaper.com>
Date: Mon, 3 Nov 2014 21:40:23 +0000
Subject: [PATCH] Twenty Fifteen: Use new core navigation tags.

Props obenland, iamtakashi, fixes #30189



Built from https://develop.svn.wordpress.org/trunk@30216


git-svn-id: http://core.svn.wordpress.org/trunk@30216 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyfifteen/archive.php   |  6 +-
 wp-content/themes/twentyfifteen/functions.php | 12 ++-
 wp-content/themes/twentyfifteen/image.php     |  6 +-
 .../twentyfifteen/inc/template-tags.php       | 78 -------------------
 wp-content/themes/twentyfifteen/index.php     |  6 +-
 wp-content/themes/twentyfifteen/search.php    |  6 +-
 wp-content/themes/twentyfifteen/single.php    |  7 +-
 wp-content/themes/twentyfifteen/style.css     | 32 ++------
 wp-includes/version.php                       |  2 +-
 9 files changed, 45 insertions(+), 110 deletions(-)

diff --git a/wp-content/themes/twentyfifteen/archive.php b/wp-content/themes/twentyfifteen/archive.php
index 20b0427c01..317c85ded5 100644
--- a/wp-content/themes/twentyfifteen/archive.php
+++ b/wp-content/themes/twentyfifteen/archive.php
@@ -100,7 +100,11 @@ get_header(); ?>
 
 			<?php endwhile; ?>
 
-			<?php twentyfifteen_paging_nav(); ?>
+			<?php
+				the_pagination( array(
+					'before_page_number' => '<span class="meta-nav">' . __( 'Page', 'twentyfifteen' ) . '</span>',
+				) );
+			?>
 
 		<?php else : ?>
 
diff --git a/wp-content/themes/twentyfifteen/functions.php b/wp-content/themes/twentyfifteen/functions.php
index 8faf299560..e29036594c 100644
--- a/wp-content/themes/twentyfifteen/functions.php
+++ b/wp-content/themes/twentyfifteen/functions.php
@@ -260,12 +260,20 @@ function twentyfifteen_post_nav_background() {
 
 	if ( $previous &&  has_post_thumbnail( $previous->ID ) ) {
 		$prevthumb = wp_get_attachment_image_src( get_post_thumbnail_id( $previous->ID ), 'post-thumbnail' );
-		$css .= '.post-navigation .nav-previous { background-image: url(' . esc_url( $prevthumb[0] ) . '); }';
+		$css .= '
+			.post-navigation .nav-previous { background-image: url(' . esc_url( $prevthumb[0] ) . '); }
+			.post-navigation .nav-previous .post-title, .post-navigation .nav-previous .meta-nav { color: #fff; }
+			.post-navigation .nav-previous a:before { background-color: rgba(0, 0, 0, 0.4); }
+		';
 	}
 
 	if ( $next && has_post_thumbnail( $next->ID ) ) {
 		$nextthumb = wp_get_attachment_image_src( get_post_thumbnail_id( $next->ID ), 'post-thumbnail' );
-		$css .= '.post-navigation .nav-next { background-image: url(' . esc_url( $nextthumb[0] ) . '); }';
+		$css .= '
+			.post-navigation .nav-next { background-image: url(' . esc_url( $nextthumb[0] ) . '); }
+			.post-navigation .nav-next .post-title, .post-navigation .nav-next .meta-nav { color: #fff; }
+			.post-navigation .nav-next a:before { background-color: rgba(0, 0, 0, 0.4); }
+		';
 	}
 
 	wp_add_inline_style( 'twentyfifteen-style', $css );
diff --git a/wp-content/themes/twentyfifteen/image.php b/wp-content/themes/twentyfifteen/image.php
index 00da574b81..a223017fd1 100644
--- a/wp-content/themes/twentyfifteen/image.php
+++ b/wp-content/themes/twentyfifteen/image.php
@@ -70,7 +70,11 @@ get_header(); ?>
 					endif;
 				?>
 
-				<?php twentyfifteen_post_nav(); ?>
+				<?php
+					the_post_navigation( array(
+						'prev_text' => _x( '<span class="meta-nav">Published in</span><span class="post-title">%title</span>', 'Parent post link', 'twentyfifteen' ),
+					) );
+				?>
 
 			<?php endwhile; // end of the loop. ?>
 
diff --git a/wp-content/themes/twentyfifteen/inc/template-tags.php b/wp-content/themes/twentyfifteen/inc/template-tags.php
index 6a78488c6a..a3a9f4cb4e 100644
--- a/wp-content/themes/twentyfifteen/inc/template-tags.php
+++ b/wp-content/themes/twentyfifteen/inc/template-tags.php
@@ -9,84 +9,6 @@
  * @since Twenty Fifteen 1.0
  */
 
-if ( ! function_exists( 'twentyfifteen_paging_nav' ) ) :
-/**
- * Display navigation to next/previous set of posts when applicable.
- *
- * @since Twenty Fifteen 1.0
- * @uses paginate_links()
- *
- * @global WP_Query $wp_query WordPress Query object.
- */
-function twentyfifteen_paging_nav() {
-	// Don't print empty markup if there's only one page.
-	if ( $GLOBALS['wp_query']->max_num_pages < 2 ) {
-		return;
-	}
-
-	// Set up paginated links.
-	$links = paginate_links( array(
-		'prev_text'          => esc_html__( 'Previous', 'twentyfifteen' ),
-		'next_text'          => esc_html__( 'Next', 'twentyfifteen' ),
-		'before_page_number' => '<span class="meta-nav">' . esc_html__( 'Page', 'twentyfifteen' ) . '</span>',
-	) );
-
-	if ( $links ) :
-	?>
-	<nav class="navigation pagination" role="navigation">
-		<h2 class="screen-reader-text"><?php esc_html_e( 'Posts navigation', 'twentyfifteen' ); ?></h2>
-		<div class="nav-links">
-			<?php echo $links; ?>
-		</div><!-- .nav-links -->
-	</nav><!-- .pagination -->
-	<?php
-	endif;
-}
-endif;
-
-if ( ! function_exists( 'twentyfifteen_post_nav' ) ) :
-/**
- * Display navigation to next/previous post when applicable.
- *
- * @since Twenty Fifteen 1.0
- */
-function twentyfifteen_post_nav() {
-	// Don't print empty markup if there's nowhere to navigate.
-	$previous = ( is_attachment() ) ? get_post( get_post()->post_parent ) : get_adjacent_post( false, '', true );
-	$next     = get_adjacent_post( false, '', false );
-
-	if ( ( ! $next && ! $previous ) || ( is_attachment() && 'attachment' == $previous->post_type ) ) {
-		return;
-	}
-
-	$prev_class = $next_class = '';
-
-	if ( $previous && has_post_thumbnail( $previous->ID ) ) {
-		$prev_class = ' has-post-thumbnail';
-	}
-
-	if ( $next && has_post_thumbnail( $next->ID ) ) {
-		$next_class = ' has-post-thumbnail';
-	}
-
-	?>
-	<nav class="navigation post-navigation" role="navigation">
-		<h2 class="screen-reader-text"><?php esc_html_e( 'Post navigation', 'twentyfifteen' ); ?></h2>
-		<div class="nav-links">
-			<?php
-			if ( is_attachment() ) :
-				previous_post_link( '<div class="nav-previous' . $prev_class . '">%link</div>', _x( '<span class="meta-nav">Published In</span><span class="post-title">%title</span>', 'Parent post link', 'twentyfifteen' ) );
-			else :
-				previous_post_link( '<div class="nav-previous' . $prev_class . '">%link</div>', _x( '<span class="meta-nav">Previous</span><span class="post-title">%title</span>', 'Previous post link', 'twentyfifteen' ) );
-				next_post_link( '<div class="nav-next' . $next_class . '">%link</div>', _x( '<span class="meta-nav">Next</span><span class="post-title">%title</span>', 'Next post link', 'twentyfifteen' ) );
-			endif;
-			?>
-		</div><!-- .nav-links -->
-	</nav><!-- .post-navigation -->
-	<?php
-}
-endif;
-
 if ( ! function_exists( 'twentyfifteen_comment_nav' ) ) :
 /**
  * Display navigation to next/previous comments when applicable.
diff --git a/wp-content/themes/twentyfifteen/index.php b/wp-content/themes/twentyfifteen/index.php
index 9187c09788..faee1f3530 100644
--- a/wp-content/themes/twentyfifteen/index.php
+++ b/wp-content/themes/twentyfifteen/index.php
@@ -40,7 +40,11 @@ get_header(); ?>
 
 			<?php endwhile; ?>
 
-			<?php twentyfifteen_paging_nav(); ?>
+			<?php
+				the_pagination( array(
+					'before_page_number' => '<span class="meta-nav">' . __( 'Page', 'twentyfifteen' ) . '</span>',
+				) );
+			?>
 
 		<?php else : ?>
 
diff --git a/wp-content/themes/twentyfifteen/search.php b/wp-content/themes/twentyfifteen/search.php
index a5974b2775..0700594208 100644
--- a/wp-content/themes/twentyfifteen/search.php
+++ b/wp-content/themes/twentyfifteen/search.php
@@ -32,7 +32,11 @@ get_header(); ?>
 
 			<?php endwhile; ?>
 
-			<?php twentyfifteen_paging_nav(); ?>
+			<?php
+				the_pagination( array(
+					'before_page_number' => '<span class="meta-nav">' . __( 'Page', 'twentyfifteen' ) . '</span>',
+				) );
+			?>
 
 		<?php else : ?>
 
diff --git a/wp-content/themes/twentyfifteen/single.php b/wp-content/themes/twentyfifteen/single.php
index ccfb010678..a4ff29383e 100644
--- a/wp-content/themes/twentyfifteen/single.php
+++ b/wp-content/themes/twentyfifteen/single.php
@@ -23,7 +23,12 @@ get_header(); ?>
 				endif;
 			?>
 
-			<?php twentyfifteen_post_nav(); ?>
+			<?php
+				the_post_navigation( array(
+					'next_text' => _x( '<span class="meta-nav">Previous</span><span class="post-title">%title</span>', 'Previous post link', 'twentyfifteen' ),
+					'prev_text' => _x( '<span class="meta-nav">Next</span><span class="post-title">%title</span>', 'Next post link', 'twentyfifteen' ),
+				) );
+			?>
 
 		<?php endwhile; // end of the loop. ?>
 
diff --git a/wp-content/themes/twentyfifteen/style.css b/wp-content/themes/twentyfifteen/style.css
index 5b5347665d..747c1fd741 100644
--- a/wp-content/themes/twentyfifteen/style.css
+++ b/wp-content/themes/twentyfifteen/style.css
@@ -981,20 +981,14 @@ a:focus {
 	z-index: 2;
 }
 
-.post-navigation a:hover .post-title,
-.post-navigation a:focus .post-title {
-	color: #707070;
-	color: rgba(51, 51, 51, 0.7);
-}
-
-.post-navigation .has-post-thumbnail {
+.post-navigation .nav-next,
+.post-navigation .nav-previous {
 	background-position: center;
 	background-size: cover;
 	position: relative;
 }
 
-.post-navigation .has-post-thumbnail a:before {
-	background-color: rgba(0, 0, 0, 0.4);
+.post-navigation a:before {
 	content: "";
 	display: block;
 	height: 100%;
@@ -1005,26 +999,16 @@ a:focus {
 	z-index: 1;
 }
 
-.post-navigation .has-post-thumbnail a:hover:before,
-.post-navigation .has-post-thumbnail a:focus:before {
-	background-color: rgba(0, 0, 0, 0.2);
+.post-navigation a:hover:before,
+.post-navigation a:focus:before {
+	opacity: 0.5;
 }
 
-.post-navigation .has-post-thumbnail a:hover .post-title,
-.post-navigation .has-post-thumbnail a:focus .post-title {
-	color: #fff;
-}
-
-.post-navigation .has-post-thumbnail .post-title,
-.post-navigation .has-post-thumbnail .meta-nav {
-	color: #fff;
-}
-
-.post-navigation .has-post-thumbnail .meta-nav {
+.post-navigation .meta-nav {
 	opacity: 0.8;
 }
 
-.post-navigation .nav-previous:not(.has-post-thumbnail) + .nav-next:not(.has-post-thumbnail) {
+.post-navigation .nav-previous + .nav-next {
 	border-top: 1px solid #eaeaea;
 	border-top: 1px solid rgba(51, 51, 51, 0.1);
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 54f30e59e3..0869710ccb 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-alpha-30215';
+$wp_version = '4.1-alpha-30216';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.