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

template for searchbox and some more work on saved searches

Browse Source
This commit is contained in:
marijus 2014-10-08 12:36:26 +02:00
parent 634c2ef8ce
commit 289f57f79e
6 changed files with 42 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/text.php
View File

@ -815,28 +815,26 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
function search($s,$id='search-box',$url='/search',$save = false) { function search($s,$id='search-box',$url='/search',$save = false) {
$a = get_app(); $a = get_app();
$o = '<div id="' . $id . '">'; return replace_macros(get_markup_template('searchbox.tpl'),array(
$o .= '<form action="' . $a->get_baseurl((stristr($url,'network')) ? true : false) . $url . '" method="get" >'; '$s' => $s,
$o .= '<input type="text" class="icon-search" name="search" id="search-text" placeholder="&#xf002;" value="' . $s .'" onclick="this.submit();" />'; '$id' => $id,
$o .= '<input class="search-submit btn btn-default" type="submit" name="submit" id="search-submit" value="' . t('Search') . '" />'; '$action_url' => $a->get_baseurl((stristr($url,'network')) ? true : false) . $url,
if(feature_enabled(local_user(),'savedsearch')) '$search_label' => t('Search'),
$o .= '<input class="search-save btn btn-default" type="submit" name="save" id="search-save" value="' . t('Save') . '" />'; '$save_label' => t('Save'),
$o .= '</form></div>'; '$savedsearch' => feature_enabled(local_user(),'savedsearch')
return $o; ));
} }
function searchbox($s,$id='search-box',$url='/search',$save = false) { function searchbox($s,$id='search-box',$url='/search',$save = false) {
$a = get_app(); return replace_macros(get_markup_template('searchbox.tpl'),array(
$o = '<div id="' . $id . '">'; '$s' => $s,
$o .= '<form action="' . z_root() . '/' . $url . '" method="get" >'; '$id' => $id,
$o .= '<input type="hidden" name="f" value="" />'; '$action_url' => z_root() . '/' . $url,
$o .= '<input type="text" class="icon-search" name="search" id="search-text" placeholder="&#xf002;" value="' . $s .'" onclick="this.submit();" />'; '$search_label' => t('Search'),
$o .= '<input type="submit" name="submit" class="btn btn-default" id="search-submit" value="' . t('Search') . '" />'; '$save_label' => t('Save'),
if(feature_enabled(local_user(),'savedsearch')) '$savedsearch' => feature_enabled(local_user(),'savedsearch')
$o .= '<input type="submit" name="searchsave" class="btn btn-default" id="search-save" value="' . t('Save') . '" />'; ));
$o .= '</form></div>';
return $o;
} }
@ -2061,4 +2059,4 @@ function extra_query_args() {
} }
} }
return $s; return $s;
} }

6
view/css/bootstrap-red.css vendored
View File

@ -1,5 +1,11 @@
/* override some bootstrap settings */ /* override some bootstrap settings */
/* this might be a bug in bootstrap */
.input-group-addon,
.input-group-btn {
width: unset;
}
/* nav overrides */ /* nav overrides */
nav .badge { nav .badge {

32
view/css/widgets.css
View File

@ -33,38 +33,10 @@
/* saved searches */ /* saved searches */
#netsearch-box #search-submit { #saved-search-list {
margin: 10px 0 7px 0; margin-top: 2px;
} }
#netsearch-box #search-save {
margin: 9px 0 7px 6px;
}
.search-save {
margin: 7px 0 7px 7px;
}
.saved-search-li {
margin-top: 3px;
}
.saved-search-li i {
opacity: 0;
}
.saved-search-li:hover i {
opacity: 1;
}
.saved-search-icon {
float: right;
}
.savedsearchterm {
display: block;
width: 150px;
overflow: hidden;
}
/* peoplefind */ /* peoplefind */

19
view/theme/redbasic/css/style.css
View File

@ -858,14 +858,6 @@ footer {
margin-bottom: 25px; margin-bottom: 25px;
} }
#search-submit {
margin-left: 15px;
}
#search-box {
margin-bottom: 25px;
}
#nav-searchbar { #nav-searchbar {
float: right; float: right;
margin-top: 2px; margin-top: 2px;
@ -905,14 +897,9 @@ footer {
#search-text { #search-text {
border: 1px solid #ccc; border: 1px solid #ccc;
font-size: 1em; font-size: 1em;
} height: 22px;
border-top-right-radius: 0px;
#search-text::-webkit-input-placeholder { border-bottom-right-radius: 0px;
font-family: FontAwesome;
}
#search-text::-moz-placeholder {
font-family: FontAwesome;
} }
.profile-clear { .profile-clear {

4
view/tpl/saved_searches.tpl
View File

@ -1,8 +1,8 @@
<div class="widget" id="saved-search-list"> <div class="widget">
<h3 id="search">{{$title}}</h3> <h3 id="search">{{$title}}</h3>
{{$searchbox}} {{$searchbox}}
<ul class="nav nav-pills nav-stacked"> <ul id="saved-search-list" class="nav nav-pills nav-stacked">
{{foreach $saved as $search}} {{foreach $saved as $search}}
<li id="search-term-{{$search.id}}"> <li id="search-term-{{$search.id}}">
<a class="pull-right group-edit-icon" title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove" ></i></a> <a class="pull-right group-edit-icon" title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove" ></i></a>

12
view/tpl/searchbox.tpl Normal file
View File

@ -0,0 +1,12 @@
<form action="{{$action_url}}" method="get" >
<input type="hidden" name="f" value="" />
<div id="{{$id}}" class="input-group">
<input type="text" name="search" id="search-text" value="{{$s}}" onclick="this.submit();" />
<div class="input-group-btn">
<button type="submit" name="submit" class="btn btn-default btn-xs" id="search-submit" value="{{$search_label}}"><i class="icon-search"></i></button>
{{if $savedsearch}}
<button type="submit" name="searchsave" class="btn btn-default btn-xs" id="search-save" value="{{$save_label}}"><i class="icon-save"></i></button>
{{/if}}
</div>
</div>
</form>