aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2016-11-05 13:28:43 +0100
committerArthurHoaro <arthur@hoa.ro>2016-11-05 14:29:57 +0100
commitbdf4566ab0650204c4586033a73a3858ddf279fd (patch)
tree766563b5d1c56b64f033c69d6bdf227435795163
parentc8f0a06d801d1e6405f5d86b45ba5967a6569c8c (diff)
downloadShaarli-bdf4566ab0650204c4586033a73a3858ddf279fd.tar.gz
Shaarli-bdf4566ab0650204c4586033a73a3858ddf279fd.tar.zst
Shaarli-bdf4566ab0650204c4586033a73a3858ddf279fd.zip
Use new header plugin placeholders
-rw-r--r--tpl/default/css/shaarli.css54
-rw-r--r--tpl/default/linklist.html6
-rw-r--r--tpl/default/linklist.paging.html18
-rw-r--r--tpl/default/page.header.html33
-rw-r--r--tpl/default/tools.html10
5 files changed, 81 insertions, 40 deletions
diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css
index e2d64686..0367534b 100644
--- a/tpl/default/css/shaarli.css
+++ b/tpl/default/css/shaarli.css
@@ -257,8 +257,6 @@ pre {
257 257
258#header-login-form { 258#header-login-form {
259 height: 0; 259 height: 0;
260 text-align: center;
261 background: #1b926c;
262 transition: 0.3s; 260 transition: 0.3s;
263} 261}
264 262
@@ -266,14 +264,39 @@ pre {
266 display: block; 264 display: block;
267 height: 30px; 265 height: 30px;
268 padding: 5px 0; 266 padding: 5px 0;
269 box-shadow: 0 1px 1px 1px #797979;
270} 267}
271 268
272#header-login-form input[type="text"], #header-login-form input[type="password"], #header-login-form .remember-me { 269#header-login-form input[type="text"], #header-login-form input[type="password"] {
270 width: 200px;
271}
272
273#header-login-form input, #header-login-form .remember-me {
274 transition: visibility 1s, opacity 1s;
275 visibility: hidden;
276 opacity: 0;
277}
278
279#header-login-form.open input, #header-login-form.open .remember-me {
280 visibility: visible;
281 opacity: 1;
282}
283
284.subheader-form {
285 text-align: center;
286 background: #1b926c;
287 display: block;
288}
289
290.subheader-form.open {
291 height: 30px;
292 padding: 5px 0;
293}
294
295.subheader-form input[type="text"], .subheader-form input[type="password"], .subheader-form .remember-me {
273 margin: 0 0 5px 0; 296 margin: 0 0 5px 0;
274 padding: 5px 5px 3px 15px; 297 padding: 5px 5px 3px 15px;
275 height: 20px; 298 height: 20px;
276 width: 200px; 299 width: 20%;
277 background: #1fa67a; 300 background: #1fa67a;
278 border: medium none currentColor; 301 border: medium none currentColor;
279 border-radius: 25px; 302 border-radius: 25px;
@@ -282,24 +305,24 @@ pre {
282} 305}
283 306
284/* because chrome */ 307/* because chrome */
285#header-login-form input[type="text"]::-webkit-input-placeholder, 308.subheader-form input[type="text"]::-webkit-input-placeholder,
286#header-login-form input[type="password"]::-webkit-input-placeholder 309.subheader-form input[type="password"]::-webkit-input-placeholder
287{ 310{
288 color: #b0ddce; 311 color: #b0ddce;
289} 312}
290 313
291#header-login-form .remember-me { 314.subheader-form .remember-me {
292 display: inline-block; 315 display: inline-block;
293 width: auto; 316 width: auto;
294 padding: 5px 20px 3px 20px; 317 padding: 5px 20px 3px 20px;
295 cursor: pointer; 318 cursor: pointer;
296} 319}
297 320
298#header-login-form .remember-me label, #header-login-form .remember-me input { 321.subheader-form .remember-me label, .subheader-form .remember-me input {
299 cursor: pointer; 322 cursor: pointer;
300} 323}
301 324
302#header-login-form input[type="submit"] { 325.subheader-form input[type="submit"] {
303 display: inline-block; 326 display: inline-block;
304 margin: 0 0 5px 0; 327 margin: 0 0 5px 0;
305 height: 25px; 328 height: 25px;
@@ -311,17 +334,6 @@ pre {
311 color: #b0ddce; 334 color: #b0ddce;
312} 335}
313 336
314#header-login-form input, #header-login-form .remember-me {
315 transition: visibility 1s, opacity 1s;
316 visibility: hidden;
317 opacity: 0;
318}
319
320#header-login-form.open input, #header-login-form.open .remember-me {
321 visibility: visible;
322 opacity: 1;
323}
324
325.new-version-message { 337.new-version-message {
326 text-align: center; 338 text-align: center;
327} 339}
diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html
index e6b04188..5ca7923d 100644
--- a/tpl/default/linklist.html
+++ b/tpl/default/linklist.html
@@ -110,9 +110,11 @@
110 <div class="linklist-item-infos-dateblock pure-u-lg-3-8 pure-u-1"> 110 <div class="linklist-item-infos-dateblock pure-u-lg-3-8 pure-u-1">
111 <a href="?{$value.shorturl}" title="{'Permalink'|t}"> 111 <a href="?{$value.shorturl}" title="{'Permalink'|t}">
112 {if="!$hide_timestamps || isLoggedIn()"} 112 {if="!$hide_timestamps || isLoggedIn()"}
113 <span class="linkdate"> 113 {$updated=$value.updated_timestamp ? 'Edited: '. strftime('%c', $value.updated_timestamp) : 'Permalink'}
114 <span class="linkdate" title="{$updated}">
114 <i class="fa fa-clock-o"></i> 115 <i class="fa fa-clock-o"></i>
115 {function="strftime('%d %B %Y %H:%M', $value.timestamp)"} &middot; 116 {function="strftime('%d %B %Y %H:%M', $value.timestamp)"}{if="$value.updated_timestamp"}*{/if}
117 &middot;
116 </span> 118 </span>
117 {/if} 119 {/if}
118 {'permalink'|t} 120 {'permalink'|t}
diff --git a/tpl/default/linklist.paging.html b/tpl/default/linklist.paging.html
index 4dbfb324..5e9c8486 100644
--- a/tpl/default/linklist.paging.html
+++ b/tpl/default/linklist.paging.html
@@ -14,14 +14,16 @@
14 ><i class="fa fa-key"></i></a> 14 ><i class="fa fa-key"></i></a>
15 {/if} 15 {/if}
16 {loop="$action_plugin"} 16 {loop="$action_plugin"}
17 <!-- FIXME! Plugin update to handle that. --> 17 {$value.class=isset($value.class) ? $value.class : ''}
18 <a href="?privateonly" title="{$value.title}" class= 18 {$value.class=!empty($value.on) ? $value.class .' filter-on' : $value.class .' filter-off'}
19 {if="$value.on"} 19 <a
20 "filter-on" 20 {loop="$value"}
21 {else} 21 {if="$key!='html'"}
22 "filter-off" 22 {$key}="{$value}"
23 {/if} 23 {/if}
24 >{$value.url}</a> 24 {/loop}>
25 {$value.html}
26 </a>
25 {/loop} 27 {/loop}
26 {/if} 28 {/if}
27 </div> 29 </div>
diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html
index 39edf518..67d0d0c4 100644
--- a/tpl/default/page.header.html
+++ b/tpl/default/page.header.html
@@ -33,10 +33,17 @@
33 <li class="pure-menu-item"> 33 <li class="pure-menu-item">
34 <a href="?do=daily" class="pure-menu-link">{'Daily'|t}</a> 34 <a href="?do=daily" class="pure-menu-link">{'Daily'|t}</a>
35 </li> 35 </li>
36 <!-- FIXME! update plugin system to handle this -->
37 {loop="$plugins_header.buttons_toolbar"} 36 {loop="$plugins_header.buttons_toolbar"}
38 <li class="pure-menu-item"> 37 <li class="pure-menu-item">
39 <a href="{$value.url}" class="pure-menu-link">{$value.title}</a> 38 <a
39 {$value.class=isset($value.class) ? $value.class . ' pure-menu-link' : 'pure-menu-link'}
40 {loop="$value"}
41 {if="$key!='html'"}
42 {$key}="{$value}"
43 {/if}
44 {/loop}>
45 {$value.html}
46 </a>
40 </li> 47 </li>
41 {/loop} 48 {/loop}
42 {if="isLoggedIn()"} 49 {if="isLoggedIn()"}
@@ -80,7 +87,7 @@
80 87
81<div id="header" class="pure-u-0 pure-u-lg-visible"> 88<div id="header" class="pure-u-0 pure-u-lg-visible">
82 <h1 id="header-title"> 89 <h1 id="header-title">
83 <a href="$titleLink"> 90 <a href="{$titleLink}">
84 {$shaarlititle} 91 {$shaarlititle}
85 </a> 92 </a>
86 </h1> 93 </h1>
@@ -116,9 +123,26 @@
116</div> 123</div>
117 124
118<div id="content"> 125<div id="content">
126 {loop="$plugins_header.fields_toolbar"}
127 <form
128 {loop="$value"}
129 {if="$key!='inputs'"}
130 {$key}="{$value}"
131 {/if}
132 {/loop}>
133 <div class="subheader-form open pure-u-0 pure-u-lg-visible pure-u-lg-1">
134 {loop="$value.inputs"}
135 <input
136 {loop="$value"}
137 {$key}="{$value}"
138 {/loop}>
139 {/loop}
140 </div>
141 </form>
142 {/loop}
119 {if="!isLoggedIn()"} 143 {if="!isLoggedIn()"}
120 <form method="post" name="loginform"> 144 <form method="post" name="loginform">
121 <div id="header-login-form"> 145 <div class="subheader-form" id="header-login-form">
122 <input type="text" name="login" placeholder="{'Username'|t}" tabindex="3"> 146 <input type="text" name="login" placeholder="{'Username'|t}" tabindex="3">
123 <input type="password" name="password" placeholder="{'Password'|t}" tabindex="5"> 147 <input type="password" name="password" placeholder="{'Password'|t}" tabindex="5">
124 <div class="remember-me"> 148 <div class="remember-me">
@@ -131,7 +155,6 @@
131 </div> 155 </div>
132 </form> 156 </form>
133 {/if} 157 {/if}
134
135{if="!empty($newVersion) || !empty($versionError)"} 158{if="!empty($newVersion) || !empty($versionError)"}
136 <div class="pure-g new-version-message pure-alert pure-alert-warning pure-alert-closable"> 159 <div class="pure-g new-version-message pure-alert pure-alert-warning pure-alert-closable">
137 <div class="pure-u-2-24"></div> 160 <div class="pure-u-2-24"></div>
diff --git a/tpl/default/tools.html b/tpl/default/tools.html
index 62ae278b..ae794ce9 100644
--- a/tpl/default/tools.html
+++ b/tpl/default/tools.html
@@ -45,11 +45,13 @@
45 </a> 45 </a>
46 </div> 46 </div>
47 47
48 48 {loop="$tools_plugin"}
49 <div class="tools-item">
50 {$value}
51 </div>
52 {/loop}
49 </div> 53 </div>
50 {loop="$tools_plugin"} 54
51 {$value}
52 {/loop}
53 55
54 <div class="clear"></div> 56 <div class="clear"></div>
55</div> 57</div>