harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make search and advanced search use the same input form

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/contact_widgets.php
View File

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

3
mod/directory.php
View File

@ -42,7 +42,8 @@ function directory_content(&$a) {
else else
$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : ''); $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'] : ''); $keywords = (($_GET['keywords']) ? $_GET['keywords'] : '');

14
view/tpl/peoplefind.tpl
View File

@ -3,23 +3,13 @@
<form action="directory" method="post" /> <form action="directory" method="post" />
<div class="form-group"> <div class="form-group">
<div class="input-group"> <div class="input-group">
<input class="widget-input" type="text" name="search" title="{{$hint}}" placeholder="{{$desc}}" /> <input class="widget-input" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" />
<div class="input-group-btn"> <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>
</div> </div>
{{if $advanced_search}} </form>
<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="input-group-btn">
<button class="btn btn-default btn-sm" type="submit" name="submit"><i class="icon-search"></i></button>
</div>
</div>
</div>
{{/if}}
</form>
<ul class="nav nav-pills nav-stacked"> <ul class="nav nav-pills nav-stacked">
{{if $similar}}<li><a href="match" >{{$similar}}</a></li>{{/if}} {{if $similar}}<li><a href="match" >{{$similar}}</a></li>{{/if}}
{{if $loggedin}}<li><a href="suggest" >{{$suggest}}</a></li>{{/if}} {{if $loggedin}}<li><a href="suggest" >{{$suggest}}</a></li>{{/if}}