Changeset 21642

Timestamp:

08/28/2012 05:12:10 PM (14 years ago)

Author:

lancewillett

Message:

Twenty Twelve: rename custom page templates and place in sub-directory. Closes #21715.

Location:

trunk/wp-content/themes/twentytwelve

Files:

• functions.php (modified) (2 diffs)
• page-templates (added)
• page-templates/full-width.php (moved) (moved from trunk/wp-content/themes/twentytwelve/full-width-page.php) (1 diff)
• page-templates/home.php (moved) (moved from trunk/wp-content/themes/twentytwelve/homepage.php) (1 diff)
• rtl.css (modified) (3 diffs)
• style.css (modified) (8 diffs)

trunk/wp-content/themes/twentytwelve/functions.php

@@ -363 +363 @@
     $background_color = get_background_color();
 
-    if ( ! is_active_sidebar( 1 ) || is_page_template( 'full-width-page.php' ) )
+    if ( ! is_active_sidebar( 1 ) || is_page_template( 'page-templates/full-width.php' ) )
         $classes[] = 'full-width';
 
-    if ( is_page_template( 'homepage.php' ) && has_post_thumbnail() )
-        $classes[] = 'has-post-thumbnail';
+    if ( is_page_template( 'page-templates/home.php' ) ) {
+        $classes[] = 'template-home';
+        if ( has_post_thumbnail() )
+            $classes[] = 'has-post-thumbnail';
+    }
 
     if ( empty( $background_color ) )
@@ -385 +388 @@
  */
 function twentytwelve_content_width() {
-    if ( is_page_template( 'full-width-page.php' ) || is_attachment() || ! is_active_sidebar( 1 ) ) {
+    if ( is_page_template( 'page-templates/full-width.php' ) || is_attachment() || ! is_active_sidebar( 1 ) ) {
         global $content_width;
         $content_width = 960;

trunk/wp-content/themes/twentytwelve/page-templates/full-width.php

@@ -1 +1 @@
 <?php
 /**
- * Template Name: Full-width page, no sidebar
+ * Template Name: Full-width Page Template, No Sidebar
+ *
+ * @todo Better documentation here.
  *
  * @package WordPress

trunk/wp-content/themes/twentytwelve/page-templates/home.php

@@ -1 +1 @@
 <?php
 /**
- * Template Name: Homepage
+ * Template Name: Homepage Template
+ *
+ * @todo Better documentation here.
  *
  * @package WordPress

trunk/wp-content/themes/twentytwelve/rtl.css

@@ -140 +140 @@
 -------------------------------------------------------------- */
 
-.page-template-homepage-php .widget-area .widget_text img {
+.template-home .widget-area .widget_text img {
     float: right;
     margin: 8px 0 8px 24px;
@@ -179 +179 @@
 @media screen and (min-width: 600px) {
     .site-content,
-    .page-template-homepage-php.has-post-thumbnail article {
+    .template-home.has-post-thumbnail article {
         float: right;
     }
@@ -194 +194 @@
         text-align: right;
     }
-    .page-template-homepage-php .widget-area .widget_text img {
+    .template-home .widget-area .widget_text img {
         float: right;
         margin: 8px 0 8px 24px;
     }
-    .page-template-homepage-php .widget-area .widget,
-    .page-template-homepage-php .widget-area.two .home-widgets {
+    .template-home .widget-area .widget,
+    .template-home .widget-area.two .home-widgets {
         float: right;
     }
-    .page-template-homepage-php .widget-area .widget:nth-child(odd) {
+    .template-home .widget-area .widget:nth-child(odd) {
         clear: left;
     }
-    .page-template-homepage-php .widget-area .widget:nth-child(even),
-    .page-template-homepage-php .widget-area.two .home-widgets + .home-widgets {
+    .template-home .widget-area .widget:nth-child(even),
+    .template-home .widget-area.two .home-widgets + .home-widgets {
         float: left;
         margin: 0 24px 0;

trunk/wp-content/themes/twentytwelve/style.css

@@ -1200 +1200 @@
     margin-bottom: 1rem;
 }
-.page-template-homepage-php .site-content article {
+.template-home .site-content article {
     border: 0;
     margin-bottom: 0;
 }
-.page-template-homepage-php .widget-area {
+.template-home .widget-area {
     clear: both;
     float: none;
@@ -1212 +1212 @@
     border-top: 1px solid #ededed;
 }
-.page-template-homepage-php .widget-area .widget li {
+.template-home .widget-area .widget li {
     margin: 8px 0 0;
     margin: 0.571428571rem 0 0;
@@ -1221 +1221 @@
     list-style-position: inside;
 }
-.page-template-homepage-php .widget-area .widget li a {
+.template-home .widget-area .widget li a {
     color: #777;
 }
-.page-template-homepage-php .widget-area .widget li a:hover {
+.template-home .widget-area .widget li a:hover {
     color: #21759b;
 }
-.page-template-homepage-php .widget-area .widget_text img {
+.template-home .widget-area .widget_text img {
     float: left;
     margin: 8px 24px 8px 0;
@@ -1325 +1325 @@
         width: 65.104166667%;
     }
-    body.page-template-full-width-page-php .site-content,
-    body.page-template-homepage-php .site-content,
+    body.template-home .site-content,
     body.single-attachment .site-content,
     body.full-width .site-content {
@@ -1429 +1428 @@
         width: 79.666666667%;
     }
-    .page-template-homepage-php .site-content,
-    .page-template-homepage-php article {
+    .template-home .site-content,
+    .template-home article {
         overflow: hidden;
     }
-    .page-template-homepage-php.has-post-thumbnail article {
+    .template-home.has-post-thumbnail article {
         float: left;
         width: 47.916666667%;
@@ -1442 +1441 @@
         width: 47.916666667%;
     }
-    .page-template-homepage-php .widget-area .widget,
-    .page-template-homepage-php .widget-area.two .home-widgets {
+    .template-home .widget-area .widget,
+    .template-home .widget-area.two .home-widgets {
         float: left;
         width: 51.875%;
@@ -1449 +1448 @@
         margin-bottom: 1.714285714rem;
     }
-    .page-template-homepage-php .widget-area .widget:nth-child(odd) {
+    .template-home .widget-area .widget:nth-child(odd) {
         clear: right;
     }
-    .page-template-homepage-php .widget-area .widget:nth-child(even),
-    .page-template-homepage-php .widget-area.two .home-widgets + .home-widgets {
+    .template-home .widget-area .widget:nth-child(even),
+    .template-home .widget-area.two .home-widgets + .home-widgets {
         float: right;
         width: 39.0625%;
@@ -1459 +1458 @@
         margin: 0 0 1.714285714rem;
     }
-    .page-template-homepage-php .widget-area.two .widget,
-    .page-template-homepage-php .widget-area.two .widget:nth-child(even) {
+    .template-home .widget-area.two .widget,
+    .template-home .widget-area.two .widget:nth-child(even) {
         float: none;
         width: auto;