diff options
| author | habeascodice <habeascodice@federated.social> | 2014-10-09 01:06:59 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-10-09 01:06:59 -0700 |
| commit | 7a106cf60cfa005ec6d8c35f922dc57b9af0175e (patch) | |
| tree | 34b0593f9922f33d9e2c2c517ba9f6e9d3490c44 /view/tpl | |
| parent | 737a3362d50900a5f26aada14f515c5c857a762f (diff) | |
| parent | fc0576acf810019a0c168bfa4dc4a2175ae0b505 (diff) | |
| download | volse-hubzilla-7a106cf60cfa005ec6d8c35f922dc57b9af0175e.tar.gz volse-hubzilla-7a106cf60cfa005ec6d8c35f922dc57b9af0175e.tar.bz2 volse-hubzilla-7a106cf60cfa005ec6d8c35f922dc57b9af0175e.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/app_select.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/group_side.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/saved_searches.tpl | 10 | ||||
| -rw-r--r-- | view/tpl/searchbox.tpl | 12 |
4 files changed, 19 insertions, 7 deletions
diff --git a/view/tpl/app_select.tpl b/view/tpl/app_select.tpl index 5cf3f40d6..527d01eae 100644 --- a/view/tpl/app_select.tpl +++ b/view/tpl/app_select.tpl @@ -1,7 +1,7 @@ {{if $authed}} <div class="widget"> <h3>{{$title}}</h3> -<ul> +<ul class="nav nav-pills nav-stacked"> <li><a href="appman">{{$new}}</a></li> <li><a href="apps/edit">{{$edit}}</a></li> </ul> diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl index 9037e0871..3701f979e 100755 --- a/view/tpl/group_side.tpl +++ b/view/tpl/group_side.tpl @@ -14,7 +14,7 @@ {{if $group.edit}} <a class="pull-right group-edit-icon" href="{{$group.edit.href}}" title="{{$edittext}}"><i class="icon-pencil"></i></a> {{/if}} - <a class="{{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a> + <a{{if $group.selected}} class="group-selected"{{/if}} href="{{$group.href}}">{{$group.text}}</a> </li> {{/foreach}} <li> diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl index 884f21812..ee797ea9d 100644 --- a/view/tpl/saved_searches.tpl +++ b/view/tpl/saved_searches.tpl @@ -1,12 +1,12 @@ -<div class="widget" id="saved-search-list"> +<div class="widget"> <h3 id="search">{{$title}}</h3> {{$searchbox}} - <ul id="saved-search-ul" class="nav nav-pills nav-stacked"> + <ul id="saved-search-list" class="nav nav-pills nav-stacked"> {{foreach $saved as $search}} - <li id="search-term-{{$search.id}}" class="saved-search-li clear"> - <a title="{{$search.delete}}" class="pull-right" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer saved-search-icon" ></i></a> - <a id="saved-search-term-{{$search.id}}" class="savedsearchterm{{if $search.selected}} search-selected{{/if}}" href="{{$search.srchlink}}">{{$search.displayterm}}</a> + <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 id="saved-search-term-{{$search.id}}"{{if $search.selected}} class="search-selected"{{/if}} href="{{$search.srchlink}}">{{$search.displayterm}}</a> </li> {{/foreach}} </ul> diff --git a/view/tpl/searchbox.tpl b/view/tpl/searchbox.tpl new file mode 100644 index 000000000..02b2d4a50 --- /dev/null +++ b/view/tpl/searchbox.tpl @@ -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-sm" id="search-submit" value="{{$search_label}}"><i class="icon-search"></i></button> + {{if $savedsearch}} + <button type="submit" name="searchsave" class="btn btn-default btn-sm" id="search-save" value="{{$save_label}}"><i class="icon-save"></i></button> + {{/if}} + </div> + </div> +</form> |