<!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>[21642] trunk/wp-content/themes/twentytwelve: Twenty Twelve: rename custom page templates and place in sub-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, #logmsg > ol { margin-left: 0; 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/21642">21642</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2012-08-28 17:12:10 +0000 (Tue, 28 Aug 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Twelve: rename custom page templates and place in sub-directory. Closes <a href="http://core.trac.wordpress.org/ticket/21715">#21715</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytwelvefunctionsphp">trunk/wp-content/themes/twentytwelve/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvertlcss">trunk/wp-content/themes/twentytwelve/rtl.css</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvestylecss">trunk/wp-content/themes/twentytwelve/style.css</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/wp-content/themes/twentytwelve/page-templates/</li>
<li><a href="#trunkwpcontentthemestwentytwelvepagetemplatesfullwidthphp">trunk/wp-content/themes/twentytwelve/page-templates/full-width.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvepagetemplateshomephp">trunk/wp-content/themes/twentytwelve/page-templates/home.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytwelvefullwidthpagephp">trunk/wp-content/themes/twentytwelve/full-width-page.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvehomepagephp">trunk/wp-content/themes/twentytwelve/homepage.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytwelvefullwidthpagephp"></a>
<div class="delfile"><h4>Deleted: trunk/wp-content/themes/twentytwelve/full-width-page.php (21641 => 21642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/full-width-page.php 2012-08-28 05:48:58 UTC (rev 21641)
+++ trunk/wp-content/themes/twentytwelve/full-width-page.php 2012-08-28 17:12:10 UTC (rev 21642)
</span><span class="lines">@@ -1,23 +0,0 @@
</span><del>-<?php
-/**
- * Template Name: Full-width page, no sidebar
- *
- * @package WordPress
- * @subpackage Twenty_Twelve
- * @since Twenty Twelve 1.0
- */
-
-get_header(); ?>
-
- <div id="primary" class="site-content">
- <div id="content" role="main">
-
- <?php while ( have_posts() ) : the_post(); ?>
- <?php get_template_part( 'content', 'page' ); ?>
- <?php comments_template( '', true ); ?>
- <?php endwhile; // end of the loop. ?>
-
- </div><!-- #content -->
- </div><!-- #primary -->
-
-<?php get_footer(); ?>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/functions.php (21641 => 21642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/functions.php 2012-08-28 05:48:58 UTC (rev 21641)
+++ trunk/wp-content/themes/twentytwelve/functions.php 2012-08-28 17:12:10 UTC (rev 21642)
</span><span class="lines">@@ -362,11 +362,14 @@
</span><span class="cx"> function twentytwelve_body_class( $classes ) {
</span><span class="cx"> $background_color = get_background_color();
</span><span class="cx">
</span><del>- if ( ! is_active_sidebar( 1 ) || is_page_template( 'full-width-page.php' ) )
</del><ins>+ if ( ! is_active_sidebar( 1 ) || is_page_template( 'page-templates/full-width.php' ) )
</ins><span class="cx"> $classes[] = 'full-width';
</span><span class="cx">
</span><del>- if ( is_page_template( 'homepage.php' ) && has_post_thumbnail() )
- $classes[] = 'has-post-thumbnail';
</del><ins>+ if ( is_page_template( 'page-templates/home.php' ) ) {
+ $classes[] = 'template-home';
+ if ( has_post_thumbnail() )
+ $classes[] = 'has-post-thumbnail';
+ }
</ins><span class="cx">
</span><span class="cx"> if ( empty( $background_color ) )
</span><span class="cx"> $classes[] = 'custom-background-empty';
</span><span class="lines">@@ -384,7 +387,7 @@
</span><span class="cx"> * @since Twenty Twelve 1.0
</span><span class="cx"> */
</span><span class="cx"> function twentytwelve_content_width() {
</span><del>- if ( is_page_template( 'full-width-page.php' ) || is_attachment() || ! is_active_sidebar( 1 ) ) {
</del><ins>+ if ( is_page_template( 'page-templates/full-width.php' ) || is_attachment() || ! is_active_sidebar( 1 ) ) {
</ins><span class="cx"> global $content_width;
</span><span class="cx"> $content_width = 960;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvehomepagephp"></a>
<div class="delfile"><h4>Deleted: trunk/wp-content/themes/twentytwelve/homepage.php (21641 => 21642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/homepage.php 2012-08-28 05:48:58 UTC (rev 21641)
+++ trunk/wp-content/themes/twentytwelve/homepage.php 2012-08-28 17:12:10 UTC (rev 21642)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>-<?php
-/**
- * Template Name: Homepage
- *
- * @package WordPress
- * @subpackage Twenty_Twelve
- * @since Twenty Twelve 1.0
- */
-
-get_header(); ?>
-
- <div id="primary" class="site-content">
- <div id="content" role="main">
-
- <?php while ( have_posts() ) : the_post(); ?>
- <?php if ( has_post_thumbnail() ) : ?>
- <div class="entry-page-image">
- <?php the_post_thumbnail(); ?>
- </div><!-- .entry-page-image -->
- <?php endif; ?>
-
- <?php get_template_part( 'content', 'page' ); ?>
-
- <?php endwhile; // end of the loop. ?>
-
- </div><!-- #content -->
- </div><!-- #primary -->
-
-<?php get_sidebar( 'home' ); ?>
-<?php get_footer(); ?>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvepagetemplatesfullwidthphpfromrev21641trunkwpcontentthemestwentytwelvefullwidthpagephp"></a>
<div class="copfile"><h4>Copied: trunk/wp-content/themes/twentytwelve/page-templates/full-width.php (from rev 21641, trunk/wp-content/themes/twentytwelve/full-width-page.php) (0 => 21642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/page-templates/full-width.php (rev 0)
+++ trunk/wp-content/themes/twentytwelve/page-templates/full-width.php 2012-08-28 17:12:10 UTC (rev 21642)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<?php
+/**
+ * Template Name: Full-width Page Template, No Sidebar
+ *
+ * @todo Better documentation here.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Twelve
+ * @since Twenty Twelve 1.0
+ */
+
+get_header(); ?>
+
+ <div id="primary" class="site-content">
+ <div id="content" role="main">
+
+ <?php while ( have_posts() ) : the_post(); ?>
+ <?php get_template_part( 'content', 'page' ); ?>
+ <?php comments_template( '', true ); ?>
+ <?php endwhile; // end of the loop. ?>
+
+ </div><!-- #content -->
+ </div><!-- #primary -->
+
+<?php get_footer(); ?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvepagetemplateshomephpfromrev21641trunkwpcontentthemestwentytwelvehomepagephp"></a>
<div class="copfile"><h4>Copied: trunk/wp-content/themes/twentytwelve/page-templates/home.php (from rev 21641, trunk/wp-content/themes/twentytwelve/homepage.php) (0 => 21642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/page-templates/home.php (rev 0)
+++ trunk/wp-content/themes/twentytwelve/page-templates/home.php 2012-08-28 17:12:10 UTC (rev 21642)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<?php
+/**
+ * Template Name: Homepage Template
+ *
+ * @todo Better documentation here.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Twelve
+ * @since Twenty Twelve 1.0
+ */
+
+get_header(); ?>
+
+ <div id="primary" class="site-content">
+ <div id="content" role="main">
+
+ <?php while ( have_posts() ) : the_post(); ?>
+ <?php if ( has_post_thumbnail() ) : ?>
+ <div class="entry-page-image">
+ <?php the_post_thumbnail(); ?>
+ </div><!-- .entry-page-image -->
+ <?php endif; ?>
+
+ <?php get_template_part( 'content', 'page' ); ?>
+
+ <?php endwhile; // end of the loop. ?>
+
+ </div><!-- #content -->
+ </div><!-- #primary -->
+
+<?php get_sidebar( 'home' ); ?>
+<?php get_footer(); ?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvertlcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/rtl.css (21641 => 21642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/rtl.css 2012-08-28 05:48:58 UTC (rev 21641)
+++ trunk/wp-content/themes/twentytwelve/rtl.css 2012-08-28 17:12:10 UTC (rev 21642)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> /* =Home page template styling
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><del>-.page-template-homepage-php .widget-area .widget_text img {
</del><ins>+.template-home .widget-area .widget_text img {
</ins><span class="cx"> float: right;
</span><span class="cx"> margin: 8px 0 8px 24px;
</span><span class="cx"> margin: 0.571428571rem 0 0.571428571rem 1.714285714rem;
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> /* Minimum width of 600 pixels. */
</span><span class="cx"> @media screen and (min-width: 600px) {
</span><span class="cx"> .site-content,
</span><del>- .page-template-homepage-php.has-post-thumbnail article {
</del><ins>+ .template-home.has-post-thumbnail article {
</ins><span class="cx"> float: right;
</span><span class="cx"> }
</span><span class="cx"> .widget-area,
</span><span class="lines">@@ -193,19 +193,19 @@
</span><span class="cx"> .entry-summary p {
</span><span class="cx"> text-align: right;
</span><span class="cx"> }
</span><del>- .page-template-homepage-php .widget-area .widget_text img {
</del><ins>+ .template-home .widget-area .widget_text img {
</ins><span class="cx"> float: right;
</span><span class="cx"> margin: 8px 0 8px 24px;
</span><span class="cx"> }
</span><del>- .page-template-homepage-php .widget-area .widget,
- .page-template-homepage-php .widget-area.two .home-widgets {
</del><ins>+ .template-home .widget-area .widget,
+ .template-home .widget-area.two .home-widgets {
</ins><span class="cx"> float: right;
</span><span class="cx"> }
</span><del>- .page-template-homepage-php .widget-area .widget:nth-child(odd) {
</del><ins>+ .template-home .widget-area .widget:nth-child(odd) {
</ins><span class="cx"> clear: left;
</span><span class="cx"> }
</span><del>- .page-template-homepage-php .widget-area .widget:nth-child(even),
- .page-template-homepage-php .widget-area.two .home-widgets + .home-widgets {
</del><ins>+ .template-home .widget-area .widget:nth-child(even),
+ .template-home .widget-area.two .home-widgets + .home-widgets {
</ins><span class="cx"> float: left;
</span><span class="cx"> margin: 0 24px 0;
</span><span class="cx"> margin: 0 1.714285714rem 0;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvestylecss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/style.css (21641 => 21642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/style.css 2012-08-28 05:48:58 UTC (rev 21641)
+++ trunk/wp-content/themes/twentytwelve/style.css 2012-08-28 17:12:10 UTC (rev 21642)
</span><span class="lines">@@ -1199,11 +1199,11 @@
</span><span class="cx"> margin-bottom: 14px;
</span><span class="cx"> margin-bottom: 1rem;
</span><span class="cx"> }
</span><del>-.page-template-homepage-php .site-content article {
</del><ins>+.template-home .site-content article {
</ins><span class="cx"> border: 0;
</span><span class="cx"> margin-bottom: 0;
</span><span class="cx"> }
</span><del>-.page-template-homepage-php .widget-area {
</del><ins>+.template-home .widget-area {
</ins><span class="cx"> clear: both;
</span><span class="cx"> float: none;
</span><span class="cx"> width: auto;
</span><span class="lines">@@ -1211,7 +1211,7 @@
</span><span class="cx"> padding-top: 1.714285714rem;
</span><span class="cx"> border-top: 1px solid #ededed;
</span><span class="cx"> }
</span><del>-.page-template-homepage-php .widget-area .widget li {
</del><ins>+.template-home .widget-area .widget li {
</ins><span class="cx"> margin: 8px 0 0;
</span><span class="cx"> margin: 0.571428571rem 0 0;
</span><span class="cx"> font-size: 13px;
</span><span class="lines">@@ -1220,13 +1220,13 @@
</span><span class="cx"> list-style-type: square;
</span><span class="cx"> list-style-position: inside;
</span><span class="cx"> }
</span><del>-.page-template-homepage-php .widget-area .widget li a {
</del><ins>+.template-home .widget-area .widget li a {
</ins><span class="cx"> color: #777;
</span><span class="cx"> }
</span><del>-.page-template-homepage-php .widget-area .widget li a:hover {
</del><ins>+.template-home .widget-area .widget li a:hover {
</ins><span class="cx"> color: #21759b;
</span><span class="cx"> }
</span><del>-.page-template-homepage-php .widget-area .widget_text img {
</del><ins>+.template-home .widget-area .widget_text img {
</ins><span class="cx"> float: left;
</span><span class="cx"> margin: 8px 24px 8px 0;
</span><span class="cx"> margin: 0.571428571rem 1.714285714rem 0.571428571rem 0;
</span><span class="lines">@@ -1324,8 +1324,7 @@
</span><span class="cx"> float: left;
</span><span class="cx"> width: 65.104166667%;
</span><span class="cx"> }
</span><del>- body.page-template-full-width-page-php .site-content,
- body.page-template-homepage-php .site-content,
</del><ins>+ body.template-home .site-content,
</ins><span class="cx"> body.single-attachment .site-content,
</span><span class="cx"> body.full-width .site-content {
</span><span class="cx"> width: 100%;
</span><span class="lines">@@ -1428,11 +1427,11 @@
</span><span class="cx"> #respond form textarea.blog-textarea {
</span><span class="cx"> width: 79.666666667%;
</span><span class="cx"> }
</span><del>- .page-template-homepage-php .site-content,
- .page-template-homepage-php article {
</del><ins>+ .template-home .site-content,
+ .template-home article {
</ins><span class="cx"> overflow: hidden;
</span><span class="cx"> }
</span><del>- .page-template-homepage-php.has-post-thumbnail article {
</del><ins>+ .template-home.has-post-thumbnail article {
</ins><span class="cx"> float: left;
</span><span class="cx"> width: 47.916666667%;
</span><span class="cx"> }
</span><span class="lines">@@ -1441,25 +1440,25 @@
</span><span class="cx"> margin-bottom: 0;
</span><span class="cx"> width: 47.916666667%;
</span><span class="cx"> }
</span><del>- .page-template-homepage-php .widget-area .widget,
- .page-template-homepage-php .widget-area.two .home-widgets {
</del><ins>+ .template-home .widget-area .widget,
+ .template-home .widget-area.two .home-widgets {
</ins><span class="cx"> float: left;
</span><span class="cx"> width: 51.875%;
</span><span class="cx"> margin-bottom: 24px;
</span><span class="cx"> margin-bottom: 1.714285714rem;
</span><span class="cx"> }
</span><del>- .page-template-homepage-php .widget-area .widget:nth-child(odd) {
</del><ins>+ .template-home .widget-area .widget:nth-child(odd) {
</ins><span class="cx"> clear: right;
</span><span class="cx"> }
</span><del>- .page-template-homepage-php .widget-area .widget:nth-child(even),
- .page-template-homepage-php .widget-area.two .home-widgets + .home-widgets {
</del><ins>+ .template-home .widget-area .widget:nth-child(even),
+ .template-home .widget-area.two .home-widgets + .home-widgets {
</ins><span class="cx"> float: right;
</span><span class="cx"> width: 39.0625%;
</span><span class="cx"> margin: 0 0 24px;
</span><span class="cx"> margin: 0 0 1.714285714rem;
</span><span class="cx"> }
</span><del>- .page-template-homepage-php .widget-area.two .widget,
- .page-template-homepage-php .widget-area.two .widget:nth-child(even) {
</del><ins>+ .template-home .widget-area.two .widget,
+ .template-home .widget-area.two .widget:nth-child(even) {
</ins><span class="cx"> float: none;
</span><span class="cx"> width: auto;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>