From b7ede43c4f69b29cccfae79abda19d3c575034c9 Mon Sep 17 00:00:00 2001 From: Ian Stewart Date: Wed, 19 Nov 2014 20:28:25 +0000 Subject: [PATCH] Twenty Fifteen: doc cleanup, addresses removing periods from file header summaries, some spacing, loop documentation, and https instead of http. Props DrewAPicture, MikeHansenMe, see #30149. Built from https://develop.svn.wordpress.org/trunk@30394 git-svn-id: http://core.svn.wordpress.org/trunk@30390 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-content/themes/twentyfifteen/404.php | 4 +- wp-content/themes/twentyfifteen/archive.php | 51 ++++++++++--------- .../themes/twentyfifteen/author-bio.php | 8 ++- wp-content/themes/twentyfifteen/comments.php | 4 +- .../themes/twentyfifteen/content-link.php | 6 ++- .../themes/twentyfifteen/content-none.php | 8 +-- .../themes/twentyfifteen/content-page.php | 9 ++-- .../themes/twentyfifteen/content-search.php | 11 ++-- wp-content/themes/twentyfifteen/content.php | 11 ++-- wp-content/themes/twentyfifteen/footer.php | 7 +-- wp-content/themes/twentyfifteen/functions.php | 15 +++--- wp-content/themes/twentyfifteen/header.php | 6 +-- wp-content/themes/twentyfifteen/image.php | 22 +++++--- wp-content/themes/twentyfifteen/index.php | 51 ++++++++++--------- wp-content/themes/twentyfifteen/page.php | 25 +++++---- wp-content/themes/twentyfifteen/rtl.css | 2 +- wp-content/themes/twentyfifteen/search.php | 33 ++++++------ wp-content/themes/twentyfifteen/sidebar.php | 51 ++++++++++--------- wp-content/themes/twentyfifteen/single.php | 40 ++++++++------- wp-content/themes/twentyfifteen/style.css | 9 ++-- 20 files changed, 211 insertions(+), 162 deletions(-) diff --git a/wp-content/themes/twentyfifteen/404.php b/wp-content/themes/twentyfifteen/404.php index e90e5dd3d8..9eedb3aace 100644 --- a/wp-content/themes/twentyfifteen/404.php +++ b/wp-content/themes/twentyfifteen/404.php @@ -1,6 +1,6 @@ - \ No newline at end of file + diff --git a/wp-content/themes/twentyfifteen/archive.php b/wp-content/themes/twentyfifteen/archive.php index 1a9f70609c..495d6341fa 100644 --- a/wp-content/themes/twentyfifteen/archive.php +++ b/wp-content/themes/twentyfifteen/archive.php @@ -1,6 +1,6 @@ ?> - - - - - - - __( 'Previous page', 'twentyfifteen' ), - 'next_text' => __( 'Next page', 'twentyfifteen' ), - 'before_page_number' => '' . __( 'Page', 'twentyfifteen' ) . ' ', - ) ); - ?> + // Start the Loop. + while ( have_posts() ) : the_post(); - + /* + * Include the Post-Format-specific template for the content. + * If you want to override this in a child theme, then include a file + * called content-___.php (where ___ is the Post Format name) and that will be used instead. + */ + get_template_part( 'content', get_post_format() ); - + // End the loop. + endwhile; - + // Previous/next page navigation. + the_pagination( array( + 'prev_text' => __( 'Previous page', 'twentyfifteen' ), + 'next_text' => __( 'Next page', 'twentyfifteen' ), + 'before_page_number' => '' . __( 'Page', 'twentyfifteen' ) . ' ', + ) ); + + // If no content, include the "No posts found" template. + else : + get_template_part( 'content', 'none' ); + + endif; + ?> - \ No newline at end of file + diff --git a/wp-content/themes/twentyfifteen/author-bio.php b/wp-content/themes/twentyfifteen/author-bio.php index 20378b7ad3..839df911f4 100644 --- a/wp-content/themes/twentyfifteen/author-bio.php +++ b/wp-content/themes/twentyfifteen/author-bio.php @@ -1,6 +1,6 @@ +

+

+
- \ No newline at end of file + diff --git a/wp-content/themes/twentyfifteen/comments.php b/wp-content/themes/twentyfifteen/comments.php index 8958ad336c..e1be95e56d 100644 --- a/wp-content/themes/twentyfifteen/comments.php +++ b/wp-content/themes/twentyfifteen/comments.php @@ -1,6 +1,6 @@ - \ No newline at end of file + diff --git a/wp-content/themes/twentyfifteen/content-link.php b/wp-content/themes/twentyfifteen/content-link.php index 8133e8974a..07f359900b 100644 --- a/wp-content/themes/twentyfifteen/content-link.php +++ b/wp-content/themes/twentyfifteen/content-link.php @@ -1,6 +1,6 @@ ', '' ); ?> - \ No newline at end of file + + diff --git a/wp-content/themes/twentyfifteen/content-none.php b/wp-content/themes/twentyfifteen/content-none.php index 01d50a9da2..63998419e0 100644 --- a/wp-content/themes/twentyfifteen/content-none.php +++ b/wp-content/themes/twentyfifteen/content-none.php @@ -1,8 +1,8 @@
+

Get started here.', 'twentyfifteen' ), esc_url( admin_url( 'post-new.php' ) ) ); ?>

@@ -31,5 +32,6 @@ +
- \ No newline at end of file + diff --git a/wp-content/themes/twentyfifteen/content-page.php b/wp-content/themes/twentyfifteen/content-page.php index 0b565107fe..058b59b678 100644 --- a/wp-content/themes/twentyfifteen/content-page.php +++ b/wp-content/themes/twentyfifteen/content-page.php @@ -1,6 +1,6 @@
> - +
', '' ); ?> @@ -31,4 +34,4 @@ ', '' ); ?> -
\ No newline at end of file + diff --git a/wp-content/themes/twentyfifteen/content-search.php b/wp-content/themes/twentyfifteen/content-search.php index 05fa74d8c8..77843c8f72 100644 --- a/wp-content/themes/twentyfifteen/content-search.php +++ b/wp-content/themes/twentyfifteen/content-search.php @@ -1,8 +1,8 @@ + + + ', '' ); ?> + - \ No newline at end of file + + diff --git a/wp-content/themes/twentyfifteen/content.php b/wp-content/themes/twentyfifteen/content.php index 333b266a09..2dddf74121 100644 --- a/wp-content/themes/twentyfifteen/content.php +++ b/wp-content/themes/twentyfifteen/content.php @@ -1,6 +1,6 @@
> - +
', '' ); ?> -
\ No newline at end of file + + diff --git a/wp-content/themes/twentyfifteen/footer.php b/wp-content/themes/twentyfifteen/footer.php index 473bbe6977..ef5bd02357 100644 --- a/wp-content/themes/twentyfifteen/footer.php +++ b/wp-content/themes/twentyfifteen/footer.php @@ -1,6 +1,6 @@ - + + - \ No newline at end of file + diff --git a/wp-content/themes/twentyfifteen/functions.php b/wp-content/themes/twentyfifteen/functions.php index ebba907252..7fc5374fc2 100644 --- a/wp-content/themes/twentyfifteen/functions.php +++ b/wp-content/themes/twentyfifteen/functions.php @@ -1,6 +1,6 @@ section and everything up until the "site-content" div. + * Displays all of the <head> section and everything up until the "site-content" div. * * @package WordPress * @subpackage Twenty_Fifteen @@ -48,4 +48,4 @@ -
\ No newline at end of file +
diff --git a/wp-content/themes/twentyfifteen/image.php b/wp-content/themes/twentyfifteen/image.php index 6932b6b6b1..c0a5ef8feb 100644 --- a/wp-content/themes/twentyfifteen/image.php +++ b/wp-content/themes/twentyfifteen/image.php @@ -1,6 +1,6 @@
- +
> +
if ( comments_open() || get_comments_number() ) : comments_template(); endif; - ?> - _x( 'Published in%title', 'Parent post link', 'twentyfifteen' ), ) ); - ?> - + // End the loop. + endwhile; + ?>
- \ No newline at end of file + diff --git a/wp-content/themes/twentyfifteen/index.php b/wp-content/themes/twentyfifteen/index.php index 937021490b..2f98a1c325 100644 --- a/wp-content/themes/twentyfifteen/index.php +++ b/wp-content/themes/twentyfifteen/index.php @@ -1,14 +1,13 @@ - - - - - - __( 'Previous page', 'twentyfifteen' ), - 'next_text' => __( 'Next page', 'twentyfifteen' ), - 'before_page_number' => '' . __( 'Page', 'twentyfifteen' ) . ' ', - ) ); - ?> + // Start the loop. + while ( have_posts() ) : the_post(); - + /* + * Include the Post-Format-specific template for the content. + * If you want to override this in a child theme, then include a file + * called content-___.php (where ___ is the Post Format name) and that will be used instead. + */ + get_template_part( 'content', get_post_format() ); - + // End the loop. + endwhile; - + // Previous/next page navigation. + the_pagination( array( + 'prev_text' => __( 'Previous page', 'twentyfifteen' ), + 'next_text' => __( 'Next page', 'twentyfifteen' ), + 'before_page_number' => '' . __( 'Page', 'twentyfifteen' ) . ' ', + ) ); + + // If no content, include the "No posts found" template. + else : + get_template_part( 'content', 'none' ); + + endif; + ?>
- \ No newline at end of file + diff --git a/wp-content/themes/twentyfifteen/page.php b/wp-content/themes/twentyfifteen/page.php index 6423d4d70e..5c7a0b077a 100644 --- a/wp-content/themes/twentyfifteen/page.php +++ b/wp-content/themes/twentyfifteen/page.php @@ -1,6 +1,6 @@
- + + // Include the page content template. + 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(); + endif; - + // End the loop. + endwhile; + ?>
- \ No newline at end of file + diff --git a/wp-content/themes/twentyfifteen/rtl.css b/wp-content/themes/twentyfifteen/rtl.css index a1c6f81f3c..5d460bb626 100644 --- a/wp-content/themes/twentyfifteen/rtl.css +++ b/wp-content/themes/twentyfifteen/rtl.css @@ -4,7 +4,7 @@ Description: Adds support for languages written in a Right To Left (RTL) directi It's easy, just a matter of overwriting all the horizontal positioning attributes of your CSS stylesheet in a separate stylesheet file named rtl.css. -See http://codex.wordpress.org/Right_to_Left_Language_Support +See: https://codex.wordpress.org/Right_to_Left_Language_Support */ /** diff --git a/wp-content/themes/twentyfifteen/search.php b/wp-content/themes/twentyfifteen/search.php index b0f5dd8b95..3bd5ffdd9b 100644 --- a/wp-content/themes/twentyfifteen/search.php +++ b/wp-content/themes/twentyfifteen/search.php @@ -18,33 +18,34 @@ get_header(); ?>

- - + - + // End the loop. + endwhile; - __( 'Previous page', 'twentyfifteen' ), - 'next_text' => __( 'Next page', 'twentyfifteen' ), - 'before_page_number' => '' . __( 'Page', 'twentyfifteen' ) . ' ', - ) ); - ?> + // Previous/next page navigation. + the_pagination( array( + 'prev_text' => __( 'Previous page', 'twentyfifteen' ), + 'next_text' => __( 'Next page', 'twentyfifteen' ), + 'before_page_number' => '' . __( 'Page', 'twentyfifteen' ) . ' ', + ) ); - + // If no content, include the "No posts found" template. + else : + get_template_part( 'content', 'none' ); - - - + endif; + ?> diff --git a/wp-content/themes/twentyfifteen/sidebar.php b/wp-content/themes/twentyfifteen/sidebar.php index a8a40d5e36..02308efc37 100644 --- a/wp-content/themes/twentyfifteen/sidebar.php +++ b/wp-content/themes/twentyfifteen/sidebar.php @@ -1,6 +1,6 @@
+ - + - + - + +
- \ No newline at end of file + + diff --git a/wp-content/themes/twentyfifteen/single.php b/wp-content/themes/twentyfifteen/single.php index f57d62b468..be4a8c3d7c 100644 --- a/wp-content/themes/twentyfifteen/single.php +++ b/wp-content/themes/twentyfifteen/single.php @@ -1,6 +1,6 @@
- + + /* + * Include the post format-specific template for the content. If you want to + * use this in a child theme, then include a file called called content-___.php + * (where ___ is the post format) and that will be used instead. + */ + get_template_part( 'content', get_post_format() ); - + // If comments are open or we have at least one comment, load up the comment template. + if ( comments_open() || get_comments_number() ) : + comments_template(); + endif; - _x( 'Next post:%title', 'Next post link', 'twentyfifteen' ), - 'prev_text' => _x( 'Previous post:%title', 'Previous post link', 'twentyfifteen' ) - ) ); - ?> + // Previous/next post navigation. + the_post_navigation( array( + 'next_text' => _x( 'Next post:%title', 'Next post link', 'twentyfifteen' ), + 'prev_text' => _x( 'Previous post:%title', 'Previous post link', 'twentyfifteen' ) + ) ); - + // End the loop. + endwhile; + ?>
- \ No newline at end of file + diff --git a/wp-content/themes/twentyfifteen/style.css b/wp-content/themes/twentyfifteen/style.css index e312982652..b1057fec13 100644 --- a/wp-content/themes/twentyfifteen/style.css +++ b/wp-content/themes/twentyfifteen/style.css @@ -1,8 +1,8 @@ /* Theme Name: Twenty Fifteen -Theme URI: http://wordpress.org/themes/twentyfifteen +Theme URI: https://wordpress.org/themes/twentyfifteen Author: the WordPress team -Author URI: http://wordpress.org/ +Author URI: https://wordpress.org/ Description: Our 2015 default theme is clean, blog-focused, and designed for clarity. Twenty Fifteen's simple, straightforward typography is readable on a wide variety of screen sizes, and suitable for multiple languages. We designed it using a mobile-first approach, meaning your content takes center-stage, regardless of whether your visitors arrive by smartphone, tablet, laptop, or desktop computer. Version: 0.1 License: GNU General Public License v2 or later @@ -2593,10 +2593,11 @@ span > video { * 15.0 Media Queries */ -/* Does the same thing as , +/* + * Does the same thing as , * but in the future W3C standard way. -ms- prefix is required for IE10+ to * render responsive styling in Windows 8 "snapped" views; IE10+ does not honor - * the meta tag. See http://core.trac.wordpress.org/ticket/25888. + * the meta tag. See https://core.trac.wordpress.org/ticket/25888. */ @-ms-viewport { width: device-width;