Ticket #21909: 21909.2.diff

File 21909.2.diff, 13.4 KB (added by lancewillett, 8 months ago)
Line 
1Index: wp-content/themes/twentytwelve/style.css
2===================================================================
3--- wp-content/themes/twentytwelve/style.css    (revision 21884)
4+++ wp-content/themes/twentytwelve/style.css    (working copy)
5@@ -3,7 +3,7 @@
6 Theme URI: http://wordpress.org/extend/themes/twentytwelve
7 Author: the WordPress team
8 Author URI: http://wordpress.org/
9-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.
10+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.
11 Version: 0.9
12 License: GNU General Public License v2 or later
13 License URI: http://www.gnu.org/licenses/gpl-2.0.html
14@@ -1204,18 +1204,18 @@
15 }
16 
17 
18-/* =Homepage template
19+/* =Front page template
20 -------------------------------------------------------------- */
21 
22 .entry-page-image {
23        margin-bottom: 14px;
24        margin-bottom: 1rem;
25 }
26-.template-home .site-content article {
27+.template-front-page .site-content article {
28        border: 0;
29        margin-bottom: 0;
30 }
31-.template-home .widget-area {
32+.template-front-page .widget-area {
33        clear: both;
34        float: none;
35        width: auto;
36@@ -1223,7 +1223,7 @@
37        padding-top: 1.714285714rem;
38        border-top: 1px solid #ededed;
39 }
40-.template-home .widget-area .widget li {
41+.template-front-page .widget-area .widget li {
42        margin: 8px 0 0;
43        margin: 0.571428571rem 0 0;
44        font-size: 13px;
45@@ -1232,13 +1232,13 @@
46        list-style-type: square;
47        list-style-position: inside;
48 }
49-.template-home .widget-area .widget li a {
50+.template-front-page .widget-area .widget li a {
51        color: #777;
52 }
53-.template-home .widget-area .widget li a:hover {
54+.template-front-page .widget-area .widget li a:hover {
55        color: #21759b;
56 }
57-.template-home .widget-area .widget_text img {
58+.template-front-page .widget-area .widget_text img {
59        float: left;
60        margin: 8px 24px 8px 0;
61        margin: 0.571428571rem 1.714285714rem 0.571428571rem 0;
62@@ -1331,7 +1331,7 @@
63                float: left;
64                width: 65.104166667%;
65        }
66-       body.template-home .site-content,
67+       body.template-front-page .site-content,
68        body.single-attachment .site-content,
69        body.full-width .site-content {
70                width: 100%;
71@@ -1434,11 +1434,11 @@
72        #respond form textarea.blog-textarea {
73                width: 79.666666667%;
74        }
75-       .template-home .site-content,
76-       .template-home article {
77+       .template-front-page .site-content,
78+       .template-front-page article {
79                overflow: hidden;
80        }
81-       .template-home.has-post-thumbnail article {
82+       .template-front-page.has-post-thumbnail article {
83                float: left;
84                width: 47.916666667%;
85        }
86@@ -1447,25 +1447,25 @@
87                margin-bottom: 0;
88                width: 47.916666667%;
89        }
90-       .template-home .widget-area .widget,
91-       .template-home .widget-area.two .home-widgets {
92+       .template-front-page .widget-area .widget,
93+       .template-front-page .widget-area.two .front-widgets {
94                float: left;
95                width: 51.875%;
96                margin-bottom: 24px;
97                margin-bottom: 1.714285714rem;
98        }
99-       .template-home .widget-area .widget:nth-child(odd) {
100+       .template-front-page .widget-area .widget:nth-child(odd) {
101                clear: right;
102        }
103-       .template-home .widget-area .widget:nth-child(even),
104-       .template-home .widget-area.two .home-widgets + .home-widgets {
105+       .template-front-page .widget-area .widget:nth-child(even),
106+       .template-front-page .widget-area.two .front-widgets + .front-widgets {
107                float: right;
108                width: 39.0625%;
109                margin: 0 0 24px;
110                margin: 0 0 1.714285714rem;
111        }
112-       .template-home .widget-area.two .widget,
113-       .template-home .widget-area.two .widget:nth-child(even) {
114+       .template-front-page .widget-area.two .widget,
115+       .template-front-page .widget-area.two .widget:nth-child(even) {
116                float: none;
117                width: auto;
118        }
119Index: wp-content/themes/twentytwelve/sidebar-home.php
120===================================================================
121--- wp-content/themes/twentytwelve/sidebar-home.php     (revision 21884)
122+++ wp-content/themes/twentytwelve/sidebar-home.php     (working copy)
123@@ -1,35 +0,0 @@
124-<?php
125-/**
126- * The sidebar containing the homepage widget areas.
127- *
128- * If no active widgets in either sidebar, they will be hidden completely.
129- *
130- * @package WordPress
131- * @subpackage Twenty_Twelve
132- * @since Twenty Twelve 1.0
133- */
134-
135-/*
136- * The homepage widget area is triggered if any of the areas
137- * have widgets. So let's check that first.
138- *
139- * If none of the sidebars have widgets, then let's bail early.
140- */
141-if ( ! is_active_sidebar( 'sidebar-2' ) && ! is_active_sidebar( 'sidebar-3' ) )
142-       return;
143-
144-// If we get this far, we have widgets. Let do this.
145-?>
146-<div id="secondary" <?php twentytwelve_homepage_sidebar_class(); ?> role="complementary">
147-       <?php if ( is_active_sidebar( 'sidebar-2' ) ) : ?>
148-       <div class="first home-widgets">
149-               <?php dynamic_sidebar( 'sidebar-2' ); ?>
150-       </div><!-- .first -->
151-       <?php endif; ?>
152-
153-       <?php if ( is_active_sidebar( 'sidebar-3' ) ) : ?>
154-       <div class="second home-widgets">
155-               <?php dynamic_sidebar( 'sidebar-3' ); ?>
156-       </div><!-- .second -->
157-       <?php endif; ?>
158-</div><!-- #secondary -->
159\ No newline at end of file
160Index: wp-content/themes/twentytwelve/sidebar-front.php
161===================================================================
162--- wp-content/themes/twentytwelve/sidebar-front.php    (revision 21884)
163+++ wp-content/themes/twentytwelve/sidebar-front.php    (working copy)
164@@ -1,6 +1,6 @@
165 <?php
166 /**
167- * The sidebar containing the homepage widget areas.
168+ * The sidebar containing the front page widget areas.
169  *
170  * If no active widgets in either sidebar, they will be hidden completely.
171  *
172@@ -10,7 +10,7 @@
173  */
174 
175 /*
176- * The homepage widget area is triggered if any of the areas
177+ * The front page widget area is triggered if any of the areas
178  * have widgets. So let's check that first.
179  *
180  * If none of the sidebars have widgets, then let's bail early.
181@@ -20,15 +20,15 @@
182 
183 // If we get this far, we have widgets. Let do this.
184 ?>
185-<div id="secondary" <?php twentytwelve_homepage_sidebar_class(); ?> role="complementary">
186+<div id="secondary" <?php twentytwelve_frontpage_sidebar_class(); ?> role="complementary">
187        <?php if ( is_active_sidebar( 'sidebar-2' ) ) : ?>
188-       <div class="first home-widgets">
189+       <div class="first front-widgets">
190                <?php dynamic_sidebar( 'sidebar-2' ); ?>
191        </div><!-- .first -->
192        <?php endif; ?>
193 
194        <?php if ( is_active_sidebar( 'sidebar-3' ) ) : ?>
195-       <div class="second home-widgets">
196+       <div class="second front-widgets">
197                <?php dynamic_sidebar( 'sidebar-3' ); ?>
198        </div><!-- .second -->
199        <?php endif; ?>
200Index: wp-content/themes/twentytwelve/rtl.css
201===================================================================
202--- wp-content/themes/twentytwelve/rtl.css      (revision 21884)
203+++ wp-content/themes/twentytwelve/rtl.css      (working copy)
204@@ -146,10 +146,10 @@
205 }
206 
207 
208-/* =Home page template styling
209+/* =Front page template styling
210 -------------------------------------------------------------- */
211 
212-.template-home .widget-area .widget_text img {
213+.template-front-page .widget-area .widget_text img {
214        float: right;
215        margin: 8px 0 8px 24px;
216        margin: 0.571428571rem 0 0.571428571rem 1.714285714rem;
217@@ -188,7 +188,7 @@
218 /* Minimum width of 600 pixels. */
219 @media screen and (min-width: 600px) {
220        .site-content,
221-       .template-home.has-post-thumbnail article {
222+       .template-front-page.has-post-thumbnail article {
223                float: right;
224        }
225        .widget-area,
226@@ -199,19 +199,19 @@
227        .site-header h2 {
228                text-align: right;
229        }
230-       .template-home .widget-area .widget_text img {
231+       .template-front-page .widget-area .widget_text img {
232                float: right;
233                margin: 8px 0 8px 24px;
234        }
235-       .template-home .widget-area .widget,
236-       .template-home .widget-area.two .home-widgets {
237+       .template-front-page .widget-area .widget,
238+       .template-front-page .widget-area.two .front-widgets {
239                float: right;
240        }
241-       .template-home .widget-area .widget:nth-child(odd) {
242+       .template-front-page .widget-area .widget:nth-child(odd) {
243                clear: left;
244        }
245-       .template-home .widget-area .widget:nth-child(even),
246-       .template-home .widget-area.two .home-widgets + .home-widgets {
247+       .template-front-page .widget-area .widget:nth-child(even),
248+       .template-front-page .widget-area.two .front-widgets + .front-widgets {
249                float: left;
250                margin: 0 24px 0;
251                margin: 0 1.714285714rem 0;
252Index: wp-content/themes/twentytwelve/functions.php
253===================================================================
254--- wp-content/themes/twentytwelve/functions.php        (revision 21884)
255+++ wp-content/themes/twentytwelve/functions.php        (working copy)
256@@ -179,7 +179,7 @@
257 add_filter( 'wp_page_menu_args', 'twentytwelve_page_menu_args' );
258 
259 /**
260- * Registers our main widget area and the homepage widget areas.
261+ * Registers our main widget area and the front page widget areas.
262  *
263  * @since Twenty Twelve 1.0
264  */
265@@ -187,7 +187,7 @@
266        register_sidebar( array(
267                'name' => __( 'Main Sidebar', 'twentytwelve' ),
268                'id' => 'sidebar-1',
269-               'description' => __( 'Appears on posts and pages except the optional Homepage template, which has its own widgets', 'twentytwelve' ),
270+               'description' => __( 'Appears on posts and pages except the optional Front Page template, which has its own widgets', 'twentytwelve' ),
271                'before_widget' => '<aside id="%1$s" class="widget %2$s">',
272                'after_widget' => '</aside>',
273                'before_title' => '<h3 class="widget-title">',
274@@ -195,9 +195,9 @@
275        ) );
276 
277        register_sidebar( array(
278-               'name' => __( 'First Homepage Widget Area', 'twentytwelve' ),
279+               'name' => __( 'First Front Page Widget Area', 'twentytwelve' ),
280                'id' => 'sidebar-2',
281-               'description' => __( 'Appears when using the optional homepage template with a page set as Static Front Page', 'twentytwelve' ),
282+               'description' => __( 'Appears when using the optional Front Page template with a page set as Static Front Page', 'twentytwelve' ),
283                'before_widget' => '<aside id="%1$s" class="widget %2$s">',
284                'after_widget' => '</aside>',
285                'before_title' => '<h3 class="widget-title">',
286@@ -205,9 +205,9 @@
287        ) );
288 
289        register_sidebar( array(
290-               'name' => __( 'Second Homepage Widget Area', 'twentytwelve' ),
291+               'name' => __( 'Second Front Page Widget Area', 'twentytwelve' ),
292                'id' => 'sidebar-3',
293-               'description' => __( 'Appears when using the optional homepage template with a page set as Static Front Page', 'twentytwelve' ),
294+               'description' => __( 'Appears when using the optional Front Page template with a page set as Static Front Page', 'twentytwelve' ),
295                'before_widget' => '<aside id="%1$s" class="widget %2$s">',
296                'after_widget' => '</aside>',
297                'before_title' => '<h3 class="widget-title">',
298@@ -221,7 +221,7 @@
299  *
300  * @since Twenty Twelve 1.0
301  */
302-function twentytwelve_homepage_sidebar_class() {
303+function twentytwelve_frontpage_sidebar_class() {
304        $classes = array( 'widget-area' );
305 
306        if ( is_active_sidebar( 'sidebar-2' ) && is_active_sidebar( 'sidebar-3' ) )
307@@ -364,7 +364,7 @@
308  * Extends the default WordPress body class to denote:
309  * 1. Using a full-width layout, when no active widgets in the sidebar
310  *    or full-width template.
311- * 2. A thumbnail in the Homepage page template.
312+ * 2. A thumbnail in the Front Page template.
313  * 3. White or empty background color to change the layout and spacing.
314  *
315  * @since Twenty Twelve 1.0
316@@ -378,8 +378,8 @@
317        if ( ! is_active_sidebar( 'sidebar-1' ) || is_page_template( 'page-templates/full-width.php' ) )
318                $classes[] = 'full-width';
319 
320-       if ( is_page_template( 'page-templates/home.php' ) ) {
321-               $classes[] = 'template-home';
322+       if ( is_page_template( 'page-templates/front-page.php' ) ) {
323+               $classes[] = 'template-front-page';
324                if ( has_post_thumbnail() )
325                        $classes[] = 'has-post-thumbnail';
326        }
327Index: wp-content/themes/twentytwelve/page-templates/front-page.php
328===================================================================
329--- wp-content/themes/twentytwelve/page-templates/front-page.php        (revision 21884)
330+++ wp-content/themes/twentytwelve/page-templates/front-page.php        (working copy)
331@@ -1,6 +1,6 @@
332 <?php
333 /**
334- * Template Name: Homepage Template
335+ * Template Name: Front Page Template
336  *
337  * @todo Better documentation here.
338  *
339@@ -28,5 +28,5 @@
340                </div><!-- #content -->
341        </div><!-- #primary -->
342 
343-<?php get_sidebar( 'home' ); ?>
344+<?php get_sidebar( 'front' ); ?>
345 <?php get_footer(); ?>
346\ No newline at end of file
347Index: wp-content/themes/twentytwelve/page-templates/home.php
348===================================================================
349--- wp-content/themes/twentytwelve/page-templates/home.php      (revision 21884)
350+++ wp-content/themes/twentytwelve/page-templates/home.php      (working copy)
351@@ -1,32 +0,0 @@
352-<?php
353-/**
354- * Template Name: Homepage Template
355- *
356- * @todo Better documentation here.
357- *
358- * @package WordPress
359- * @subpackage Twenty_Twelve
360- * @since Twenty Twelve 1.0
361- */
362-
363-get_header(); ?>
364-
365-       <div id="primary" class="site-content">
366-               <div id="content" role="main">
367-
368-                       <?php while ( have_posts() ) : the_post(); ?>
369-                               <?php if ( has_post_thumbnail() ) : ?>
370-                                       <div class="entry-page-image">
371-                                               <?php the_post_thumbnail(); ?>
372-                                       </div><!-- .entry-page-image -->
373-                               <?php endif; ?>
374-
375-                               <?php get_template_part( 'content', 'page' ); ?>
376-
377-                       <?php endwhile; // end of the loop. ?>
378-
379-               </div><!-- #content -->
380-       </div><!-- #primary -->
381-
382-<?php get_sidebar( 'home' ); ?>
383-<?php get_footer(); ?>
384\ No newline at end of file