make search and advanced search use the same input form

This commit is contained in:
marijus 2014-11-12 10:27:13 +01:00
parent ada2e43ea2
commit 1ed144b83c
3 changed files with 9 additions and 19 deletions

View File

@ -29,8 +29,7 @@ function findpeople_widget() {
'$random' => t('Random Profile'),
'$inv' => t('Invite Friends'),
'$advanced_search' => $advanced_search,
'$advanced_hint' => t('Exammple: name=fred and country=iceland'),
'$find_advanced' => t('Advanced Find'),
'$advanced_hint' => "\r\n" . t('Advanced example: name=fred and country=iceland'),
'$loggedin' => local_user()
));

View File

@ -42,7 +42,8 @@ function directory_content(&$a) {
else
$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
$advanced = ((x($_REQUEST,'query')) ? notags(trim($_REQUEST['query'])) : '');
if(strpos($search,'=') && local_user() && get_pconfig(local_user(),'feature','expert'))
$advanced = $search;
$keywords = (($_GET['keywords']) ? $_GET['keywords'] : '');

View File

@ -1,25 +1,15 @@
<div id="peoplefind-sidebar" class="widget">
<h3>{{$findpeople}}</h3>
<form action="directory" method="post" />
<div class="form-group">
<div class="input-group">
<input class="widget-input" type="text" name="search" title="{{$hint}}" placeholder="{{$desc}}" />
<div class="input-group-btn">
<button class="btn btn-default btn-sm" type="submit" name="submit"><i class="icon-search"></i></button>
</div>
</div>
</div>
{{if $advanced_search}}
<div class="form-group">
<div id="advanced-people-search-div" class="input-group">
<input class="widget-input" type="text" name="query" title="{{$advanced_hint}}" placeholder="{{$find_advanced}}" />
<div class="form-group">
<div class="input-group">
<input class="widget-input" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" />
<div class="input-group-btn">
<button class="btn btn-default btn-sm" type="submit" name="submit"><i class="icon-search"></i></button>
<button class="btn btn-default btn-sm" type="submit" name="submit"><i class="icon-search"></i></button>
</div>
</div>
</div>
</div>
{{/if}}
</form>
</form>
<ul class="nav nav-pills nav-stacked">
{{if $similar}}<li><a href="match" >{{$similar}}</a></li>{{/if}}
{{if $loggedin}}<li><a href="suggest" >{{$suggest}}</a></li>{{/if}}