friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Don't show search options in side bar.

This commit is contained in:
Michael Vogel 2015-08-24 12:12:14 +02:00
parent 3ff196f00d
commit 3bca2db11b
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/text.php
View File

@ -986,21 +986,26 @@ if(! function_exists('search')) {
* @param string $url search url * @param string $url search url
* @param boolean $savedsearch show save search button * @param boolean $savedsearch show save search button
*/ */
function search($s,$id='search-box',$url='/search',$save = false) { function search($s,$id='search-box',$url='/search',$save = false, $aside = true) {
$a = get_app(); $a = get_app();
return replace_macros(get_markup_template('searchbox.tpl'), array(
'$s' => $s, $values = array(
'$id' => $id, '$s' => $s,
'$action_url' => $a->get_baseurl((stristr($url,'network')) ? true : false) . $url, '$id' => $id,
'$search_label' => t('Search'), '$action_url' => $a->get_baseurl((stristr($url,'network')) ? true : false) . $url,
'$save_label' => t('Save'), '$search_label' => t('Search'),
'$savedsearch' => feature_enabled(local_user(),'savedsearch'), '$save_label' => t('Save'),
'$searchoption' => array( '$savedsearch' => feature_enabled(local_user(),'savedsearch'),
);
if (!$aside)
$values['$searchoption'] = array(
t("Full Text"), t("Full Text"),
t("Tags"), t("Tags"),
t("Contacts"), t("Contacts"),
t("Forums")) t("Forums"));
));
return replace_macros(get_markup_template('searchbox.tpl'), $values);
}} }}
if(! function_exists('valid_email')) { if(! function_exists('valid_email')) {

2
mod/search.php
View File

@ -111,7 +111,7 @@ function search_content(&$a) {
} }
$o .= search($search,'search-box','/search',((local_user()) ? true : false)); $o .= search($search,'search-box','/search',((local_user()) ? true : false), false);
if(strpos($search,'#') === 0) { if(strpos($search,'#') === 0) {
$tag = true; $tag = true;

4
view/templates/searchbox.tpl
View File

@ -2,12 +2,14 @@
<form action="{{$action_url}}" method="get" > <form action="{{$action_url}}" method="get" >
{{strip}} {{strip}}
<input type="text" name="search" id="search-text" placeholder="{{$search_label}}" value="{{$s}}" /> <input type="text" name="search" id="search-text" placeholder="{{$search_label}}" value="{{$s}}" />
<select name="search-option"> {{if $searchoption}}
<select name="search-option" id="search-options">
<option value="fulltext">{{$searchoption.0}}</option> <option value="fulltext">{{$searchoption.0}}</option>
<option value="tags">{{$searchoption.1}}</option> <option value="tags">{{$searchoption.1}}</option>
<option value="contacts">{{$searchoption.2}}</option> <option value="contacts">{{$searchoption.2}}</option>
<option value="forums">{{$searchoption.3}}</option> <option value="forums">{{$searchoption.3}}</option>
</select> </select>
{{/if}}
<input type="submit" name="submit" id="search-submit" value="{{$search_label}}" /> <input type="submit" name="submit" id="search-submit" value="{{$search_label}}" />
{{if $savedsearch}} {{if $savedsearch}}