diff options
author | ArthurHoaro <arthur@hoa.ro> | 2017-04-01 12:17:37 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2017-05-25 15:51:12 +0200 |
commit | 7d86f40bdb2135655b5b4fe8cbcc1ac102114f86 (patch) | |
tree | c70ac4ad89a4fc84b8e52114aca7d9755cc92086 /tpl | |
parent | b64d83cd2b60b6851741787f8ce2ae2c93092841 (diff) | |
download | Shaarli-7d86f40bdb2135655b5b4fe8cbcc1ac102114f86.tar.gz Shaarli-7d86f40bdb2135655b5b4fe8cbcc1ac102114f86.tar.zst Shaarli-7d86f40bdb2135655b5b4fe8cbcc1ac102114f86.zip |
Empty tag search will look for not tagged links
Fixes #784
From now, searching for tags with an empty value will return only not tagged links,
with the search bar showing `x results [not tagged]`.
Note that using the api, the searchtags request parameter must be set to `false` to get the same result.
- [ ] Update API doc
Diffstat (limited to 'tpl')
-rw-r--r-- | tpl/default/linklist.html | 6 | ||||
-rw-r--r-- | tpl/vintage/linklist.html | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index 57ef4567..3d6be529 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html | |||
@@ -89,7 +89,7 @@ | |||
89 | <div id="searchcriteria">{'Nothing found.'|t}</div> | 89 | <div id="searchcriteria">{'Nothing found.'|t}</div> |
90 | </div> | 90 | </div> |
91 | </div> | 91 | </div> |
92 | {elseif="!empty($search_term) or !empty($search_tags) or !empty($visibility)"} | 92 | {elseif="!empty($search_term) or $search_tags !== '' or !empty($visibility)"} |
93 | <div class="pure-g pure-alert pure-alert-success search-result"> | 93 | <div class="pure-g pure-alert pure-alert-success search-result"> |
94 | <div class="pure-u-2-24"></div> | 94 | <div class="pure-u-2-24"></div> |
95 | <div class="pure-u-20-24"> | 95 | <div class="pure-u-20-24"> |
@@ -105,6 +105,10 @@ | |||
105 | <a href="?removetag={function="urlencode($value)"}">{$value}<span class="remove"><i class="fa fa-times"></i></span></a> | 105 | <a href="?removetag={function="urlencode($value)"}">{$value}<span class="remove"><i class="fa fa-times"></i></span></a> |
106 | </span> | 106 | </span> |
107 | {/loop} | 107 | {/loop} |
108 | {elseif="$search_tags === false"} | ||
109 | <span class="label label-tag" title="{'Remove tag'|t}"> | ||
110 | <a href="?">{'untagged'|t}<span class="remove"><i class="fa fa-times"></i></span></a> | ||
111 | </span> | ||
108 | {/if} | 112 | {/if} |
109 | {if="!empty($visibility)"} | 113 | {if="!empty($visibility)"} |
110 | {'with status'|t} | 114 | {'with status'|t} |
diff --git a/tpl/vintage/linklist.html b/tpl/vintage/linklist.html index fc116667..8458caa1 100644 --- a/tpl/vintage/linklist.html +++ b/tpl/vintage/linklist.html | |||
@@ -55,7 +55,7 @@ | |||
55 | 55 | ||
56 | {if="count($links)==0"} | 56 | {if="count($links)==0"} |
57 | <div id="searchcriteria">Nothing found.</div> | 57 | <div id="searchcriteria">Nothing found.</div> |
58 | {elseif="!empty($search_term) or !empty($search_tags)"} | 58 | {elseif="!empty($search_term) or $search_tags !== ''"} |
59 | <div id="searchcriteria"> | 59 | <div id="searchcriteria"> |
60 | {$result_count} results | 60 | {$result_count} results |
61 | {if="!empty($search_term)"} | 61 | {if="!empty($search_term)"} |
@@ -69,6 +69,10 @@ | |||
69 | <a href="?removetag={function="urlencode($value)"}">{$value} <span class="remove">x</span></a> | 69 | <a href="?removetag={function="urlencode($value)"}">{$value} <span class="remove">x</span></a> |
70 | </span> | 70 | </span> |
71 | {/loop} | 71 | {/loop} |
72 | {elseif="$search_tags === false"} | ||
73 | <span class="linktag" title="Remove tag"> | ||
74 | <a href="?">untagged <span class="remove">x</span></a> | ||
75 | </span> | ||
72 | {/if} | 76 | {/if} |
73 | </div> | 77 | </div> |
74 | {/if} | 78 | {/if} |