Twenty Fourteen: move page templates into their own directory. See #25929.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26020 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-content/themes/twentyfourteen/functions.php

@@ -391,8 +391,8 @@ function twentyfourteen_body_classes( $classes ) {
 		$classes[] = 'list-view';
 
 	if ( ( ! is_active_sidebar( 'sidebar-2' ) )
-		|| is_page_template( 'full-width-page.php' )
-		|| is_page_template( 'contributor-page.php' )
+		|| is_page_template( 'page-templates/full-width.php' )
+		|| is_page_template( 'page-templates/contributors.php' )
 		|| is_attachment() )
 		$classes[] = 'full-width';
 

wp-content/themes/twentyfourteen/inc/template-tags.php

@@ -173,7 +173,7 @@ function twentyfourteen_post_thumbnail() {
 
 	<div class="post-thumbnail">
 	<?php
-		if ( ( ! is_active_sidebar( 'sidebar-2' ) || is_page_template( 'full-width-page.php' ) ) && ! wp_is_mobile() )
+		if ( ( ! is_active_sidebar( 'sidebar-2' ) || is_page_template( 'page-templates/full-width.php' ) ) && ! wp_is_mobile() )
 			the_post_thumbnail( 'post-thumbnail-full-width' );
 		else
 			the_post_thumbnail( 'post-thumbnail' );
@@ -184,7 +184,7 @@ function twentyfourteen_post_thumbnail() {
 
 	<a class="post-thumbnail" href="<?php the_permalink(); ?>" rel="<?php the_ID(); ?>">
 	<?php
-		if ( ( ! is_active_sidebar( 'sidebar-2' ) || is_page_template( 'full-width-page.php' ) ) && ! wp_is_mobile() )
+		if ( ( ! is_active_sidebar( 'sidebar-2' ) || is_page_template( 'page-templates/full-width.php' ) ) && ! wp_is_mobile() )
 			the_post_thumbnail( 'post-thumbnail-full-width' );
 		else
 			the_post_thumbnail( 'post-thumbnail' );