<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[2966] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer: developer.wordpress.org: Add a filter form to taxonomy archives.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/2966">2966</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/2966","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coffee2code</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-04-15 21:38:17 +0000 (Fri, 15 Apr 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>developer.wordpress.org: Add a filter form to taxonomy archives.
Props keesiemeijer.
Fixes <a href="http://meta.trac.wordpress.org/ticket/601">#601</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperarchivephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/archive.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperincextrasphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/extras.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperinctemplatetagsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/template-tags.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperscssmainscss">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/scss/main.scss</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperstylesheetsmaincss">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/stylesheets/main.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperarchivephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/archive.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/archive.php 2016-04-15 20:12:38 UTC (rev 2965)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/archive.php 2016-04-15 21:38:17 UTC (rev 2966)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,6 +16,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <main id="main" class="site-main" role="main">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php taxonomy_archive_filter(); ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( have_posts() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperincextrasphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/extras.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/extras.php 2016-04-15 20:12:38 UTC (rev 2965)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/extras.php 2016-04-15 21:38:17 UTC (rev 2966)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,3 +140,58 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_title', 'wporg_filter_archive_title', 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'single_post_title', 'wporg_filter_archive_title', 10, 2 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Removes the query string from get_pagenum_link() for loop pagination.
+ * Fixes pagination links like example.com/?foo=bar/page/2/.
+ *
+ * @param array $args Arguments for the paginate_links() function.
+ * @return array Arguments for the paginate_links() function.
+ */
+function wporg_loop_pagination_args( $args ) {
+ global $wp_rewrite;
+
+ // Add the $base argument to the array if the user is using permalinks.
+ if ( $wp_rewrite->using_permalinks() && ! is_search() ) {
+ $pagenum = trailingslashit( preg_replace( '/\?.*/', '', get_pagenum_link() ) );
+ $pagination_base = $wp_rewrite->pagination_base;
+
+ $args['base'] = user_trailingslashit( $pagenum . "{$pagination_base}/%#%" );
+ }
+
+ return $args;
+}
+add_filter( 'loop_pagination_args', 'wporg_loop_pagination_args' );
+
+/**
+ * Removes 'page/1' from pagination links with a query string.
+ *
+ * @param string $page_links Page links HTML.
+ * @return string Page links HTML.
+ */
+function wporg_loop_pagination( $page_links ) {
+ global $wp_rewrite;
+
+ $pagination_base = $wp_rewrite->pagination_base;
+ $request = remove_query_arg( 'paged' );
+ $query_string = explode( '?', $request );
+
+ if ( isset( $query_string[1] ) ) {
+
+ $query_string = preg_quote( $query_string[1], '#' );
+
+ // Remove 'page/1' from the entire output since it's not needed.
+ $page_links = preg_replace(
+ array(
+ "#(href=['\"].*?){$pagination_base}/1(\?{$query_string}['\"])#", // 'page/1'
+ "#(href=['\"].*?){$pagination_base}/1/(\?{$query_string}['\"])#", // 'page/1/'
+ ),
+ '$1$2',
+ $page_links
+ );
+ }
+
+ return $page_links;
+}
+add_filter( 'loop_pagination', 'wporg_loop_pagination' );
+
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperinctemplatetagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/template-tags.php 2016-04-15 20:12:38 UTC (rev 2965)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/template-tags.php 2016-04-15 21:38:17 UTC (rev 2966)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -340,15 +340,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Get an array of all parsed post types.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $labels If set to 'labels' post types with their labels are returned.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function get_parsed_post_types() {
- return array(
- 'wp-parser-class',
- 'wp-parser-function',
- 'wp-parser-hook',
- 'wp-parser-method',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function get_parsed_post_types( $labels = '' ) {
+ $post_types = array(
+ 'wp-parser-class' => __( 'Classes', 'wporg' ),
+ 'wp-parser-function' => __( 'Functions', 'wporg' ),
+ 'wp-parser-hook' => __( 'Hooks', 'wporg' ),
+ 'wp-parser-method' => __( 'Methods', 'wporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( 'labels' !== $labels ) {
+ return array_keys( $post_types );
+ }
+
+ return $post_types;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1393,4 +1400,49 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $message;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Displays a post type filter dropdown on taxonomy pages.
+ *
+ * @return string HTML filter form.
+ */
+ function taxonomy_archive_filter() {
+ global $wp_rewrite;
+
+ $taxonomies = array( 'wp-parser-since', 'wp-parser-package', 'wp-parser-source-file' );
+ $taxonomy = get_query_var( 'taxonomy' );
+ $term = get_query_var( 'term' );
+
+ if ( ! ( is_tax() && in_array( $taxonomy, $taxonomies ) ) ) {
+ return;
+ }
+
+ $post_types = get_parsed_post_types( 'labels' );
+ $post_types = array( 'any' => __( 'Any type', 'wporg' ) ) + $post_types;
+
+ $qv_post_type = array_filter( (array) get_query_var( 'post_type' ) );
+ $qv_post_type = $qv_post_type ? $qv_post_type : array( 'any' );
+
+ $options = '';
+ foreach ( $post_types as $post_type => $label ) {
+ $selected = in_array( $post_type, $qv_post_type ) ? " selected='selected'" : '';
+ $options .= "\n\t<option$selected value='" . esc_attr( $post_type ) . "'>$label</option>";
+ }
+
+ $form = "<form method='get' class='archive-filter-form' action=''>";
+
+ if ( ! $wp_rewrite->using_permalinks() ) {
+ // Add taxonomy and term when not using permalinks.
+ $form .= "<input type='hidden' name='" . esc_attr( $taxonomy ) . "' value='" . esc_attr( $term ) . "'>";
+ }
+
+ $form .= "<label for='archive-filter'>";
+ $form .= __( 'Filter by type:', 'wporg' ) . ' ';
+ $form .= '<select name="post_type[]" id="archive-filter">';
+ $form .= $options . '</select></label>';
+ $form .= "<input class='shiny-blue' type='submit' value='Filter' /></form>";
+
+ echo $form;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperscssmainscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/scss/main.scss</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/scss/main.scss 2016-04-15 20:12:38 UTC (rev 2965)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/scss/main.scss 2016-04-15 21:38:17 UTC (rev 2966)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -673,6 +673,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .archive-filter-form {
+ margin: 5rem 0;
+ font-size: 1.5rem;
+ input[type="submit"] {
+ margin-left: .5em;
+ padding: 0.2em 0.5em;
+ line-height: 1;
+ font-size: 1.5rem;
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .searchform {
</span><span class="cx" style="display: block; padding: 0 10px"> overflow: hidden;
</span><span class="cx" style="display: block; padding: 0 10px"> height: auto;
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperstylesheetsmaincss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/stylesheets/main.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/stylesheets/main.css 2016-04-15 20:12:38 UTC (rev 2965)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/stylesheets/main.css 2016-04-15 21:38:17 UTC (rev 2966)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -912,6 +912,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 36px;
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 36px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.devhub-wrap .archive-filter-form {
+ margin: 5rem 0;
+ font-size: 1.5rem;
+}
+.devhub-wrap .archive-filter-form input[type="submit"] {
+ margin-left: .5em;
+ padding: 0.2em 0.5em;
+ line-height: 1;
+ font-size: 1.5rem;
+}
</ins><span class="cx" style="display: block; padding: 0 10px"> .devhub-wrap .searchform {
</span><span class="cx" style="display: block; padding: 0 10px"> overflow: hidden;
</span><span class="cx" style="display: block; padding: 0 10px"> height: auto;
</span></span></pre>
</div>
</div>
</body>
</html>