aboutsummaryrefslogtreecommitdiffhomepage
path: root/tpl
diff options
context:
space:
mode:
authorVirtualTam <virtualtam+github@flibidi.net>2017-08-03 16:27:59 +0200
committerGitHub <noreply@github.com>2017-08-03 16:27:59 +0200
commitf09e1e318e0b1c72aa659c20b715be508009175f (patch)
tree68d84f2583d5aa799128e3ec418e20eda4ba2c5f /tpl
parentf5568f87b1a23b36f8d3623aacfbb810d1d60dc0 (diff)
parentf210d94f716acd86fd22c9651f591a778490e8a9 (diff)
downloadShaarli-f09e1e318e0b1c72aa659c20b715be508009175f.tar.gz
Shaarli-f09e1e318e0b1c72aa659c20b715be508009175f.tar.zst
Shaarli-f09e1e318e0b1c72aa659c20b715be508009175f.zip
Merge pull request #889 from Lucas-C/master
Using only one form in linklist.html - fix #885
Diffstat (limited to 'tpl')
-rw-r--r--tpl/default/css/shaarli.css45
-rw-r--r--tpl/default/linklist.html50
-rw-r--r--tpl/default/linklist.paging.html11
-rw-r--r--tpl/default/page.header.html39
4 files changed, 65 insertions, 80 deletions
diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css
index 39bbd0a3..e1868c59 100644
--- a/tpl/default/css/shaarli.css
+++ b/tpl/default/css/shaarli.css
@@ -226,6 +226,12 @@ body, .pure-g [class*="pure-u"] {
226 border-radius: 2px; 226 border-radius: 2px;
227 color: #252525; 227 color: #252525;
228} 228}
229@media screen and (max-width: 64em) {
230 .searchform {
231 max-width: 260px;
232 margin: 0 auto;
233 }
234}
229 235
230/* because chrome */ 236/* because chrome */
231#search input[type="text"]::-webkit-input-placeholder, 237#search input[type="text"]::-webkit-input-placeholder,
@@ -236,43 +242,37 @@ body, .pure-g [class*="pure-u"] {
236#search button, 242#search button,
237#search-tagcloud button, 243#search-tagcloud button,
238#search-linklist button { 244#search-linklist button {
239 background: transparent; 245 padding: 4px 8px 6px 8px;
246 background-color: #1B926C;
247 color: #f5f5f5;
240 border: none; 248 border: none;
249 border-radius: 2px;
241} 250}
242 251
243#search button { 252#search-tagcloud button {
244 color: #f5f5f5; 253 width: 90%;
245} 254}
246 255
247#search-linklist button { 256@media screen and (max-width: 64em) {
248 color: #252525; 257 #search-linklist button {
258 width: 100%;
259 }
260 #search-linklist .awesomplete {
261 margin: 5px 0;
262 }
249} 263}
250 264
251#search button:hover, 265#search button:hover,
252#search-linklist button:hover { 266#search-linklist button:hover,
253 color: #fff;
254}
255#search-tagcloud button:hover { 267#search-tagcloud button:hover {
256 color: #d0d0d0; 268 color: #d0d0d0;
257} 269}
258 270
271#search,
259#search-linklist { 272#search-linklist {
260 padding: 5px 0; 273 padding: 6px 0;
261} 274}
262 275
263@media screen and (min-width: 64em) {
264 #search .searchform,
265 #search-linklist .searchform {
266 margin-right: 25px;
267 text-align: right;
268 }
269
270 #search .tagfilter,
271 #search-linklist .tagfilter {
272 margin-left: 25px;
273 text-align: left;
274 }
275}
276@media screen and (max-width: 64em) { 276@media screen and (max-width: 64em) {
277 #search, #search * { 277 #search, #search * {
278 visibility: hidden; 278 visibility: hidden;
@@ -321,7 +321,6 @@ body, .pure-g [class*="pure-u"] {
321} 321}
322 322
323.subheader-form input[type="text"], .subheader-form input[type="password"], .subheader-form .remember-me { 323.subheader-form input[type="text"], .subheader-form input[type="password"], .subheader-form .remember-me {
324 margin: 0 0 5px 0;
325 padding: 5px 5px 3px 15px; 324 padding: 5px 5px 3px 15px;
326 height: 20px; 325 height: 20px;
327 width: 20%; 326 width: 20%;
diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html
index 2568a5d6..685821e3 100644
--- a/tpl/default/linklist.html
+++ b/tpl/default/linklist.html
@@ -19,30 +19,21 @@
19 19
20<div id="search-linklist"> 20<div id="search-linklist">
21 21
22 <div class="pure-g"> 22 <form method="GET" class="pure-form searchform" name="searchform">
23 <div class="pure-u-1 pure-u-lg-1-2"> 23 <input type="text" tabindex="1" name="searchterm" class="searchterm" placeholder="{'Search text'|t}"
24 <form method="GET" class="searchform" name="searchform"> 24 {if="!empty($search_term)"}
25 <input type="text" tabindex="1" name="searchterm" placeholder="{'Search text'|t}" 25 value="{$search_term}"
26 {if="!empty($search_term)"} 26 {/if}
27 value="{$search_term}" 27 >
28 {/if} 28 <input type="text" tabindex="2" name="searchtags" class="searchtags" placeholder="{'Filter by tag'|t}"
29 > 29 {if="!empty($search_tags)"}
30 <button type="submit" class="search-button"><i class="fa fa-search"></i></button> 30 value="{$search_tags}"
31 </form> 31 {/if}
32 </div> 32 autocomplete="off" data-multiple data-autofirst data-minChars="1"
33 <div class="pure-u-1 pure-u-lg-1-2"> 33 data-list="{loop="$tags"}{$key}, {/loop}"
34 <form method="GET" class="tagfilter" name="tagfilter"> 34 >
35 <input type="text" tabindex="2" name="searchtags" placeholder="{'Filter by tag'|t}" 35 <button type="submit" class="search-button"><i class="fa fa-search"></i></button>
36 {if="!empty($search_tags)"} 36 </form>
37 value="{$search_tags}"
38 {/if}
39 autocomplete="off" data-multiple data-autofirst data-minChars="1"
40 data-list="{loop="$tags"}{$key}, {/loop}"
41 >
42 <button type="submit" class="search-button"><i class="fa fa-search"></i></button>
43 </form>
44 </div>
45 </div>
46</div> 37</div>
47 38
48{loop="$plugins_header.fields_toolbar"} 39{loop="$plugins_header.fields_toolbar"}
@@ -91,7 +82,7 @@
91 <div id="searchcriteria">{'Nothing found.'|t}</div> 82 <div id="searchcriteria">{'Nothing found.'|t}</div>
92 </div> 83 </div>
93 </div> 84 </div>
94 {elseif="!empty($search_term) or $search_tags !== '' or !empty($visibility)"} 85 {elseif="!empty($search_term) or $search_tags !== '' or !empty($visibility) or $untaggedonly"}
95 <div class="pure-g pure-alert pure-alert-success search-result"> 86 <div class="pure-g pure-alert pure-alert-success search-result">
96 <div class="pure-u-2-24"></div> 87 <div class="pure-u-2-24"></div>
97 <div class="pure-u-20-24"> 88 <div class="pure-u-20-24">
@@ -107,10 +98,6 @@
107 <a href="?removetag={function="urlencode($value)"}">{$value}<span class="remove"><i class="fa fa-times"></i></span></a> 98 <a href="?removetag={function="urlencode($value)"}">{$value}<span class="remove"><i class="fa fa-times"></i></span></a>
108 </span> 99 </span>
109 {/loop} 100 {/loop}
110 {elseif="$search_tags === false"}
111 <span class="label label-tag" title="{'Remove tag'|t}">
112 <a href="?">{'untagged'|t}<span class="remove"><i class="fa fa-times"></i></span></a>
113 </span>
114 {/if} 101 {/if}
115 {if="!empty($visibility)"} 102 {if="!empty($visibility)"}
116 {'with status'|t} 103 {'with status'|t}
@@ -118,6 +105,11 @@
118 {$visibility|t} 105 {$visibility|t}
119 </span> 106 </span>
120 {/if} 107 {/if}
108 {if="$untaggedonly"}
109 <span class="label label-private">
110 {'without any tag'|t}
111 </span>
112 {/if}
121 </div> 113 </div>
122 </div> 114 </div>
123 {/if} 115 {/if}
diff --git a/tpl/default/linklist.paging.html b/tpl/default/linklist.paging.html
index d8c1e76e..41e9fa34 100644
--- a/tpl/default/linklist.paging.html
+++ b/tpl/default/linklist.paging.html
@@ -6,10 +6,13 @@
6 {'Filters'|t} 6 {'Filters'|t}
7 </span> 7 </span>
8 {if="isLoggedIn()"} 8 {if="isLoggedIn()"}
9 <a href="?privateonly" title="{'Filter private links'|t}" 9 <a href="?privateonly" title="{'Filter private links'|t}"
10 class={if="$privateonly"}"filter-on"{else}"filter-off"{/if} 10 class={if="$privateonly"}"filter-on"{else}"filter-off"{/if}
11 ><i class="fa fa-key"></i></a> 11 ><i class="fa fa-key"></i></a>
12 {/if} 12 {/if}
13 <a href="?untaggedonly" title="{'Filter untagged links'|t}"
14 class={if="$untaggedonly"}"filter-on"{else}"filter-off"{/if}
15 ><i class="fa fa-tag"></i></a>
13 <a href="#" class="filter-off fold-all pure-u-lg-0" title="Fold all"> 16 <a href="#" class="filter-off fold-all pure-u-lg-0" title="Fold all">
14 <i class="fa fa-chevron-up"></i> 17 <i class="fa fa-chevron-up"></i>
15 </a> 18 </a>
@@ -55,4 +58,4 @@
55 </a> 58 </a>
56 </div> 59 </div>
57 </div> 60 </div>
58</div> \ No newline at end of file 61</div>
diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html
index 6c71a718..2411703c 100644
--- a/tpl/default/page.header.html
+++ b/tpl/default/page.header.html
@@ -97,30 +97,21 @@
97 97
98<div id="content"> 98<div id="content">
99 <div id="search" class="subheader-form"> 99 <div id="search" class="subheader-form">
100 <div class="pure-g"> 100 <form method="GET" class="pure-form searchform" name="searchform">
101 <div class="pure-u-1 pure-u-lg-1-2"> 101 <input type="text" tabindex="1" id="searchform_value" name="searchterm" placeholder="{'Search text'|t}"
102 <form method="GET" class="searchform" name="searchform"> 102 {if="!empty($search_term)"}
103 <input type="text" tabindex="1" id="searchform_value" name="searchterm" placeholder="{'Search text'|t}" 103 value="{$search_term}"
104 {if="!empty($search_term)"} 104 {/if}
105 value="{$search_term}" 105 >
106 {/if} 106 <input type="text" tabindex="2" name="searchtags" id="tagfilter_value" placeholder="{'Filter by tag'|t}"
107 > 107 {if="!empty($search_tags)"}
108 <button type="submit" class="search-button"><i class="fa fa-search"></i></button> 108 value="{$search_tags}"
109 </form> 109 {/if}
110 </div> 110 autocomplete="off" data-multiple data-autofirst data-minChars="1"
111 <div class="pure-u-1 pure-u-lg-1-2"> 111 data-list="{loop="$tags"}{$key}, {/loop}"
112 <form method="GET" class="tagfilter" name="tagfilter"> 112 >
113 <input type="text" tabindex="2" name="searchtags" id="tagfilter_value" placeholder="{'Filter by tag'|t}" 113 <button type="submit" class="search-button"><i class="fa fa-search"></i></button>
114 {if="!empty($search_tags)"} 114 </form>
115 value="{$search_tags}"
116 {/if}
117 autocomplete="off" data-multiple data-autofirst data-minChars="1"
118 data-list="{loop="$tags"}{$key}, {/loop}"
119 >
120 <button type="submit" class="search-button"><i class="fa fa-search"></i></button>
121 </form>
122 </div>
123 </div>
124 </div> 115 </div>
125 <div id="actions" class="subheader-form"> 116 <div id="actions" class="subheader-form">
126 <div class="pure-g"> 117 <div class="pure-g">