<!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][12184] trunk/src/bp-templates/bp-nouveau: BP Nouveau: bring back search form filters</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 { white-space: pre-line; 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/12184">12184</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/12184","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-07-07 21:48:52 +0000 (Sat, 07 Jul 2018)</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'>BP Nouveau: bring back search form filters
Although it was already possible to override search form templates, as the following search form filters are not Legacy filters but Core components ones, we are bringing them back into the Nouveau template pack:
- {{{bp_directory_members_search_form}}}
- {{{bp_directory_blogs_search_form}}}
- {{{bp_directory_groups_search_form}}}
- {{{bp_message_search_form}}}
Props wbcomdesigns, DJPaul, vapvarun
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7881">#7881</a> (trunk)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbptemplatesbpnouveaubuddypresscommonjstemplatesmessagesindexphp">trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludesmessagesfunctionsphp">trunk/src/bp-templates/bp-nouveau/includes/messages/functions.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludesmessagestemplatetagsphp">trunk/src/bp-templates/bp-nouveau/includes/messages/template-tags.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludestemplatetagsphp">trunk/src/bp-templates/bp-nouveau/includes/template-tags.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcbptemplatesbpnouveaubuddypresscommonjstemplatesmessagessearchformphp">trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/search-form.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbptemplatesbpnouveaubuddypresscommonjstemplatesmessagesindexphp"></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-nouveau/buddypress/common/js-templates/messages/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php 2018-07-07 21:44:24 UTC (rev 12183)
+++ trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php 2018-07-07 21:48:52 UTC (rev 12184)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,16 +93,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/html" id="tmpl-bp-messages-filters">
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="user-messages-search" role="search" data-bp-search="{{data.box}}">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="bp-search messages-search">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <form action="" method="get" id="user_messages_search_form" class="bp-messages-search-form" data-bp-search="messages">
- <label for="user_messages_search" class="bp-screen-reader-text">
- <?php _e( 'Search Messages', 'buddypress' ); ?>
- </label>
- <input type="search" id="user_messages_search" placeholder="<?php echo esc_attr_x( 'Search', 'search placeholder text', 'buddypress' ); ?>"/>
- <button type="submit" id="user_messages_search_submit">
- <span class="dashicons dashicons-search" aria-hidden="true"></span>
- <span class="bp-screen-reader-text"><?php echo esc_html_x( 'Search', 'button', 'buddypress' ); ?></span>
- </button>
- </form>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bp_nouveau_message_search_form(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="user-messages-bulk-actions"></li>
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveaubuddypresscommonjstemplatesmessagessearchformphp"></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-nouveau/buddypress/common/js-templates/messages/search-form.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/search-form.php (rev 0)
+++ trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/search-form.php 2018-07-07 21:48:52 UTC (rev 12184)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,18 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * BP Nouveau Messages search form template.
+ *
+ * @since 3.2.0
+ * @version 3.2.0
+ */
+?>
+<form action="" method="get" id="user_messages_search_form" class="bp-messages-search-form" data-bp-search="messages">
+ <label for="user_messages_search" class="bp-screen-reader-text">
+ <?php _e( 'Search Messages', 'buddypress' ); ?>
+ </label>
+ <input type="search" id="user_messages_search" placeholder="<?php echo esc_attr_x( 'Search', 'search placeholder text', 'buddypress' ); ?>"/>
+ <button type="submit" id="user_messages_search_submit">
+ <span class="dashicons dashicons-search" aria-hidden="true"></span>
+ <span class="bp-screen-reader-text"><?php echo esc_html_x( 'Search', 'button', 'buddypress' ); ?></span>
+ </button>
+</form>
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/search-form.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcbptemplatesbpnouveauincludesmessagesfunctionsphp"></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-nouveau/includes/messages/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/messages/functions.php 2018-07-07 21:44:24 UTC (rev 12183)
+++ trunk/src/bp-templates/bp-nouveau/includes/messages/functions.php 2018-07-07 21:48:52 UTC (rev 12184)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,29 +140,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</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_nouveau_message_search_form() {
- $query_arg = bp_core_get_component_search_query_arg( 'messages' );
- $placeholder = bp_get_search_default_text( 'messages' );
-
- $search_form_html = '<form action="" method="get" id="search-messages-form">
- <label for="messages_search"><input type="text" name="' . esc_attr( $query_arg ) . '" id="messages_search" placeholder="' . esc_attr( $placeholder ) . '" /></label>
- <input type="submit" id="messages_search_submit" name="messages_search_submit" value="' . esc_attr_x( 'Search', 'button', 'buddypress' ) . '" />
- </form>';
-
- /**
- * Filters the private message component search form.
- *
- * @since 3.0.0
- *
- * @param string $search_form_html HTML markup for the message search form.
- */
- echo apply_filters( 'bp_nouveau_message_search_form', $search_form_html );
-}
-add_filter( 'bp_message_search_form', 'bp_nouveau_message_search_form', 10, 1 );
-
-/**
- * @since 3.0.0
- */
</del><span class="cx" style="display: block; padding: 0 10px"> function bp_nouveau_messages_adjust_nav() {
</span><span class="cx" style="display: block; padding: 0 10px"> $bp = buddypress();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludesmessagestemplatetagsphp"></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-nouveau/includes/messages/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/messages/template-tags.php 2018-07-07 21:44:24 UTC (rev 12183)
+++ trunk/src/bp-templates/bp-nouveau/includes/messages/template-tags.php 2018-07-07 21:48:52 UTC (rev 12184)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,3 +61,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'bp_after_member_messages_content' );
</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 Member's messages search form.
+ *
+ * @since 3.0.0
+ * @since 3.2.0 Move the function into Template Tags and use a template part.
+ */
+function bp_nouveau_message_search_form() {
+ $search_form_html = bp_buffer_template_part( 'common/js-templates/messages/search-form', null, false );
+
+ /**
+ * Filters the private message component search form.
+ *
+ * @since 2.2.0
+ *
+ * @param string $search_form_html HTML markup for the message search form.
+ */
+ echo apply_filters( 'bp_message_search_form', $search_form_html );
+}
</ins></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludestemplatetagsphp"></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-nouveau/includes/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/template-tags.php 2018-07-07 21:44:24 UTC (rev 12183)
+++ trunk/src/bp-templates/bp-nouveau/includes/template-tags.php 2018-07-07 21:48:52 UTC (rev 12184)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1849,14 +1849,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_nouveau_search_form() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp_get_template_part( 'common/search/search-form' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $search_form_html = bp_buffer_template_part( 'common/search/search-form', null, false );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $objects = bp_nouveau_get_search_objects();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $objects['primary'] ) || empty( $objects['secondary'] ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo $search_form_html;
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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"> if ( 'dir' === $objects['primary'] ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Filter here to edit the HTML output of the directory search form.
+ *
+ * NB: This will take in charge the following BP Core Components filters
+ * - bp_directory_members_search_form
+ * - bp_directory_blogs_search_form
+ * - bp_directory_groups_search_form
+ *
+ * @since 1.9.0
+ *
+ * @param string $search_form_html The HTML output for the directory search form.
+ */
+ echo apply_filters( "bp_directory_{$objects['secondary']}_search_form", $search_form_html );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'activity' === $objects['secondary'] ) {
</span><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 activity syndication options.
</span></span></pre>
</div>
</div>
</body>
</html>