<!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>[26105] trunk/src/wp-content/themes/twentyfourteen: Twenty Fourteen: move page templates into their own directory.</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/26105">26105</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-11-12 19:02:09 +0000 (Tue, 12 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Fourteen: move page templates into their own directory. See <a href="http://core.trac.wordpress.org/ticket/25929">#25929</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfourteenfunctionsphp">trunk/src/wp-content/themes/twentyfourteen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteeninctemplatetagsphp">trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/src/wp-content/themes/twentyfourteen/page-templates/</li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenpagetemplatescontributorsphp">trunk/src/wp-content/themes/twentyfourteen/page-templates/contributors.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenpagetemplatesfullwidthphp">trunk/src/wp-content/themes/twentyfourteen/page-templates/full-width.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontributorpagephp">trunk/src/wp-content/themes/twentyfourteen/contributor-page.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenfullwidthpagephp">trunk/src/wp-content/themes/twentyfourteen/full-width-page.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyfourteencontributorpagephp"></a>
<div class="delfile"><h4>Deleted: trunk/src/wp-content/themes/twentyfourteen/contributor-page.php (26104 => 26105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/contributor-page.php 2013-11-12 18:56:18 UTC (rev 26104)
+++ trunk/src/wp-content/themes/twentyfourteen/contributor-page.php 2013-11-12 19:02:09 UTC (rev 26105)
</span><span class="lines">@@ -1,48 +0,0 @@
</span><del>-<?php
-/**
- * Template Name: Contributor Page
- *
- * @package WordPress
- * @subpackage Twenty_Fourteen
- * @since Twenty Fourteen 1.0
- */
-
-get_header(); ?>
-
-<div id="main-content" class="main-content">
-
-<?php
- if ( is_front_page() && twentyfourteen_has_featured_posts() )
- get_template_part( 'featured-content' );
-?>
-
- <div id="primary" class="content-area">
- <div id="content" class="site-content" role="main">
- <?php
- while ( have_posts() ) :
- the_post();
- ?>
-
- <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
- <?php
- the_title( '<header class="entry-header"><h1 class="entry-title">', '</h1></header><!-- .entry-header -->' );
-
- twentyfourteen_list_authors();
-
- edit_post_link( __( 'Edit', 'twentyfourteen' ), '<footer class="entry-meta"><span class="edit-link">', '</span></footer>' );
- ?>
- </article><!-- #post-## -->
-
- <?php
- // 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 -->
-</div><!-- #main-content -->
-
-<?php
-get_sidebar();
-get_footer();
</del></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenfullwidthpagephp"></a>
<div class="delfile"><h4>Deleted: trunk/src/wp-content/themes/twentyfourteen/full-width-page.php (26104 => 26105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/full-width-page.php 2013-11-12 18:56:18 UTC (rev 26104)
+++ trunk/src/wp-content/themes/twentyfourteen/full-width-page.php 2013-11-12 19:02:09 UTC (rev 26105)
</span><span class="lines">@@ -1,38 +0,0 @@
</span><del>-<?php
-/**
- * Template Name: Full Width Page
- *
- * @package WordPress
- * @subpackage Twenty_Fourteen
- * @since Twenty Fourteen 1.0
- */
-
-get_header(); ?>
-
-<div id="main-content" class="main-content">
-
-<?php
- if ( is_front_page() && twentyfourteen_has_featured_posts() )
- get_template_part( 'featured-content' );
-?>
-
- <div id="primary" class="content-area">
- <div id="content" class="site-content" role="main">
- <?php
- while ( have_posts() ) :
- the_post();
-
- get_template_part( 'content', 'page' );
-
- // 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 -->
-</div><!-- #main-content -->
-
-<?php
-get_sidebar();
-get_footer();
</del></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/functions.php (26104 => 26105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/functions.php 2013-11-12 18:56:18 UTC (rev 26104)
+++ trunk/src/wp-content/themes/twentyfourteen/functions.php 2013-11-12 19:02:09 UTC (rev 26105)
</span><span class="lines">@@ -391,8 +391,8 @@
</span><span class="cx"> $classes[] = 'list-view';
</span><span class="cx">
</span><span class="cx"> if ( ( ! is_active_sidebar( 'sidebar-2' ) )
</span><del>- || is_page_template( 'full-width-page.php' )
- || is_page_template( 'contributor-page.php' )
</del><ins>+ || is_page_template( 'page-templates/full-width.php' )
+ || is_page_template( 'page-templates/contributors.php' )
</ins><span class="cx"> || is_attachment() )
</span><span class="cx"> $classes[] = 'full-width';
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteeninctemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php (26104 => 26105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php 2013-11-12 18:56:18 UTC (rev 26104)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php 2013-11-12 19:02:09 UTC (rev 26105)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="post-thumbnail">
</span><span class="cx"> <?php
</span><del>- if ( ( ! is_active_sidebar( 'sidebar-2' ) || is_page_template( 'full-width-page.php' ) ) && ! wp_is_mobile() )
</del><ins>+ if ( ( ! is_active_sidebar( 'sidebar-2' ) || is_page_template( 'page-templates/full-width.php' ) ) && ! wp_is_mobile() )
</ins><span class="cx"> the_post_thumbnail( 'post-thumbnail-full-width' );
</span><span class="cx"> else
</span><span class="cx"> the_post_thumbnail( 'post-thumbnail' );
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx">
</span><span class="cx"> <a class="post-thumbnail" href="<?php the_permalink(); ?>" rel="<?php the_ID(); ?>">
</span><span class="cx"> <?php
</span><del>- if ( ( ! is_active_sidebar( 'sidebar-2' ) || is_page_template( 'full-width-page.php' ) ) && ! wp_is_mobile() )
</del><ins>+ if ( ( ! is_active_sidebar( 'sidebar-2' ) || is_page_template( 'page-templates/full-width.php' ) ) && ! wp_is_mobile() )
</ins><span class="cx"> the_post_thumbnail( 'post-thumbnail-full-width' );
</span><span class="cx"> else
</span><span class="cx"> the_post_thumbnail( 'post-thumbnail' );
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenpagetemplatescontributorsphpfromrev26102trunksrcwpcontentthemestwentyfourteencontributorpagephp"></a>
<div class="copfile"><h4>Copied: trunk/src/wp-content/themes/twentyfourteen/page-templates/contributors.php (from rev 26102, trunk/src/wp-content/themes/twentyfourteen/contributor-page.php) (0 => 26105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/page-templates/contributors.php (rev 0)
+++ trunk/src/wp-content/themes/twentyfourteen/page-templates/contributors.php 2013-11-12 19:02:09 UTC (rev 26105)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+<?php
+/**
+ * Template Name: Contributor Page
+ *
+ * @package WordPress
+ * @subpackage Twenty_Fourteen
+ * @since Twenty Fourteen 1.0
+ */
+
+get_header(); ?>
+
+<div id="main-content" class="main-content">
+
+<?php
+ if ( is_front_page() && twentyfourteen_has_featured_posts() )
+ get_template_part( 'featured-content' );
+?>
+
+ <div id="primary" class="content-area">
+ <div id="content" class="site-content" role="main">
+ <?php
+ while ( have_posts() ) :
+ the_post();
+ ?>
+
+ <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <?php
+ the_title( '<header class="entry-header"><h1 class="entry-title">', '</h1></header><!-- .entry-header -->' );
+
+ twentyfourteen_list_authors();
+
+ edit_post_link( __( 'Edit', 'twentyfourteen' ), '<footer class="entry-meta"><span class="edit-link">', '</span></footer>' );
+ ?>
+ </article><!-- #post-## -->
+
+ <?php
+ // 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 -->
+</div><!-- #main-content -->
+
+<?php
+get_sidebar();
+get_footer();
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenpagetemplatesfullwidthphpfromrev26102trunksrcwpcontentthemestwentyfourteenfullwidthpagephp"></a>
<div class="copfile"><h4>Copied: trunk/src/wp-content/themes/twentyfourteen/page-templates/full-width.php (from rev 26102, trunk/src/wp-content/themes/twentyfourteen/full-width-page.php) (0 => 26105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/page-templates/full-width.php (rev 0)
+++ trunk/src/wp-content/themes/twentyfourteen/page-templates/full-width.php 2013-11-12 19:02:09 UTC (rev 26105)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<?php
+/**
+ * Template Name: Full Width Page
+ *
+ * @package WordPress
+ * @subpackage Twenty_Fourteen
+ * @since Twenty Fourteen 1.0
+ */
+
+get_header(); ?>
+
+<div id="main-content" class="main-content">
+
+<?php
+ if ( is_front_page() && twentyfourteen_has_featured_posts() )
+ get_template_part( 'featured-content' );
+?>
+
+ <div id="primary" class="content-area">
+ <div id="content" class="site-content" role="main">
+ <?php
+ while ( have_posts() ) :
+ the_post();
+
+ get_template_part( 'content', 'page' );
+
+ // 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 -->
+</div><!-- #main-content -->
+
+<?php
+get_sidebar();
+get_footer();
</ins></span></pre>
</div>
</div>
</body>
</html>