rayelliott
/
_s
Archived
forked from mirror/_s
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Merge branch 'pr/667'" 

This reverts commit a7c2f89982.

Been meaning to give proper attribution, but Git lost the commit after
I edited the merge commit.

See #667.
This commit is contained in:
Konstantin Obenland 2015-01-07 09:40:24 -08:00
parent a7c2f89982
commit e6366f4474
9 changed files with 75 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archive.php
View File

@ -34,7 +34,7 @@ get_header(); ?>
<?php endwhile; ?> <?php endwhile; ?>
<?php the_posts_navigation(); ?> <?php _s_paging_nav(); ?>
<?php else : ?> <?php else : ?>

26
inc/template-tags.php
View File

@ -7,28 +7,26 @@
* @package _s * @package _s
*/ */
if ( ! function_exists( 'the_posts_navigation' ) ) : if ( ! function_exists( '_s_paging_nav' ) ) :
/** /**
* Display navigation to next/previous set of posts when applicable. * Display navigation to next/previous set of posts when applicable.
*
* @todo Remove this function when WordPress 4.3 is released.
*/ */
function the_posts_navigation() { function _s_paging_nav() {
// Don't print empty markup if there's only one page. // Don't print empty markup if there's only one page.
if ( $GLOBALS['wp_query']->max_num_pages < 2 ) { if ( $GLOBALS['wp_query']->max_num_pages < 2 ) {
return; return;
} }
?> ?>
<nav class="navigation posts-navigation" role="navigation"> <nav class="navigation paging-navigation" role="navigation">
<h2 class="screen-reader-text"><?php _e( 'Posts navigation', '_s' ); ?></h2> <h1 class="screen-reader-text"><?php _e( 'Posts navigation', '_s' ); ?></h1>
<div class="nav-links"> <div class="nav-links">
<?php if ( get_next_posts_link() ) : ?> <?php if ( get_next_posts_link() ) : ?>
<div class="nav-previous"><?php next_posts_link( __( 'Older posts', '_s' ) ); ?></div> <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', '_s' ) ); ?></div>
<?php endif; ?> <?php endif; ?>
<?php if ( get_previous_posts_link() ) : ?> <?php if ( get_previous_posts_link() ) : ?>
<div class="nav-next"><?php previous_posts_link( __( 'Newer posts', '_s' ) ); ?></div> <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', '_s' ) ); ?></div>
<?php endif; ?> <?php endif; ?>
</div><!-- .nav-links --> </div><!-- .nav-links -->
@ -37,13 +35,11 @@ function the_posts_navigation() {
} }
endif; endif;
if ( ! function_exists( 'the_post_navigation' ) ) : if ( ! function_exists( '_s_post_nav' ) ) :
/** /**
* Display navigation to next/previous post when applicable. * Display navigation to next/previous post when applicable.
*
* @todo Remove this function when WordPress 4.3 is released.
*/ */
function the_post_navigation() { function _s_post_nav() {
// Don't print empty markup if there's nowhere to navigate. // Don't print empty markup if there's nowhere to navigate.
$previous = ( is_attachment() ) ? get_post( get_post()->post_parent ) : get_adjacent_post( false, '', true ); $previous = ( is_attachment() ) ? get_post( get_post()->post_parent ) : get_adjacent_post( false, '', true );
$next = get_adjacent_post( false, '', false ); $next = get_adjacent_post( false, '', false );
@ -53,11 +49,11 @@ function the_post_navigation() {
} }
?> ?>
<nav class="navigation post-navigation" role="navigation"> <nav class="navigation post-navigation" role="navigation">
<h2 class="screen-reader-text"><?php _e( 'Post navigation', '_s' ); ?></h2> <h1 class="screen-reader-text"><?php _e( 'Post navigation', '_s' ); ?></h1>
<div class="nav-links"> <div class="nav-links">
<?php <?php
previous_post_link( '<div class="nav-previous">%link</div>', '%title' ); previous_post_link( '<div class="nav-previous">%link</div>', _x( '<span class="meta-nav">&larr;</span>&nbsp;%title', 'Previous post link', '_s' ) );
next_post_link( '<div class="nav-next">%link</div>', '%title' ); next_post_link( '<div class="nav-next">%link</div>', _x( '%title&nbsp;<span class="meta-nav">&rarr;</span>', 'Next post link', '_s' ) );
?> ?>
</div><!-- .nav-links --> </div><!-- .nav-links -->
</nav><!-- .navigation --> </nav><!-- .navigation -->

2
index.php
View File

@ -31,7 +31,7 @@ get_header(); ?>
<?php endwhile; ?> <?php endwhile; ?>
<?php the_posts_navigation(); ?> <?php _s_paging_nav(); ?>
<?php else : ?> <?php else : ?>

93
languages/_s.pot
View File

@ -1,14 +1,14 @@
# Copyright (C) 2015 Automattic # Copyright (C) 2014 Automattic
# This file is distributed under the GNU General Public License v2 or later. # This file is distributed under the GNU General Public License v2 or later.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: _s 1.0.0\n" "Project-Id-Version: _s 1.0-wpcom\n"
"Report-Msgid-Bugs-To: http://wordpress.org/tags/_s\n" "Report-Msgid-Bugs-To: http://wordpress.org/support/theme/_s\n"
"POT-Creation-Date: 2015-01-06 02:24:02+00:00\n" "POT-Creation-Date: 2014-12-03 09:43:15+00:00\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"PO-Revision-Date: 2015-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: 2014-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -73,7 +73,7 @@ msgstr ""
msgid "Pages:" msgid "Pages:"
msgstr "" msgstr ""
#: content-page.php:25 inc/template-tags.php:126 #: content-page.php:25 inc/template-tags.php:122
msgid "Edit" msgid "Edit"
msgstr "" msgstr ""
@ -111,152 +111,163 @@ msgstr ""
msgid "Page %s" msgid "Page %s"
msgstr "" msgstr ""
#: inc/template-tags.php:23 #: inc/template-tags.php:21
msgid "Posts navigation" msgid "Posts navigation"
msgstr "" msgstr ""
#: inc/template-tags.php:27 #: inc/template-tags.php:25
msgid "Older posts" msgid "<span class=\"meta-nav\">&larr;</span> Older posts"
msgstr "" msgstr ""
#: inc/template-tags.php:31 #: inc/template-tags.php:29
msgid "Newer posts" msgid "Newer posts <span class=\"meta-nav\">&rarr;</span>"
msgstr "" msgstr ""
#: inc/template-tags.php:56 #: inc/template-tags.php:52
msgid "Post navigation" msgid "Post navigation"
msgstr "" msgstr ""
#: inc/template-tags.php:86 #: inc/template-tags.php:55
msgctxt "Previous post link"
msgid "<span class=\"meta-nav\">&larr;</span>&nbsp;%title"
msgstr ""
#: inc/template-tags.php:56
msgctxt "Next post link"
msgid "%title&nbsp;<span class=\"meta-nav\">&rarr;</span>"
msgstr ""
#: inc/template-tags.php:82
msgctxt "post date" msgctxt "post date"
msgid "Posted on %s" msgid "Posted on %s"
msgstr "" msgstr ""
#: inc/template-tags.php:91 #: inc/template-tags.php:87
msgctxt "post author" msgctxt "post author"
msgid "by %s" msgid "by %s"
msgstr "" msgstr ""
#. translators: used between list items, there is a space after the comma #. translators: used between list items, there is a space after the comma
#: inc/template-tags.php:108 inc/template-tags.php:114
#: inc/template-tags.php:104 inc/template-tags.php:110
msgid ", " msgid ", "
msgstr "" msgstr ""
#: inc/template-tags.php:110 #: inc/template-tags.php:106
msgid "Posted in %1$s" msgid "Posted in %1$s"
msgstr "" msgstr ""
#: inc/template-tags.php:116 #: inc/template-tags.php:112
msgid "Tagged %1$s" msgid "Tagged %1$s"
msgstr "" msgstr ""
#: inc/template-tags.php:122 #: inc/template-tags.php:118
msgid "Leave a comment" msgid "Leave a comment"
msgstr "" msgstr ""
#: inc/template-tags.php:122 #: inc/template-tags.php:118
msgid "1 Comment" msgid "1 Comment"
msgstr "" msgstr ""
#: inc/template-tags.php:122 #: inc/template-tags.php:118
msgid "% Comments" msgid "% Comments"
msgstr "" msgstr ""
#: inc/template-tags.php:143 #: inc/template-tags.php:139
msgid "Category: %s" msgid "Category: %s"
msgstr "" msgstr ""
#: inc/template-tags.php:145 #: inc/template-tags.php:141
msgid "Tag: %s" msgid "Tag: %s"
msgstr "" msgstr ""
#: inc/template-tags.php:147 #: inc/template-tags.php:143
msgid "Author: %s" msgid "Author: %s"
msgstr "" msgstr ""
#: inc/template-tags.php:149 #: inc/template-tags.php:145
msgid "Year: %s" msgid "Year: %s"
msgstr "" msgstr ""
#: inc/template-tags.php:149 #: inc/template-tags.php:145
msgctxt "yearly archives date format" msgctxt "yearly archives date format"
msgid "Y" msgid "Y"
msgstr "" msgstr ""
#: inc/template-tags.php:151 #: inc/template-tags.php:147
msgid "Month: %s" msgid "Month: %s"
msgstr "" msgstr ""
#: inc/template-tags.php:151 #: inc/template-tags.php:147
msgctxt "monthly archives date format" msgctxt "monthly archives date format"
msgid "F Y" msgid "F Y"
msgstr "" msgstr ""
#: inc/template-tags.php:153 #: inc/template-tags.php:149
msgid "Day: %s" msgid "Day: %s"
msgstr "" msgstr ""
#: inc/template-tags.php:153 #: inc/template-tags.php:149
msgctxt "daily archives date format" msgctxt "daily archives date format"
msgid "F j, Y" msgid "F j, Y"
msgstr "" msgstr ""
#: inc/template-tags.php:155 #: inc/template-tags.php:151
msgctxt "post format archive title" msgctxt "post format archive title"
msgid "Asides" msgid "Asides"
msgstr "" msgstr ""
#: inc/template-tags.php:157 #: inc/template-tags.php:153
msgctxt "post format archive title" msgctxt "post format archive title"
msgid "Galleries" msgid "Galleries"
msgstr "" msgstr ""
#: inc/template-tags.php:159 #: inc/template-tags.php:155
msgctxt "post format archive title" msgctxt "post format archive title"
msgid "Images" msgid "Images"
msgstr "" msgstr ""
#: inc/template-tags.php:161 #: inc/template-tags.php:157
msgctxt "post format archive title" msgctxt "post format archive title"
msgid "Videos" msgid "Videos"
msgstr "" msgstr ""
#: inc/template-tags.php:163 #: inc/template-tags.php:159
msgctxt "post format archive title" msgctxt "post format archive title"
msgid "Quotes" msgid "Quotes"
msgstr "" msgstr ""
#: inc/template-tags.php:165 #: inc/template-tags.php:161
msgctxt "post format archive title" msgctxt "post format archive title"
msgid "Links" msgid "Links"
msgstr "" msgstr ""
#: inc/template-tags.php:167 #: inc/template-tags.php:163
msgctxt "post format archive title" msgctxt "post format archive title"
msgid "Statuses" msgid "Statuses"
msgstr "" msgstr ""
#: inc/template-tags.php:169 #: inc/template-tags.php:165
msgctxt "post format archive title" msgctxt "post format archive title"
msgid "Audio" msgid "Audio"
msgstr "" msgstr ""
#: inc/template-tags.php:171 #: inc/template-tags.php:167
msgctxt "post format archive title" msgctxt "post format archive title"
msgid "Chats" msgid "Chats"
msgstr "" msgstr ""
#: inc/template-tags.php:173 #: inc/template-tags.php:169
msgid "Archives: %s" msgid "Archives: %s"
msgstr "" msgstr ""
#. translators: 1: Taxonomy singular name, 2: Current taxonomy term #. translators: 1: Taxonomy singular name, 2: Current taxonomy term
#: inc/template-tags.php:177 #: inc/template-tags.php:173
msgid "%1$s: %2$s" msgid "%1$s: %2$s"
msgstr "" msgstr ""
#: inc/template-tags.php:179 #: inc/template-tags.php:175
msgid "Archives" msgid "Archives"
msgstr "" msgstr ""

2
sass/modules/_infinite-scroll.scss
View File

@ -1,5 +1,5 @@
/* Globally hidden elements when Infinite Scroll is supported and in use. */ /* Globally hidden elements when Infinite Scroll is supported and in use. */
.infinite-scroll .posts-navigation, /* Older / Newer Posts Navigation (always hidden) */ .infinite-scroll .paging-navigation, /* Older / Newer Posts Navigation (always hidden) */
.infinite-scroll.neverending .site-footer { /* Theme Footer (when set to scrolling) */ .infinite-scroll.neverending .site-footer { /* Theme Footer (when set to scrolling) */
display: none; display: none;
} }

6
sass/navigation/_menus.scss
View File

@ -78,21 +78,21 @@
} }
.site-main .comment-navigation, .site-main .comment-navigation,
.site-main .posts-navigation, .site-main .paging-navigation,
.site-main .post-navigation { .site-main .post-navigation {
margin: 0 0 1.5em; margin: 0 0 1.5em;
overflow: hidden; overflow: hidden;
} }
.comment-navigation .nav-previous, .comment-navigation .nav-previous,
.posts-navigation .nav-previous, .paging-navigation .nav-previous,
.post-navigation .nav-previous { .post-navigation .nav-previous {
float: left; float: left;
width: 50%; width: 50%;
} }
.comment-navigation .nav-next, .comment-navigation .nav-next,
.posts-navigation .nav-next, .paging-navigation .nav-next,
.post-navigation .nav-next { .post-navigation .nav-next {
float: right; float: right;
text-align: right; text-align: right;

2
search.php
View File

@ -30,7 +30,7 @@ get_header(); ?>
<?php endwhile; ?> <?php endwhile; ?>
<?php the_posts_navigation(); ?> <?php _s_paging_nav(); ?>
<?php else : ?> <?php else : ?>

2
single.php
View File

@ -14,7 +14,7 @@ get_header(); ?>
<?php get_template_part( 'content', 'single' ); ?> <?php get_template_part( 'content', 'single' ); ?>
<?php the_post_navigation(); ?> <?php _s_post_nav(); ?>
<?php <?php
// If comments are open or we have at least one comment, load up the comment template // If comments are open or we have at least one comment, load up the comment template

8
style.css
View File

@ -506,21 +506,21 @@ a:active {
} }
.site-main .comment-navigation, .site-main .comment-navigation,
.site-main .posts-navigation, .site-main .paging-navigation,
.site-main .post-navigation { .site-main .post-navigation {
margin: 0 0 1.5em; margin: 0 0 1.5em;
overflow: hidden; overflow: hidden;
} }
.comment-navigation .nav-previous, .comment-navigation .nav-previous,
.posts-navigation .nav-previous, .paging-navigation .nav-previous,
.post-navigation .nav-previous { .post-navigation .nav-previous {
float: left; float: left;
width: 50%; width: 50%;
} }
.comment-navigation .nav-next, .comment-navigation .nav-next,
.posts-navigation .nav-next, .paging-navigation .nav-next,
.post-navigation .nav-next { .post-navigation .nav-next {
float: right; float: right;
text-align: right; text-align: right;
@ -685,7 +685,7 @@ a:active {
11.0 Infinite scroll 11.0 Infinite scroll
--------------------------------------------------------------*/ --------------------------------------------------------------*/
/* Globally hidden elements when Infinite Scroll is supported and in use. */ /* Globally hidden elements when Infinite Scroll is supported and in use. */
.infinite-scroll .posts-navigation, /* Older / Newer Posts Navigation (always hidden) */ .infinite-scroll .paging-navigation, /* Older / Newer Posts Navigation (always hidden) */
.infinite-scroll.neverending .site-footer { /* Theme Footer (when set to scrolling) */ .infinite-scroll.neverending .site-footer { /* Theme Footer (when set to scrolling) */
display: none; display: none;
} }