<!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>[BuddyPress][11048] trunk/src: Templates: Move component directory search markup to 'common' template.</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://buddypress.trac.wordpress.org/changeset/11048">11048</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/11048","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-08-31 13:21:12 +0000 (Wed, 31 Aug 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'>Templates: Move component directory search markup to 'common' template.
The new 'common' directory in the bp-legacy template pack will be a
storehouse for template parts that are shared between components. The
directory search form is the first implementation of this idea.
Props hnla, mercime.
See <a href="http://buddypress.trac.wordpress.org/ticket/6844">#6844</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcorefunctionsphp">trunk/src/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunksrcbpcorebpcoretemplatephp">trunk/src/bp-core/bp-core-template.php</a></li>
<li><a href="#trunksrcbptemplatesbplegacybuddypressblogsindexphp">trunk/src/bp-templates/bp-legacy/buddypress/blogs/index.php</a></li>
<li><a href="#trunksrcbptemplatesbplegacybuddypressforumsindexphp">trunk/src/bp-templates/bp-legacy/buddypress/forums/index.php</a></li>
<li><a href="#trunksrcbptemplatesbplegacybuddypressgroupsindexphp">trunk/src/bp-templates/bp-legacy/buddypress/groups/index.php</a></li>
<li><a href="#trunksrcbptemplatesbplegacybuddypressmembersindexphp">trunk/src/bp-templates/bp-legacy/buddypress/members/index.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/src/bp-templates/bp-legacy/buddypress/common/</li>
<li>trunk/src/bp-templates/bp-legacy/buddypress/common/search/</li>
<li><a href="#trunksrcbptemplatesbplegacybuddypresscommonsearchdirsearchformphp">trunk/src/bp-templates/bp-legacy/buddypress/common/search/dir-search-form.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-functions.php 2016-08-31 00:23:33 UTC (rev 11047)
+++ trunk/src/bp-core/bp-core-functions.php 2016-08-31 13:21:12 UTC (rev 11048)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -850,11 +850,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Get the 'search' query argument for a given component.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.4.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 2.7.0 The `$component` parameter was made optional, with the current component
+ * as the fallback value.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $component Component name.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $component Optional. Component name. Defaults to current component.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string|bool Query argument on success. False on failure.
</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 bp_core_get_component_search_query_arg( $component ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function bp_core_get_component_search_query_arg( $component = null ) {
+ if ( ! $component ) {
+ $component = bp_current_component();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $query_arg = false;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( buddypress()->{$component}->search_query_arg ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $query_arg = sanitize_title( buddypress()->{$component}->search_query_arg );
</span></span></pre></div>
<a id="trunksrcbpcorebpcoretemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-template.php 2016-08-31 00:23:33 UTC (rev 11047)
+++ trunk/src/bp-core/bp-core-template.php 2016-08-31 13:21:12 UTC (rev 11048)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -585,6 +585,71 @@
</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">+ * Output the 'name' attribute for search form input element.
+ *
+ * @since 2.7.0
+ *
+ * @param string $component See bp_get_search_input_name().
+ */
+function bp_search_input_name( $component = '' ) {
+ echo esc_attr( bp_get_search_input_name( $component ) );
+}
+
+/**
+ * Get the 'name' attribute for the search form input element.
+ *
+ * @since 2.7.0
+ *
+ * @param string $component Component name. Defaults to current component.
+ * @return string Text for the 'name' attribute.
+ */
+function bp_get_search_input_name( $component = '' ) {
+ if ( ! $component ) {
+ $component = bp_current_component();
+ }
+
+ $bp = buddypress();
+
+ $name = '';
+ if ( isset( $bp->{$component}->id ) ) {
+ $name = $bp->{$component}->id . '_search';
+ }
+
+ return $name;
+}
+
+/**
+ * Output the placeholder text for the search box for a given component.
+ *
+ * @since 2.7.0
+ *
+ * @param string $component See bp_get_search_placeholder().
+ */
+function bp_search_placeholder( $component = '' ) {
+ echo esc_attr( bp_get_search_placeholder( $component ) );
+}
+
+/**
+ * Get the placeholder text for the search box for a given component.
+ *
+ * @since 2.7.0
+ *
+ * @param string $component Component name. Defaults to current component.
+ * @return string Placeholder text for the search field.
+ */
+function bp_get_search_placeholder( $component = '' ) {
+ $query_arg = bp_core_get_component_search_query_arg( $component );
+
+ if ( $query_arg && ! empty( $_REQUEST[ $query_arg ] ) ) {
+ $placeholder = wp_unslash( $_REQUEST[ $query_arg ] );
+ } else {
+ $placeholder = bp_get_search_default_text( $component );
+ }
+
+ return $placeholder;
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Output the default text for the search box for a given component.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span></span></pre></div>
<a id="trunksrcbptemplatesbplegacybuddypressblogsindexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-legacy/buddypress/blogs/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-legacy/buddypress/blogs/index.php 2016-08-31 00:23:33 UTC (rev 11047)
+++ trunk/src/bp-templates/bp-legacy/buddypress/blogs/index.php 2016-08-31 13:21:12 UTC (rev 11048)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,10 +33,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'bp_before_directory_blogs_content' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div id="blog-dir-search" class="dir-search" role="search">
- <?php bp_directory_blogs_search_form(); ?>
- </div><!-- #blog-dir-search -->
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php /* Backward compatibility for inline search form. Use template part instead. */ ?>
+ <?php if ( has_filter( 'bp_directory_blogs_search_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">+ <div id="blog-dir-search" class="dir-search" role="search">
+ <?php bp_directory_blogs_search_form(); ?>
+ </div><!-- #blog-dir-search -->
+
+ <?php else : ?>
+
+ <?php bp_get_template_part( 'common/search/dir-search-form' ); ?>
+
+ <?php endif; ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</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="trunksrcbptemplatesbplegacybuddypresscommonsearchdirsearchformphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/bp-templates/bp-legacy/buddypress/common/search/dir-search-form.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-legacy/buddypress/common/search/dir-search-form.php (rev 0)
+++ trunk/src/bp-templates/bp-legacy/buddypress/common/search/dir-search-form.php 2016-08-31 13:21:12 UTC (rev 11048)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,16 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Output the search form markup.
+ *
+ * @since 2.7.0
+ */
+?>
+
+<div id="<?php echo esc_attr( bp_current_component() ); ?>-dir-search" class="dir-search" role="search">
+ <form action="" method="get" id="search-<?php echo esc_attr( bp_current_component() ); ?>-form">
+ <label for="<?php bp_search_input_name(); ?>" class="bp-screen-reader-text"><?php bp_search_placeholder(); ?></label>
+ <input type="text" name="<?php echo esc_attr( bp_core_get_component_search_query_arg() ); ?>" id="<?php bp_search_input_name(); ?>" placeholder="<?php bp_search_placeholder(); ?>" />
+
+ <input type="submit" id="<?php echo esc_attr( bp_get_search_input_name() ); ?>_submit" name="<?php bp_search_input_name(); ?>_submit" value="<?php echo esc_html( 'Search', 'buddypress' ); ?>" />
+ </form>
+</div><!-- #<?php echo esc_attr( bp_current_component() ); ?>-dir-search -->
</ins></span></pre></div>
<a id="trunksrcbptemplatesbplegacybuddypressforumsindexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-legacy/buddypress/forums/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-legacy/buddypress/forums/index.php 2016-08-31 00:23:33 UTC (rev 11047)
+++ trunk/src/bp-templates/bp-legacy/buddypress/forums/index.php 2016-08-31 13:21:12 UTC (rev 11048)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,11 +29,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'bp_before_directory_forums_content' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div id="forums-dir-search" class="dir-search" role="search">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php /* Backward compatibility for inline search form. Use template part instead. */ ?>
+ <?php if ( has_filter( 'bp_directory_forums_search_form' ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bp_directory_forums_search_form(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="forums-dir-search" class="dir-search" role="search">
+ <?php bp_directory_forums_search_form(); ?>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php else: ?>
+
+ <?php bp_get_template_part( 'common/search/dir-search-form' ); ?>
+
+ <?php endif; ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="trunksrcbptemplatesbplegacybuddypressgroupsindexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-legacy/buddypress/groups/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-legacy/buddypress/groups/index.php 2016-08-31 00:23:33 UTC (rev 11047)
+++ trunk/src/bp-templates/bp-legacy/buddypress/groups/index.php 2016-08-31 13:21:12 UTC (rev 11048)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,10 +33,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'bp_before_directory_groups_content' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div id="group-dir-search" class="dir-search" role="search">
- <?php bp_directory_groups_search_form(); ?>
- </div><!-- #group-dir-search -->
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php /* Backward compatibility for inline search form. Use template part instead. */ ?>
+ <?php if ( has_filter( 'bp_directory_groups_search_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">+ <div id="group-dir-search" class="dir-search" role="search">
+ <?php bp_directory_groups_search_form(); ?>
+ </div><!-- #group-dir-search -->
+
+ <?php else: ?>
+
+ <?php bp_get_template_part( 'common/search/dir-search-form' ); ?>
+
+ <?php endif; ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <form action="" method="post" id="groups-directory-form" class="dir-form">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="trunksrcbptemplatesbplegacybuddypressmembersindexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-legacy/buddypress/members/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-legacy/buddypress/members/index.php 2016-08-31 00:23:33 UTC (rev 11047)
+++ trunk/src/bp-templates/bp-legacy/buddypress/members/index.php 2016-08-31 13:21:12 UTC (rev 11048)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,12 +33,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'bp_before_directory_members_content' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div id="members-dir-search" class="dir-search" role="search">
- <?php bp_directory_members_search_form(); ?>
- </div><!-- #members-dir-search -->
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php /* Backward compatibility for inline search form. Use template part instead. */ ?>
+ <?php if ( has_filter( 'bp_directory_members_search_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">+ <div id="members-dir-search" class="dir-search" role="search">
+ <?php bp_directory_members_search_form(); ?>
+ </div><!-- #members-dir-search -->
+
+ <?php else: ?>
+
+ <?php bp_get_template_part( 'common/search/dir-search-form' ); ?>
+
+ <?php endif; ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires before the display of the members list tabs.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre>
</div>
</div>
</body>
</html>