diff options
| author | habeascodice <habeascodice@federated.social> | 2014-10-07 22:35:02 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-10-07 22:35:02 -0700 |
| commit | 737a3362d50900a5f26aada14f515c5c857a762f (patch) | |
| tree | ae8337e97dd3ae5356daefa0c0da2812511341a0 /view | |
| parent | f84453497bd5ef4eba8bca84917b8e82d784937a (diff) | |
| parent | ee6c53c2e54619a39e16ac2176835adea3b73778 (diff) | |
| download | volse-hubzilla-737a3362d50900a5f26aada14f515c5c857a762f.tar.gz volse-hubzilla-737a3362d50900a5f26aada14f515c5c857a762f.tar.bz2 volse-hubzilla-737a3362d50900a5f26aada14f515c5c857a762f.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view')
| -rw-r--r-- | view/php/theme_init.php | 2 | ||||
| -rw-r--r-- | view/tpl/saved_searches.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/saved_searches_aside.tpl | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/view/php/theme_init.php b/view/php/theme_init.php index ce576805a..f1eaded6a 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -33,7 +33,7 @@ head_add_js('library/cryptojs/components/core-min.js'); head_add_js('library/cryptojs/rollups/aes.js'); head_add_js('library/cryptojs/rollups/rabbit.js'); head_add_js('library/cryptojs/rollups/tripledes.js'); -head_add_js('library/stylish_select/jquery.stylish-select.js'); +//head_add_js('library/stylish_select/jquery.stylish-select.js'); head_add_js('acl.js'); head_add_js('webtoolkit.base64.js'); head_add_js('main.js'); diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl index 1a9f51af9..884f21812 100644 --- a/view/tpl/saved_searches.tpl +++ b/view/tpl/saved_searches.tpl @@ -2,10 +2,10 @@ <h3 id="search">{{$title}}</h3> {{$searchbox}} - <ul id="saved-search-ul"> + <ul id="saved-search-ul" 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}}" 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 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> {{/foreach}} diff --git a/view/tpl/saved_searches_aside.tpl b/view/tpl/saved_searches_aside.tpl index 0258a7632..e0983f0dd 100755 --- a/view/tpl/saved_searches_aside.tpl +++ b/view/tpl/saved_searches_aside.tpl @@ -2,10 +2,10 @@ <h3 id="search">{{$title}}</h3> {{$searchbox}} - <ul id="saved-search-ul"> + <ul id="saved-search-ul" 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}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="network/?f=&remove=1&search={{$search.encodedterm}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer savedsearchdrop saved-search-icon" ></i></a> + <a title="{{$search.delete}}" class="pull-right" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="network/?f=&remove=1&search={{$search.encodedterm}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer savedsearchdrop saved-search-icon" ></i></a> <a id="saved-search-term-{{$search.id}}" class="savedsearchterm{{if $search.selected}} search-selected{{/if}}" href="network/?f=&search={{$search.encodedterm}}">{{$search.displayterm}}</a> </li> {{/foreach}} |