Changeset 21886

Timestamp:

09/18/2012 05:28:36 PM (12 years ago)

Author:

lancewillett

Message:

Twenty Twelve: rename homepage template to front-page; including s/home/front-page/ in many places -- see notes in ticket. See #21909.

Location:

trunk/wp-content/themes/twentytwelve

Files:

• functions.php (modified) (7 diffs)
• page-templates/front-page.php (moved) (moved from trunk/wp-content/themes/twentytwelve/page-templates/home.php) (2 diffs)
• rtl.css (modified) (3 diffs)
• sidebar-front.php (moved) (moved from trunk/wp-content/themes/twentytwelve/sidebar-home.php) (4 diffs)
• style.css (modified) (10 diffs)

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

@@ -180 +180 @@
 
 /**
- * Registers our main widget area and the homepage widget areas.
+ * Registers our main widget area and the front page widget areas.
  *
  * @since Twenty Twelve 1.0
@@ -188 +188 @@
         'name' => __( 'Main Sidebar', 'twentytwelve' ),
         'id' => 'sidebar-1',
-        'description' => __( 'Appears on posts and pages except the optional Homepage template, which has its own widgets', 'twentytwelve' ),
+        'description' => __( 'Appears on posts and pages except the optional Front Page template, which has its own widgets', 'twentytwelve' ),
         'before_widget' => '<aside id="%1$s" class="widget %2$s">',
         'after_widget' => '</aside>',
@@ -196 +196 @@
 
     register_sidebar( array(
-        'name' => __( 'First Homepage Widget Area', 'twentytwelve' ),
+        'name' => __( 'First Front Page Widget Area', 'twentytwelve' ),
         'id' => 'sidebar-2',
-        'description' => __( 'Appears when using the optional homepage template with a page set as Static Front Page', 'twentytwelve' ),
+        'description' => __( 'Appears when using the optional Front Page template with a page set as Static Front Page', 'twentytwelve' ),
         'before_widget' => '<aside id="%1$s" class="widget %2$s">',
         'after_widget' => '</aside>',
@@ -206 +206 @@
 
     register_sidebar( array(
-        'name' => __( 'Second Homepage Widget Area', 'twentytwelve' ),
+        'name' => __( 'Second Front Page Widget Area', 'twentytwelve' ),
         'id' => 'sidebar-3',
-        'description' => __( 'Appears when using the optional homepage template with a page set as Static Front Page', 'twentytwelve' ),
+        'description' => __( 'Appears when using the optional Front Page template with a page set as Static Front Page', 'twentytwelve' ),
         'before_widget' => '<aside id="%1$s" class="widget %2$s">',
         'after_widget' => '</aside>',
@@ -222 +222 @@
  * @since Twenty Twelve 1.0
  */
-function twentytwelve_homepage_sidebar_class() {
+function twentytwelve_frontpage_sidebar_class() {
     $classes = array( 'widget-area' );
 
@@ -365 +365 @@
  * 1. Using a full-width layout, when no active widgets in the sidebar
  *    or full-width template.
- * 2. A thumbnail in the Homepage page template.
+ * 2. A thumbnail in the Front Page template.
  * 3. White or empty background color to change the layout and spacing.
  *
@@ -379 +379 @@
         $classes[] = 'full-width';
 
-    if ( is_page_template( 'page-templates/home.php' ) ) {
-        $classes[] = 'template-home';
+    if ( is_page_template( 'page-templates/front-page.php' ) ) {
+        $classes[] = 'template-front-page';
         if ( has_post_thumbnail() )
             $classes[] = 'has-post-thumbnail';

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

@@ -1 +1 @@
 <?php
 /**
- * Template Name: Homepage Template
+ * Template Name: Front Page Template
  *
  * @todo Better documentation here.
@@ -29 +29 @@
     </div><!-- #primary -->
 
-<?php get_sidebar( 'home' ); ?>
+<?php get_sidebar( 'front' ); ?>
 <?php get_footer(); ?>

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

@@ -147 +147 @@
 
 
-/* =Home page template styling
--------------------------------------------------------------- */
-
-.template-home .widget-area .widget_text img {
+/* =Front page template styling
+-------------------------------------------------------------- */
+
+.template-front-page .widget-area .widget_text img {
     float: right;
     margin: 8px 0 8px 24px;
@@ -189 +189 @@
 @media screen and (min-width: 600px) {
     .site-content,
-    .template-home.has-post-thumbnail article {
+    .template-front-page.has-post-thumbnail article {
         float: right;
     }
@@ -200 +200 @@
         text-align: right;
     }
-    .template-home .widget-area .widget_text img {
+    .template-front-page .widget-area .widget_text img {
         float: right;
         margin: 8px 0 8px 24px;
     }
-    .template-home .widget-area .widget,
-    .template-home .widget-area.two .home-widgets {
+    .template-front-page .widget-area .widget,
+    .template-front-page .widget-area.two .front-widgets {
         float: right;
     }
-    .template-home .widget-area .widget:nth-child(odd) {
+    .template-front-page .widget-area .widget:nth-child(odd) {
         clear: left;
     }
-    .template-home .widget-area .widget:nth-child(even),
-    .template-home .widget-area.two .home-widgets + .home-widgets {
+    .template-front-page .widget-area .widget:nth-child(even),
+    .template-front-page .widget-area.two .front-widgets + .front-widgets {
         float: left;
         margin: 0 24px 0;

trunk/wp-content/themes/twentytwelve/sidebar-front.php

@@ -1 +1 @@
 <?php
 /**
- * The sidebar containing the homepage widget areas.
+ * The sidebar containing the front page widget areas.
  *
  * If no active widgets in either sidebar, they will be hidden completely.
@@ -11 +11 @@
 
 /*
- * The homepage widget area is triggered if any of the areas
+ * The front page widget area is triggered if any of the areas
  * have widgets. So let's check that first.
  *
@@ -21 +21 @@
 // If we get this far, we have widgets. Let do this.
 ?>
-<div id="secondary" <?php twentytwelve_homepage_sidebar_class(); ?> role="complementary">
+<div id="secondary" <?php twentytwelve_frontpage_sidebar_class(); ?> role="complementary">
     <?php if ( is_active_sidebar( 'sidebar-2' ) ) : ?>
-    <div class="first home-widgets">
+    <div class="first front-widgets">
         <?php dynamic_sidebar( 'sidebar-2' ); ?>
     </div><!-- .first -->
@@ -29 +29 @@
 
     <?php if ( is_active_sidebar( 'sidebar-3' ) ) : ?>
-    <div class="second home-widgets">
+    <div class="second front-widgets">
         <?php dynamic_sidebar( 'sidebar-3' ); ?>
     </div><!-- .second -->

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

@@ -4 +4 @@
 Author: the WordPress team
 Author URI: http://wordpress.org/
-Description: The 2012 theme for WordPress is a fully responsive theme that looks great on any device. Features include a homepage template with a its own widgets, an optional display font, styling for post formats on both index and single views, and an optional no-sidebar page template. Make it yours with a custom menu, header image, and background.
+Description: The 2012 theme for WordPress is a fully responsive theme that looks great on any device. Features include a front-page template with a its own widgets, an optional display font, styling for post formats on both index and single views, and an optional no-sidebar page template. Make it yours with a custom menu, header image, and background.
 Version: 0.9
 License: GNU General Public License v2 or later
@@ -1205 +1205 @@
 
 
-/* =Homepage template
+/* =Front page template
 -------------------------------------------------------------- */
 
@@ -1212 +1212 @@
     margin-bottom: 1rem;
 }
-.template-home .site-content article {
+.template-front-page .site-content article {
     border: 0;
     margin-bottom: 0;
 }
-.template-home .widget-area {
+.template-front-page .widget-area {
     clear: both;
     float: none;
@@ -1224 +1224 @@
     border-top: 1px solid #ededed;
 }
-.template-home .widget-area .widget li {
+.template-front-page .widget-area .widget li {
     margin: 8px 0 0;
     margin: 0.571428571rem 0 0;
@@ -1233 +1233 @@
     list-style-position: inside;
 }
-.template-home .widget-area .widget li a {
+.template-front-page .widget-area .widget li a {
     color: #777;
 }
-.template-home .widget-area .widget li a:hover {
+.template-front-page .widget-area .widget li a:hover {
     color: #21759b;
 }
-.template-home .widget-area .widget_text img {
+.template-front-page .widget-area .widget_text img {
     float: left;
     margin: 8px 24px 8px 0;
@@ -1332 +1332 @@
         width: 65.104166667%;
     }
-    body.template-home .site-content,
+    body.template-front-page .site-content,
     body.single-attachment .site-content,
     body.full-width .site-content {
@@ -1435 +1435 @@
         width: 79.666666667%;
     }
-    .template-home .site-content,
-    .template-home article {
+    .template-front-page .site-content,
+    .template-front-page article {
         overflow: hidden;
     }
-    .template-home.has-post-thumbnail article {
+    .template-front-page.has-post-thumbnail article {
         float: left;
         width: 47.916666667%;
@@ -1448 +1448 @@
         width: 47.916666667%;
     }
-    .template-home .widget-area .widget,
-    .template-home .widget-area.two .home-widgets {
+    .template-front-page .widget-area .widget,
+    .template-front-page .widget-area.two .front-widgets {
         float: left;
         width: 51.875%;
@@ -1455 +1455 @@
         margin-bottom: 1.714285714rem;
     }
-    .template-home .widget-area .widget:nth-child(odd) {
+    .template-front-page .widget-area .widget:nth-child(odd) {
         clear: right;
     }
-    .template-home .widget-area .widget:nth-child(even),
-    .template-home .widget-area.two .home-widgets + .home-widgets {
+    .template-front-page .widget-area .widget:nth-child(even),
+    .template-front-page .widget-area.two .front-widgets + .front-widgets {
         float: right;
         width: 39.0625%;
@@ -1465 +1465 @@
         margin: 0 0 1.714285714rem;
     }
-    .template-home .widget-area.two .widget,
-    .template-home .widget-area.two .widget:nth-child(even) {
+    .template-front-page .widget-area.two .widget,
+    .template-front-page .widget-area.two .widget:nth-child(even) {
         float: none;
         width: auto;