diff options
author | ArthurHoaro <arthur@hoa.ro> | 2017-01-06 14:50:09 +0100 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2017-01-06 14:50:09 +0100 |
commit | b057607f1b8a242c5c0325ceaf7c963632b960aa (patch) | |
tree | ffcec7ca97bc9edc84d2a79d5d7cb9f37200cc50 | |
parent | 2bbf5d03ca47c9ce5bc88aabae6096f90f646cab (diff) | |
download | Shaarli-b057607f1b8a242c5c0325ceaf7c963632b960aa.tar.gz Shaarli-b057607f1b8a242c5c0325ceaf7c963632b960aa.tar.zst Shaarli-b057607f1b8a242c5c0325ceaf7c963632b960aa.zip |
A lot of minor improvements, cleanup, narrow mobile side blank spaces
-rw-r--r-- | tpl/default/404.html | 1 | ||||
-rw-r--r-- | tpl/default/addlink.html | 4 | ||||
-rw-r--r-- | tpl/default/changepassword.html | 4 | ||||
-rw-r--r-- | tpl/default/changetag.html | 7 | ||||
-rw-r--r-- | tpl/default/configure.html | 4 | ||||
-rw-r--r-- | tpl/default/css/shaarli.css | 209 | ||||
-rw-r--r-- | tpl/default/daily.html | 4 | ||||
-rw-r--r-- | tpl/default/editlink.html | 6 | ||||
-rw-r--r-- | tpl/default/export.html | 9 | ||||
-rw-r--r-- | tpl/default/import.html | 16 | ||||
-rw-r--r-- | tpl/default/install.html | 19 | ||||
-rw-r--r-- | tpl/default/js/shaarli.js | 9 | ||||
-rw-r--r-- | tpl/default/linklist.html | 86 | ||||
-rw-r--r-- | tpl/default/linklist.paging.html | 4 | ||||
-rw-r--r-- | tpl/default/loginform.html | 4 | ||||
-rw-r--r-- | tpl/default/page.header.html | 17 | ||||
-rw-r--r-- | tpl/default/picwall.html | 4 | ||||
-rw-r--r-- | tpl/default/pluginsadmin.html | 12 | ||||
-rw-r--r-- | tpl/default/tagcloud.html | 4 | ||||
-rw-r--r-- | tpl/default/tools.html | 20 |
20 files changed, 291 insertions, 152 deletions
diff --git a/tpl/default/404.html b/tpl/default/404.html index edc5ac4b..2de6b6da 100644 --- a/tpl/default/404.html +++ b/tpl/default/404.html | |||
@@ -6,7 +6,6 @@ | |||
6 | <body> | 6 | <body> |
7 | <div id="pageheader"> | 7 | <div id="pageheader"> |
8 | {include="page.header"} | 8 | {include="page.header"} |
9 | </div> | ||
10 | <div class="center" id="page404"> | 9 | <div class="center" id="page404"> |
11 | <h2>{'Sorry, nothing to see here.'|t}</h2> | 10 | <h2>{'Sorry, nothing to see here.'|t}</h2> |
12 | <img src="img/sad_star.png"> | 11 | <img src="img/sad_star.png"> |
diff --git a/tpl/default/addlink.html b/tpl/default/addlink.html index 2d66c381..2f956e06 100644 --- a/tpl/default/addlink.html +++ b/tpl/default/addlink.html | |||
@@ -6,8 +6,8 @@ | |||
6 | <body> | 6 | <body> |
7 | {include="page.header"} | 7 | {include="page.header"} |
8 | <div class="pure-g"> | 8 | <div class="pure-g"> |
9 | <div class="pure-u-lg-1-3 pure-u-1-8"></div> | 9 | <div class="pure-u-lg-1-3 pure-u-1-24"></div> |
10 | <div id="addlink-form" class="page-form page-form-light pure-u-lg-1-3 pure-u-3-4"> | 10 | <div id="addlink-form" class="page-form page-form-light pure-u-lg-1-3 pure-u-22-24"> |
11 | <h2 class="window-title">{"Shaare a new link"|t}</h2> | 11 | <h2 class="window-title">{"Shaare a new link"|t}</h2> |
12 | <form method="GET" action="#" name="addform" class="addform"> | 12 | <form method="GET" action="#" name="addform" class="addform"> |
13 | <div> | 13 | <div> |
diff --git a/tpl/default/changepassword.html b/tpl/default/changepassword.html index 7196cccd..2d15c92a 100644 --- a/tpl/default/changepassword.html +++ b/tpl/default/changepassword.html | |||
@@ -6,8 +6,8 @@ | |||
6 | <body> | 6 | <body> |
7 | {include="page.header"} | 7 | {include="page.header"} |
8 | <div class="pure-g"> | 8 | <div class="pure-g"> |
9 | <div class="pure-u-lg-1-3 pure-u-1-8"></div> | 9 | <div class="pure-u-lg-1-3 pure-u-1-24"></div> |
10 | <div id="addlink-form" class="page-form page-form-light pure-u-lg-1-3 pure-u-3-4"> | 10 | <div id="addlink-form" class="page-form page-form-light pure-u-lg-1-3 pure-u-22-24"> |
11 | <h2 class="window-title">{"Change password"|t}</h2> | 11 | <h2 class="window-title">{"Change password"|t}</h2> |
12 | <form method="POST" action="#" name="changepasswordform" id="changepasswordform"> | 12 | <form method="POST" action="#" name="changepasswordform" id="changepasswordform"> |
13 | <div> | 13 | <div> |
diff --git a/tpl/default/changetag.html b/tpl/default/changetag.html index 5d5d8c96..4f98baec 100644 --- a/tpl/default/changetag.html +++ b/tpl/default/changetag.html | |||
@@ -6,8 +6,8 @@ | |||
6 | <body> | 6 | <body> |
7 | {include="page.header"} | 7 | {include="page.header"} |
8 | <div class="pure-g"> | 8 | <div class="pure-g"> |
9 | <div class="pure-u-lg-1-3 pure-u-1-8"></div> | 9 | <div class="pure-u-lg-1-3 pure-u-1-24"></div> |
10 | <div id="addlink-form" class="page-form page-form-light pure-u-lg-1-3 pure-u-3-4"> | 10 | <div id="addlink-form" class="page-form page-form-light pure-u-lg-1-3 pure-u-22-24"> |
11 | <h2 class="window-title">{"Manage tags"|t}</h2> | 11 | <h2 class="window-title">{"Manage tags"|t}</h2> |
12 | <form method="POST" action="#" name="changetag" id="changetag"> | 12 | <form method="POST" action="#" name="changetag" id="changetag"> |
13 | <div> | 13 | <div> |
@@ -28,8 +28,7 @@ | |||
28 | <input type="hidden" name="token" value="{$token}"> | 28 | <input type="hidden" name="token" value="{$token}"> |
29 | <div> | 29 | <div> |
30 | <input type="submit" value="{'Rename'|t}" name="renametag"> | 30 | <input type="submit" value="{'Rename'|t}" name="renametag"> |
31 | <span class="pure-u-0 pure-u-lg-visible">or</span> | 31 | <input type="submit" value="{'Delete'|t}" name="deletetag" class="button-red"> |
32 | <input type="submit" value="{'Delete'|t}" name="deletetag"> | ||
33 | </div> | 32 | </div> |
34 | </form> | 33 | </form> |
35 | </div> | 34 | </div> |
diff --git a/tpl/default/configure.html b/tpl/default/configure.html index e872a4d2..b959a91b 100644 --- a/tpl/default/configure.html +++ b/tpl/default/configure.html | |||
@@ -13,8 +13,8 @@ | |||
13 | 13 | ||
14 | <form method="POST" action="#" name="configform" id="configform"> | 14 | <form method="POST" action="#" name="configform" id="configform"> |
15 | <div class="pure-g"> | 15 | <div class="pure-g"> |
16 | <div class="pure-u-lg-1-6 pure-u-1-8"></div> | 16 | <div class="pure-u-lg-1-6 pure-u-1-24"></div> |
17 | <div class="pure-u-lg-2-3 pure-u-3-4 page-form page-form-complete"> | 17 | <div class="pure-u-lg-2-3 pure-u-22-24 page-form page-form-complete"> |
18 | <h2 class="window-title">{'Configure'|t}</h2> | 18 | <h2 class="window-title">{'Configure'|t}</h2> |
19 | <div class="pure-g"> | 19 | <div class="pure-g"> |
20 | <div class="pure-u-lg-{$ratioLabel} pure-u-1"> | 20 | <div class="pure-u-lg-{$ratioLabel} pure-u-1"> |
diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css index ae0d5807..fafe7351 100644 --- a/tpl/default/css/shaarli.css +++ b/tpl/default/css/shaarli.css | |||
@@ -175,46 +175,70 @@ pre { | |||
175 | font-size: 0.8em; | 175 | font-size: 0.8em; |
176 | } | 176 | } |
177 | 177 | ||
178 | #search { | 178 | #search, #search-linklist { |
179 | position: fixed; | 179 | text-align: center; |
180 | width: 100%; | 180 | width: 100%; |
181 | } | 181 | } |
182 | 182 | ||
183 | #search input[type="text"] { | 183 | #search input[type="text"], #search-linklist input[type="text"] { |
184 | width: 250px; | 184 | padding: 0 5px; |
185 | height: 30px; | ||
186 | width: 260px; | ||
187 | background: #f5f5f5; | ||
188 | border: medium none currentColor; | ||
189 | box-shadow: 0 1px 0 rgba(255, 255, 255, 0.078), 0 1px 1px rgba(0, 0, 0, 0.298) inset; | ||
190 | border-radius: 2px; | ||
185 | color: #252525; | 191 | color: #252525; |
186 | } | 192 | } |
187 | 193 | ||
188 | /* because chrome */ | 194 | /* because chrome */ |
189 | #search input[type="text"]::-webkit-input-placeholder { | 195 | #search input[type="text"]::-webkit-input-placeholder, |
190 | color: #252525; | 196 | #search-linklist input[type="text"]::-webkit-input-placeholder { |
197 | color: #777777; | ||
191 | } | 198 | } |
192 | 199 | ||
193 | #search button { | 200 | #search button, |
201 | #search-linklist button { | ||
194 | background: transparent; | 202 | background: transparent; |
195 | border: none; | 203 | border: none; |
204 | } | ||
205 | |||
206 | #search button { | ||
196 | color: #f5f5f5; | 207 | color: #f5f5f5; |
197 | } | 208 | } |
198 | 209 | ||
210 | #search-linklist button { | ||
211 | color: #252525; | ||
212 | } | ||
213 | |||
199 | #search button:hover { | 214 | #search button:hover { |
200 | color: #fff; | 215 | color: #fff; |
201 | } | 216 | } |
202 | 217 | ||
218 | #search-linklist button:hover { | ||
219 | color: #000; | ||
220 | } | ||
221 | |||
222 | #search-linklist { | ||
223 | padding: 5px 0; | ||
224 | } | ||
225 | |||
203 | @media screen and (min-width: 64em) { | 226 | @media screen and (min-width: 64em) { |
204 | #search .searchform { | 227 | #search .searchform, |
228 | #search-linklist .searchform { | ||
205 | margin-right: 25px; | 229 | margin-right: 25px; |
206 | text-align: right; | 230 | text-align: right; |
207 | } | 231 | } |
208 | 232 | ||
209 | #search .tagfilter { | 233 | #search .tagfilter, |
234 | #search-linklist .tagfilter { | ||
210 | margin-left: 25px; | 235 | margin-left: 25px; |
211 | text-align: left; | 236 | text-align: left; |
212 | } | 237 | } |
213 | } | 238 | } |
214 | @media screen and (max-width: 64em) { | 239 | @media screen and (max-width: 64em) { |
215 | #search { | 240 | #search, #search * { |
216 | position: relative; | 241 | visibility: hidden; |
217 | height: 60px; | ||
218 | } | 242 | } |
219 | } | 243 | } |
220 | 244 | ||
@@ -239,11 +263,6 @@ pre { | |||
239 | visibility: visible; | 263 | visibility: visible; |
240 | } | 264 | } |
241 | } | 265 | } |
242 | @media screen and (max-width: 64em) { | ||
243 | #search.subheader-form, .subheader-form.open * { | ||
244 | visibility: visible; | ||
245 | } | ||
246 | } | ||
247 | 266 | ||
248 | .subheader-form input[type="text"], .subheader-form input[type="password"], .subheader-form .remember-me { | 267 | .subheader-form input[type="text"], .subheader-form input[type="password"], .subheader-form .remember-me { |
249 | margin: 0 0 5px 0; | 268 | margin: 0 0 5px 0; |
@@ -252,7 +271,7 @@ pre { | |||
252 | width: 20%; | 271 | width: 20%; |
253 | background: #f5f5f5; | 272 | background: #f5f5f5; |
254 | border: medium none currentColor; | 273 | border: medium none currentColor; |
255 | border-radius: 5px; | 274 | border-radius: 2px; |
256 | box-shadow: 0 1px 0 rgba(255, 255, 255, 0.078), 0 1px 4px rgba(0, 0, 0, 0.298) inset; | 275 | box-shadow: 0 1px 0 rgba(255, 255, 255, 0.078), 0 1px 4px rgba(0, 0, 0, 0.298) inset; |
257 | color: #252525; | 276 | color: #252525; |
258 | } | 277 | } |
@@ -316,6 +335,46 @@ pre { | |||
316 | } | 335 | } |
317 | 336 | ||
318 | /** | 337 | /** |
338 | * Plugins additional forms | ||
339 | */ | ||
340 | .toolbar-plugin { | ||
341 | margin: 5px 0; | ||
342 | text-align: center; | ||
343 | } | ||
344 | |||
345 | .toolbar-plugin input[type="text"] { | ||
346 | padding: 0 5px; | ||
347 | height: 30px; | ||
348 | width: 300px; | ||
349 | background: #f5f5f5; | ||
350 | border: medium none currentColor; | ||
351 | box-shadow: 0 1px 0 rgba(255, 255, 255, 0.078), 0 1px 1px rgba(0, 0, 0, 0.298) inset; | ||
352 | border-radius: 2px; | ||
353 | color: #252525; | ||
354 | } | ||
355 | |||
356 | /* because chrome */ | ||
357 | .toolbar-plugin input[type="text"]::-webkit-input-placeholder { | ||
358 | color: #777777; | ||
359 | } | ||
360 | |||
361 | .toolbar-plugin input[type="submit"] { | ||
362 | padding: 0 10px; | ||
363 | height: 30px; | ||
364 | background: #f5f5f5; | ||
365 | border: medium none currentColor; | ||
366 | border-radius: 2px; | ||
367 | color: #252525; | ||
368 | } | ||
369 | |||
370 | @media screen and (max-width: 64em) { | ||
371 | .toolbar-plugin input[type="text"] { | ||
372 | width: 70%; | ||
373 | |||
374 | } | ||
375 | } | ||
376 | |||
377 | /** | ||
319 | * CONTENT - LINKLIST PAGING | 378 | * CONTENT - LINKLIST PAGING |
320 | * 64em -> lg | 379 | * 64em -> lg |
321 | */ | 380 | */ |
@@ -369,14 +428,18 @@ pre { | |||
369 | background: #f5f5f5; | 428 | background: #f5f5f5; |
370 | } | 429 | } |
371 | 430 | ||
431 | .linksperpage a, .linksperpage input[type="text"] { | ||
432 | display: inline-block; | ||
433 | width: 20px; | ||
434 | text-align: center; | ||
435 | } | ||
436 | |||
372 | .linksperpage form { | 437 | .linksperpage form { |
373 | display: inline; | 438 | display: inline; |
374 | margin: 0 10px 0 0; | ||
375 | } | 439 | } |
376 | 440 | ||
377 | .linksperpage input[type="text"] { | 441 | .linksperpage input[type="text"] { |
378 | width: 28px; | 442 | height: 15px; |
379 | height: 12px; | ||
380 | margin: 0; | 443 | margin: 0; |
381 | padding: 3px 5px 3px 8px; | 444 | padding: 3px 5px 3px 8px; |
382 | background: #f5f5f5; | 445 | background: #f5f5f5; |
@@ -400,9 +463,22 @@ pre { | |||
400 | } | 463 | } |
401 | 464 | ||
402 | .linklist-item-title { | 465 | .linklist-item-title { |
466 | position: relative; | ||
403 | background: #f5f5f5; | 467 | background: #f5f5f5; |
404 | } | 468 | } |
405 | 469 | ||
470 | .linklist-item.private .linklist-item-title::before { | ||
471 | position: absolute; | ||
472 | left: 3px; | ||
473 | top: 0; | ||
474 | display: block; | ||
475 | content:""; | ||
476 | background: #F89406; | ||
477 | height: 95%; | ||
478 | width: 3px; | ||
479 | margin-top: 3px; | ||
480 | } | ||
481 | |||
406 | .linklist-item-title h2 { | 482 | .linklist-item-title h2 { |
407 | padding: 3px 10px 0 10px; | 483 | padding: 3px 10px 0 10px; |
408 | line-height: 25px; | 484 | line-height: 25px; |
@@ -417,6 +493,7 @@ pre { | |||
417 | } | 493 | } |
418 | 494 | ||
419 | .linklist-item-title .linklist-link { | 495 | .linklist-item-title .linklist-link { |
496 | font-size: 1.1em; | ||
420 | color: #1b926c; | 497 | color: #1b926c; |
421 | } | 498 | } |
422 | 499 | ||
@@ -454,6 +531,12 @@ pre { | |||
454 | padding: 5px; | 531 | padding: 5px; |
455 | } | 532 | } |
456 | 533 | ||
534 | .linklist-item-editbuttons * { | ||
535 | display: block; | ||
536 | float: left; | ||
537 | margin: 0 1px; | ||
538 | } | ||
539 | |||
457 | .linklist-item-editbuttons a { | 540 | .linklist-item-editbuttons a { |
458 | font-size: 1em; | 541 | font-size: 1em; |
459 | } | 542 | } |
@@ -469,6 +552,7 @@ pre { | |||
469 | } | 552 | } |
470 | 553 | ||
471 | .linklist-item-description { | 554 | .linklist-item-description { |
555 | position: relative; | ||
472 | padding: 10px; | 556 | padding: 10px; |
473 | background: #f5f5f5; | 557 | background: #f5f5f5; |
474 | font-family: Roboto Slab, Arial, sans-serif; | 558 | font-family: Roboto Slab, Arial, sans-serif; |
@@ -476,6 +560,19 @@ pre { | |||
476 | color: #252525; | 560 | color: #252525; |
477 | } | 561 | } |
478 | 562 | ||
563 | .linklist-item.private .linklist-item-description::before { | ||
564 | position: absolute; | ||
565 | left: 3px; | ||
566 | top: 0; | ||
567 | display: block; | ||
568 | content:""; | ||
569 | background: #F89406; | ||
570 | height: 95%; | ||
571 | width: 3px; | ||
572 | z-index: 9999; | ||
573 | #margin: 0; | ||
574 | } | ||
575 | |||
479 | .linklist-item-description a { | 576 | .linklist-item-description a { |
480 | text-decoration: none; | 577 | text-decoration: none; |
481 | color: #1b926c; | 578 | color: #1b926c; |
@@ -496,13 +593,13 @@ pre { | |||
496 | } | 593 | } |
497 | 594 | ||
498 | .linklist-item-infos { | 595 | .linklist-item-infos { |
499 | padding: 5px 5px 0 5px; | 596 | padding: 8px 8px 5px 8px; |
500 | background: #ddd; | 597 | background: #ddd; |
501 | color: #252525; | 598 | color: #252525; |
502 | } | 599 | } |
503 | 600 | ||
504 | .linklist-item-infos a { | 601 | .linklist-item-infos a { |
505 | color: #505050; | 602 | color: #252525; |
506 | text-decoration: none; | 603 | text-decoration: none; |
507 | } | 604 | } |
508 | 605 | ||
@@ -511,17 +608,14 @@ pre { | |||
511 | } | 608 | } |
512 | 609 | ||
513 | .linklist-item-infos .linklist-item-tags { | 610 | .linklist-item-infos .linklist-item-tags { |
514 | margin: 0 0 5px 0; | ||
515 | font-size: 0.8em; | 611 | font-size: 0.8em; |
516 | } | 612 | } |
517 | 613 | ||
518 | .linklist-item-infos .label-tag { | 614 | .linklist-item-infos .label-tag { |
519 | border: 1px solid #505050; | ||
520 | font-size: 0.9em; | 615 | font-size: 0.9em; |
521 | } | 616 | } |
522 | 617 | ||
523 | .linklist-item-infos .label-tag:hover { | 618 | .linklist-item-infos .label-tag:hover { |
524 | border: 1px solid #000; | ||
525 | } | 619 | } |
526 | 620 | ||
527 | .linklist-item-infos-dateblock { | 621 | .linklist-item-infos-dateblock { |
@@ -541,6 +635,17 @@ pre { | |||
541 | font-size: 0.8em; | 635 | font-size: 0.8em; |
542 | } | 636 | } |
543 | 637 | ||
638 | .linklist-item-infos .mobile-buttons { | ||
639 | text-align: right; | ||
640 | } | ||
641 | |||
642 | .linklist-item-infos .linklist-plugin-icon { | ||
643 | display: inline-block; | ||
644 | margin: 0 2px; | ||
645 | width: 16px; | ||
646 | height: 16px; | ||
647 | } | ||
648 | |||
544 | /** 64em -> lg **/ | 649 | /** 64em -> lg **/ |
545 | @media screen and (max-width: 64em) { | 650 | @media screen and (max-width: 64em) { |
546 | .linklist-item-infos-url { | 651 | .linklist-item-infos-url { |
@@ -576,10 +681,10 @@ pre { | |||
576 | */ | 681 | */ |
577 | .page-form { | 682 | .page-form { |
578 | margin: 20px 0 0 0; | 683 | margin: 20px 0 0 0; |
579 | padding: 0 10px 0 10px; | ||
580 | background: #f5f5f5; | 684 | background: #f5f5f5; |
581 | box-shadow: 1px 1px 2px #797979; | 685 | box-shadow: 1px 1px 2px #797979; |
582 | color: #252525; | 686 | color: #252525; |
687 | overflow: hidden; | ||
583 | } | 688 | } |
584 | 689 | ||
585 | .page-form .window-title { | 690 | .page-form .window-title { |
@@ -609,16 +714,22 @@ pre { | |||
609 | font-weight: bold; | 714 | font-weight: bold; |
610 | } | 715 | } |
611 | 716 | ||
717 | .page-form p { | ||
718 | padding: 0 10px; | ||
719 | margin: 0; | ||
720 | } | ||
721 | |||
612 | .page-form input[type="text"], | 722 | .page-form input[type="text"], |
613 | .page-form input[type="password"], | 723 | .page-form input[type="password"], |
614 | .page-form textarea { | 724 | .page-form textarea { |
725 | box-sizing: border-box; | ||
615 | margin: 10px 0; | 726 | margin: 10px 0; |
616 | padding: 5px 5px 3px 15px; | 727 | padding: 5px 5px 3px 15px; |
617 | height: 30px; | 728 | height: 35px; |
618 | width: 80%; | 729 | width: 90%; |
619 | background: #f5f5f5; | 730 | background: #ebebeb; |
620 | border: medium none currentColor; | 731 | border: medium none currentColor; |
621 | border-radius: 5px; | 732 | border-radius: 2px; |
622 | box-shadow: 0 1px 0 rgba(255, 255, 255, 0.078), 0 1px 4px rgba(0, 0, 0, 0.298) inset; | 733 | box-shadow: 0 1px 0 rgba(255, 255, 255, 0.078), 0 1px 4px rgba(0, 0, 0, 0.298) inset; |
623 | color: #252525; | 734 | color: #252525; |
624 | } | 735 | } |
@@ -634,7 +745,7 @@ pre { | |||
634 | /* because chrome */ | 745 | /* because chrome */ |
635 | .page-form input[type="text"]::-webkit-input-placeholder, | 746 | .page-form input[type="text"]::-webkit-input-placeholder, |
636 | .page-form input[type="password"]::-webkit-input-placeholder { | 747 | .page-form input[type="password"]::-webkit-input-placeholder { |
637 | color: #252525; | 748 | color: #777777; |
638 | } | 749 | } |
639 | 750 | ||
640 | .page-form input[type="submit"] { | 751 | .page-form input[type="submit"] { |
@@ -648,6 +759,11 @@ pre { | |||
648 | color: #f5f5f5; | 759 | color: #f5f5f5; |
649 | } | 760 | } |
650 | 761 | ||
762 | |||
763 | .page-form input[type="submit"].button-red { | ||
764 | background: #ac2925; | ||
765 | } | ||
766 | |||
651 | .page-form select { | 767 | .page-form select { |
652 | color: #252525; | 768 | color: #252525; |
653 | } | 769 | } |
@@ -704,10 +820,9 @@ pre { | |||
704 | } | 820 | } |
705 | 821 | ||
706 | .page-form section { | 822 | .page-form section { |
707 | margin-top: 20px; | 823 | margin: 10px 0 25px 0; |
708 | } | 824 | } |
709 | 825 | ||
710 | |||
711 | .page-form table { | 826 | .page-form table { |
712 | margin: auto; | 827 | margin: auto; |
713 | width: 90%; | 828 | width: 90%; |
@@ -715,12 +830,13 @@ pre { | |||
715 | 830 | ||
716 | .page-form table .order { | 831 | .page-form table .order { |
717 | text-decoration: none; | 832 | text-decoration: none; |
833 | color: #252525; | ||
718 | } | 834 | } |
719 | 835 | ||
720 | .page-form table, .page-form th, .page-form td { | 836 | .page-form table, .page-form th, .page-form td { |
721 | border-width: 1px 0; | 837 | border-width: 1px 0; |
722 | border-style: solid; | 838 | border-style: solid; |
723 | border-color: #b0ddce; | 839 | border-color: #aaaaaa; |
724 | } | 840 | } |
725 | 841 | ||
726 | .page-form th, .page-form td { | 842 | .page-form th, .page-form td { |
@@ -730,7 +846,7 @@ pre { | |||
730 | 846 | ||
731 | /* Awesomeplete fix */ | 847 | /* Awesomeplete fix */ |
732 | .page-form .awesomplete { | 848 | .page-form .awesomplete { |
733 | width: 80%; | 849 | width: 90%; |
734 | } | 850 | } |
735 | 851 | ||
736 | .page-form .awesomplete input { | 852 | .page-form .awesomplete input { |
@@ -852,7 +968,6 @@ pre { | |||
852 | } | 968 | } |
853 | } | 969 | } |
854 | 970 | ||
855 | |||
856 | /** | 971 | /** |
857 | * IMPORT | 972 | * IMPORT |
858 | */ | 973 | */ |
@@ -882,13 +997,14 @@ pre { | |||
882 | */ | 997 | */ |
883 | #picwall_container { | 998 | #picwall_container { |
884 | margin: 0 10px 10px 10px; | 999 | margin: 0 10px 10px 10px; |
885 | color: #fff; | 1000 | color: #252525; |
886 | background-color: #000; | 1001 | background-color: #f5f5f5; |
887 | clear: both; | 1002 | clear: both; |
888 | } | 1003 | } |
889 | 1004 | ||
890 | .picwall_pictureframe { | 1005 | .picwall_pictureframe { |
891 | background-color: #000; | 1006 | margin: 2px; |
1007 | background-color: #f5f5f5; | ||
892 | z-index: 5; | 1008 | z-index: 5; |
893 | position: relative; | 1009 | position: relative; |
894 | display: table-cell; | 1010 | display: table-cell; |
@@ -924,6 +1040,7 @@ pre { | |||
924 | /* CSS to show title when hovering an image - no javascript required. */ | 1040 | /* CSS to show title when hovering an image - no javascript required. */ |
925 | .picwall_pictureframe span.info { | 1041 | .picwall_pictureframe span.info { |
926 | display: none; | 1042 | display: none; |
1043 | font-family: Arial, sans-serif; | ||
927 | } | 1044 | } |
928 | 1045 | ||
929 | .picwall_pictureframe:hover span.info { | 1046 | .picwall_pictureframe:hover span.info { |
@@ -932,16 +1049,12 @@ pre { | |||
932 | top: 0; | 1049 | top: 0; |
933 | left: 0; | 1050 | left: 0; |
934 | width: 90px; | 1051 | width: 90px; |
1052 | height: 90px; | ||
935 | font-weight: bold; | 1053 | font-weight: bold; |
936 | font-size: 8pt; | 1054 | font-size: 9pt; |
937 | color: #fff; | 1055 | color: #f5f5f5; |
938 | text-align: left; | 1056 | text-align: left; |
939 | background-color: transparent; | 1057 | background-color: rgba(0, 0, 0, 0.8); |
940 | background-color: rgba(0, 0, 0, 0.4); | ||
941 | /* FF3+, Saf3+, Opera 10.10+, Chrome, IE9 */ | ||
942 | filter: progid: DXImageTransform.Microsoft.gradient(startColorstr=#66000000, endColorstr=#66000000); | ||
943 | /* IE6IE9 */ | ||
944 | text-shadow: 2px 2px 1px #000000; | ||
945 | } | 1058 | } |
946 | 1059 | ||
947 | /** | 1060 | /** |
diff --git a/tpl/default/daily.html b/tpl/default/daily.html index d4c11f6f..d8c91078 100644 --- a/tpl/default/daily.html +++ b/tpl/default/daily.html | |||
@@ -7,8 +7,8 @@ | |||
7 | {include="page.header"} | 7 | {include="page.header"} |
8 | 8 | ||
9 | <div class="pure-g"> | 9 | <div class="pure-g"> |
10 | <div class="pure-u-lg-1-6 pure-u-1-8"></div> | 10 | <div class="pure-u-lg-1-6 pure-u-1-24"></div> |
11 | <div class="pure-u-lg-2-3 pure-u-3-4 page-form page-visitor" id="daily"> | 11 | <div class="pure-u-lg-2-3 pure-u-22-24 page-form page-visitor" id="daily"> |
12 | <h2 class="window-title"> | 12 | <h2 class="window-title"> |
13 | {'The Daily Shaarli'|t} | 13 | {'The Daily Shaarli'|t} |
14 | <a href="?do=dailyrss" title="{'1 RSS entry per day'|t}"><i class="fa fa-rss"></i></a> | 14 | <a href="?do=dailyrss" title="{'1 RSS entry per day'|t}"><i class="fa fa-rss"></i></a> |
diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html index 1708bee1..6b480c29 100644 --- a/tpl/default/editlink.html +++ b/tpl/default/editlink.html | |||
@@ -10,8 +10,8 @@ | |||
10 | <div class="center">Shaare to: {$shaarlititle}</div> | 10 | <div class="center">Shaare to: {$shaarlititle}</div> |
11 | {/if} | 11 | {/if} |
12 | <div id="editlinkform" class="pure-g"> | 12 | <div id="editlinkform" class="pure-g"> |
13 | <div class="pure-u-lg-1-5 pure-u-1-8"></div> | 13 | <div class="pure-u-lg-1-5 pure-u-1-24"></div> |
14 | <form method="post" name="linkform" class="page-form pure-u-lg-3-5 pure-u-3-4 page-form page-form-light"> | 14 | <form method="post" name="linkform" class="page-form pure-u-lg-3-5 pure-u-22-24 page-form page-form-light"> |
15 | <h2 class="window-title">{'Shaare'|t}</h2> | 15 | <h2 class="window-title">{'Shaare'|t}</h2> |
16 | <input type="hidden" name="lf_linkdate" value="{$link.linkdate}"> | 16 | <input type="hidden" name="lf_linkdate" value="{$link.linkdate}"> |
17 | {if="isset($link.id)"} | 17 | {if="isset($link.id)"} |
@@ -61,7 +61,7 @@ | |||
61 | <div> | 61 | <div> |
62 | <input type="submit" value="{'Save'|t}" name="save_edit"> | 62 | <input type="submit" value="{'Save'|t}" name="save_edit"> |
63 | {if="!$link_is_new"} | 63 | {if="!$link_is_new"} |
64 | <input type="submit" value="{'Delete'|t}" name="delete_link" class="delete-link"> | 64 | <input type="submit" value="{'Delete'|t}" name="delete_link" class="button-red"> |
65 | {/if} | 65 | {/if} |
66 | </div> | 66 | </div> |
67 | 67 | ||
diff --git a/tpl/default/export.html b/tpl/default/export.html index e93f98a9..af1d6e33 100644 --- a/tpl/default/export.html +++ b/tpl/default/export.html | |||
@@ -6,15 +6,10 @@ | |||
6 | <body> | 6 | <body> |
7 | {include="page.header"} | 7 | {include="page.header"} |
8 | 8 | ||
9 | {$ratioLabel='5-12'} | ||
10 | {$ratioLabelMobile='7-8'} | ||
11 | {$ratioInput='7-12'} | ||
12 | {$ratioInputMobile='1-8'} | ||
13 | |||
14 | <form method="GET" action="#" name="exportform" id="exportform"> | 9 | <form method="GET" action="#" name="exportform" id="exportform"> |
15 | <div class="pure-g"> | 10 | <div class="pure-g"> |
16 | <div class="pure-u-lg-1-4 pure-u-1-8"></div> | 11 | <div class="pure-u-lg-1-4 pure-u-1-24"></div> |
17 | <div class="pure-u-lg-1-2 pure-u-3-4 page-form page-form-complete"> | 12 | <div class="pure-u-lg-1-2 pure-u-22-24 page-form page-form-complete"> |
18 | <div> | 13 | <div> |
19 | <h2 class="window-title">{"Export Database"|t}</h2> | 14 | <h2 class="window-title">{"Export Database"|t}</h2> |
20 | </div> | 15 | </div> |
diff --git a/tpl/default/import.html b/tpl/default/import.html index a524c3bc..e6e521e8 100644 --- a/tpl/default/import.html +++ b/tpl/default/import.html | |||
@@ -6,15 +6,10 @@ | |||
6 | <body> | 6 | <body> |
7 | {include="page.header"} | 7 | {include="page.header"} |
8 | 8 | ||
9 | {$ratioLabel='5-12'} | ||
10 | {$ratioLabelMobile='7-8'} | ||
11 | {$ratioInput='7-12'} | ||
12 | {$ratioInputMobile='1-8'} | ||
13 | |||
14 | <form method="POST" action="?do=import" enctype="multipart/form-data" name="uploadform" id="uploadform"> | 9 | <form method="POST" action="?do=import" enctype="multipart/form-data" name="uploadform" id="uploadform"> |
15 | <div class="pure-g"> | 10 | <div class="pure-g"> |
16 | <div class="pure-u-lg-1-4 pure-u-1-8"></div> | 11 | <div class="pure-u-lg-1-4 pure-u-1-24"></div> |
17 | <div class="pure-u-lg-1-2 pure-u-3-4 page-form page-form-complete"> | 12 | <div class="pure-u-lg-1-2 pure-u-22-24 page-form page-form-complete"> |
18 | <div> | 13 | <div> |
19 | <h2 class="window-title">{"Import Database"|t}</h2> | 14 | <h2 class="window-title">{"Import Database"|t}</h2> |
20 | </div> | 15 | </div> |
@@ -52,7 +47,10 @@ | |||
52 | <div class="pure-g"> | 47 | <div class="pure-g"> |
53 | <div class="pure-u-lg-1-3 pure-u-7-8"> | 48 | <div class="pure-u-lg-1-3 pure-u-7-8"> |
54 | <div class="form-label"> | 49 | <div class="form-label"> |
55 | <label for="overwrite"><span class="label-name">{'Overwrite existing bookmarks'|t}</span></label> | 50 | <label for="overwrite"> |
51 | <span class="label-name">{'Overwrite existing bookmarks'|t}</span><br> | ||
52 | <span class="label-desc">{'Duplicates based on URL'|t}</span> | ||
53 | </label> | ||
56 | </div> | 54 | </div> |
57 | </div> | 55 | </div> |
58 | <div class="pure-u-lg-2-3 pure-u-1-8"> | 56 | <div class="pure-u-lg-2-3 pure-u-1-8"> |
@@ -70,7 +68,7 @@ | |||
70 | </div> | 68 | </div> |
71 | <div class="pure-u-lg-2-3 pure-u-1"> | 69 | <div class="pure-u-lg-2-3 pure-u-1"> |
72 | <div class="form-input"> | 70 | <div class="form-input"> |
73 | <input type="text" name="default_tags" id="default_tags"> | 71 | <input type="text" name="default_tags" id="default_tags" placeholder="{'Tag'|t}"> |
74 | </div> | 72 | </div> |
75 | </div> | 73 | </div> |
76 | </div> | 74 | </div> |
diff --git a/tpl/default/install.html b/tpl/default/install.html index aa606e92..0bd8a635 100644 --- a/tpl/default/install.html +++ b/tpl/default/install.html | |||
@@ -4,21 +4,15 @@ | |||
4 | {include="includes"} | 4 | {include="includes"} |
5 | </head> | 5 | </head> |
6 | <body> | 6 | <body> |
7 | <div id="header" class="pure-u-0 pure-u-lg-visible"> | ||
8 | <h1 id="header-title"> | ||
9 | <a>Shaarli</a> | ||
10 | </h1> | ||
11 | </div> | ||
12 | <div class="clear"></div> | ||
13 | 7 | ||
14 | {$ratioLabel='1-4'} | 8 | {$ratioLabel='1-4'} |
15 | {$ratioInput='3-4'} | 9 | {$ratioInput='3-4'} |
16 | 10 | ||
17 | <form method="POST" action="#" name="installform" id="installform"> | 11 | <form method="POST" action="#" name="installform" id="installform"> |
18 | <div class="pure-g"> | 12 | <div class="pure-g"> |
19 | <div class="pure-u-lg-1-6 pure-u-1-8"></div> | 13 | <div class="pure-u-lg-1-6 pure-u-1-24"></div> |
20 | <div class="pure-u-lg-2-3 pure-u-3-4 page-form page-form-complete"> | 14 | <div class="pure-u-lg-2-3 pure-u-22-24 page-form page-form-complete"> |
21 | <h2 class="window-title">{'Install'|t}</h2> | 15 | <h2 class="window-title">{'Install Shaarli'|t}</h2> |
22 | 16 | ||
23 | <div class="center"> | 17 | <div class="center"> |
24 | {'It looks like it\'s the first time you run Shaarli. Please configure it.'|t} | 18 | {'It looks like it\'s the first time you run Shaarli. Please configure it.'|t} |
@@ -87,7 +81,7 @@ | |||
87 | </div> | 81 | </div> |
88 | 82 | ||
89 | <div class="pure-g"> | 83 | <div class="pure-g"> |
90 | <div class="pure-u-lg-{$ratioLabel} pure-u-1"> | 84 | <div class="pure-u-lg-{$ratioLabel} pure-u-7-8"> |
91 | <div class="form-label"> | 85 | <div class="form-label"> |
92 | <label for="update"> | 86 | <label for="update"> |
93 | <span class="label-name">{'Check updates'|t}</span><br> | 87 | <span class="label-name">{'Check updates'|t}</span><br> |
@@ -97,16 +91,15 @@ | |||
97 | </label> | 91 | </label> |
98 | </div> | 92 | </div> |
99 | </div> | 93 | </div> |
100 | <div class="pure-u-lg-{$ratioInput} pure-u-1 "> | 94 | <div class="pure-u-lg-{$ratioInput} pure-u-1-8"> |
101 | <div class="form-input"> | 95 | <div class="form-input"> |
102 | <input type="checkbox" name="updateCheck" id="update" checked="checked"> | 96 | <input type="checkbox" name="updateCheck" id="update" checked="checked"> |
103 | |||
104 | </div> | 97 | </div> |
105 | </div> | 98 | </div> |
106 | </div> | 99 | </div> |
107 | 100 | ||
108 | <div class="center"> | 101 | <div class="center"> |
109 | <input type="submit" value="{'Create config'|t}" name="Save"> | 102 | <input type="submit" value="{'Install'|t}" name="Save"> |
110 | </div> | 103 | </div> |
111 | </div> | 104 | </div> |
112 | </div> | 105 | </div> |
diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js index 01e22022..287d157c 100644 --- a/tpl/default/js/shaarli.js +++ b/tpl/default/js/shaarli.js | |||
@@ -152,19 +152,10 @@ if (autofocusElements != null) { | |||
152 | } | 152 | } |
153 | 153 | ||
154 | /** | 154 | /** |
155 | * Hide search bar | ||
156 | */ | ||
157 | var search = document.getElementById('search'); | ||
158 | if (search != null) { | ||
159 | removeClass(search, 'open'); | ||
160 | } | ||
161 | |||
162 | /** | ||
163 | * Handle sub menus/forms | 155 | * Handle sub menus/forms |
164 | */ | 156 | */ |
165 | var openers = document.getElementsByClassName('subheader-opener'); | 157 | var openers = document.getElementsByClassName('subheader-opener'); |
166 | if (openers != null) { | 158 | if (openers != null) { |
167 | console.log(openers); | ||
168 | [].forEach.call(openers, function(opener) { | 159 | [].forEach.call(openers, function(opener) { |
169 | opener.addEventListener('click', function(event) { | 160 | opener.addEventListener('click', function(event) { |
170 | event.preventDefault(); | 161 | event.preventDefault(); |
diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index f1f67eea..459a7c33 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html | |||
@@ -6,6 +6,49 @@ | |||
6 | <body> | 6 | <body> |
7 | {include="page.header"} | 7 | {include="page.header"} |
8 | 8 | ||
9 | <div id="search-linklist"> | ||
10 | <div class="pure-g"> | ||
11 | <div class="pure-u-1 pure-u-lg-1-2"> | ||
12 | <form method="GET" class="searchform" name="searchform"> | ||
13 | <input type="text" tabindex="1" name="searchterm" placeholder="{'Search text'|t}" | ||
14 | {if="!empty($search_term)"} | ||
15 | value="{$search_term}" | ||
16 | {/if} | ||
17 | > | ||
18 | <button type="submit" class="search-button"><i class="fa fa-search"></i></button> | ||
19 | </form> | ||
20 | </div> | ||
21 | <div class="pure-u-1 pure-u-lg-1-2"> | ||
22 | <form method="GET" class="tagfilter" name="tagfilter"> | ||
23 | <input type="text" tabindex="2" name="searchtags" placeholder="{'Filter by tag'|t}" | ||
24 | {if="!empty($search_tags)"} | ||
25 | value="{$search_tags}" | ||
26 | {/if} | ||
27 | autocomplete="off" data-multiple data-minChars="1" | ||
28 | data-list="{loop="$tags"}{$key}, {/loop}" | ||
29 | > | ||
30 | <button type="submit" class="search-button"><i class="fa fa-search"></i></button> | ||
31 | </form> | ||
32 | </div> | ||
33 | </div> | ||
34 | </div> | ||
35 | |||
36 | {loop="$plugins_header.fields_toolbar"} | ||
37 | <form | ||
38 | {loop="$value.attr"} | ||
39 | {$key}="{$value}" | ||
40 | {/loop}> | ||
41 | <div class="toolbar-plugin pure-u-lg-1"> | ||
42 | {loop="$value.inputs"} | ||
43 | <input | ||
44 | {loop="$value"} | ||
45 | {$key}="{$value}" | ||
46 | {/loop}> | ||
47 | {/loop} | ||
48 | </div> | ||
49 | </form> | ||
50 | {/loop} | ||
51 | |||
9 | <div id="linklist"> | 52 | <div id="linklist"> |
10 | 53 | ||
11 | <div id="linkcount" class="center"> | 54 | <div id="linkcount" class="center"> |
@@ -99,10 +142,12 @@ | |||
99 | {if="$value.tags"} | 142 | {if="$value.tags"} |
100 | <div class="linklist-item-tags"> | 143 | <div class="linklist-item-tags"> |
101 | <i class="fa fa-tags"></i> | 144 | <i class="fa fa-tags"></i> |
145 | {$tag_counter=count($value.taglist)} | ||
102 | {loop="value.taglist"} | 146 | {loop="value.taglist"} |
103 | <span class="label label-tag" title="Add tag"> | 147 | <span class="label label-tag" title="Add tag"> |
104 | <a href="?addtag={$value|urlencode}">{$value}</a> | 148 | <a href="?addtag={$value|urlencode}">{$value}</a> |
105 | </span> | 149 | </span> |
150 | {if="$tag_counter - 1 != $counter"}·{/if} | ||
106 | {/loop} | 151 | {/loop} |
107 | </div> | 152 | </div> |
108 | {/if} | 153 | {/if} |
@@ -121,23 +166,44 @@ | |||
121 | {'permalink'|t} | 166 | {'permalink'|t} |
122 | </a> | 167 | </a> |
123 | 168 | ||
169 | <div class="pure-u-0 pure-u-lg-visible"> | ||
170 | {if="isset($value.link_plugin)"} | ||
171 | · | ||
172 | {$link_plugin_counter=count($value.link_plugin)} | ||
173 | {loop="$value.link_plugin"} | ||
174 | {$value} | ||
175 | {if="$link_plugin_counter - 1 != $counter"}·{/if} | ||
176 | {/loop} | ||
177 | {/if} | ||
178 | </div> | ||
179 | </div><div | ||
180 | {ignore}do not add space or line break between these div - Firefox issue{/ignore} | ||
181 | class="linklist-item-infos-url pure-u-lg-5-8 pure-u-1"> | ||
182 | <a href="{$value.real_url}" title="{$value.title}"> | ||
183 | <i class="fa fa-link"></i> {$value.url} | ||
184 | </a> | ||
185 | {if="isLoggedIn()"} | ||
186 | <a href="?delete_link&lf_linkdate={$value.id}&token={$token}" | ||
187 | title="{'Delete'|t}" class="delete-link pure-u-0 pure-u-lg-visible"> | ||
188 | <i class="fa fa-trash"></i> | ||
189 | </a> | ||
190 | {/if} | ||
191 | </div> | ||
192 | <div class="mobile-buttons pure-u-1 pure-u-lg-0"> | ||
124 | {if="isset($value.link_plugin)"} | 193 | {if="isset($value.link_plugin)"} |
125 | · | ||
126 | {$link_plugin_counter=count($value.link_plugin)} | 194 | {$link_plugin_counter=count($value.link_plugin)} |
127 | {loop="$value.link_plugin"} | 195 | {loop="$value.link_plugin"} |
128 | {$value} | 196 | {$value} |
129 | {if="$link_plugin_counter - 1 != $counter"}·{/if} | 197 | {if="$link_plugin_counter - 1 != $counter"}·{/if} |
130 | {/loop} | 198 | {/loop} |
199 | · | ||
200 | {/if} | ||
201 | {if="isLoggedIn()"} | ||
202 | <a href="?delete_link&lf_linkdate={$value.id}&token={$token}" | ||
203 | title="{'Delete'|t}" class="delete-link"> | ||
204 | <i class="fa fa-trash"></i> | ||
205 | </a> | ||
131 | {/if} | 206 | {/if} |
132 | </div><div | ||
133 | {ignore}do not add space or line break between these div - Firefox issue{/ignore} | ||
134 | class="linklist-item-infos-url pure-u-lg-5-8 pure-u-1"> | ||
135 | <a href="{$value.real_url}" title="{$value.title}"> | ||
136 | <i class="fa fa-link"></i> {$value.url} | ||
137 | </a> | ||
138 | <a href="?delete_link&lf_linkdate={$value.id}&token={$token}" title="{'Delete'|t}" class="delete-link"> | ||
139 | <i class="fa fa-trash"></i> | ||
140 | </a> | ||
141 | </div> | 207 | </div> |
142 | </div> | 208 | </div> |
143 | </div> | 209 | </div> |
diff --git a/tpl/default/linklist.paging.html b/tpl/default/linklist.paging.html index 4888267b..0b71c9d2 100644 --- a/tpl/default/linklist.paging.html +++ b/tpl/default/linklist.paging.html | |||
@@ -1,7 +1,7 @@ | |||
1 | <div class="linklist-paging"> | 1 | <div class="linklist-paging"> |
2 | <div class="pure-g"> | 2 | <div class="pure-g"> |
3 | <div class="pure-u-2-24"></div> | 3 | <div class="pure-u-lg-2-24 pure-u-1-24"></div> |
4 | <div class="pure-u-20-24"> | 4 | <div class="pure-u-lg-20-24 pure-u-22-24"> |
5 | <div class="paging pure-g"> | 5 | <div class="paging pure-g"> |
6 | <div class="linklist-filters pure-u-1-3"> | 6 | <div class="linklist-filters pure-u-1-3"> |
7 | {if="isLoggedIn() or !empty($action_plugin)"} | 7 | {if="isLoggedIn() or !empty($action_plugin)"} |
diff --git a/tpl/default/loginform.html b/tpl/default/loginform.html index dcc29676..2ad3fe9c 100644 --- a/tpl/default/loginform.html +++ b/tpl/default/loginform.html | |||
@@ -17,8 +17,8 @@ | |||
17 | </div> | 17 | </div> |
18 | {else} | 18 | {else} |
19 | <div class="pure-g"> | 19 | <div class="pure-g"> |
20 | <div class="pure-u-lg-1-3 pure-u-1-8"></div> | 20 | <div class="pure-u-lg-1-3 pure-u-1-24"></div> |
21 | <div id="login-form" class="page-form page-form-light pure-u-lg-1-3 pure-u-3-4"> | 21 | <div id="login-form" class="page-form page-form-light pure-u-lg-1-3 pure-u-22-24"> |
22 | <form method="post" name="loginform"> | 22 | <form method="post" name="loginform"> |
23 | <h2 class="window-title">{'Login'|t}</h2> | 23 | <h2 class="window-title">{'Login'|t}</h2> |
24 | <div> | 24 | <div> |
diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html index fefa9258..ba643cac 100644 --- a/tpl/default/page.header.html +++ b/tpl/default/page.header.html | |||
@@ -95,7 +95,7 @@ | |||
95 | </div> | 95 | </div> |
96 | 96 | ||
97 | <div id="content"> | 97 | <div id="content"> |
98 | <div id="search" class="subheader-form open"> | 98 | <div id="search" class="subheader-form"> |
99 | <div class="pure-g"> | 99 | <div class="pure-g"> |
100 | <div class="pure-u-1 pure-u-lg-1-2"> | 100 | <div class="pure-u-1 pure-u-lg-1-2"> |
101 | <form method="GET" class="searchform" name="searchform"> | 101 | <form method="GET" class="searchform" name="searchform"> |
@@ -121,21 +121,6 @@ | |||
121 | </div> | 121 | </div> |
122 | </div> | 122 | </div> |
123 | </div> | 123 | </div> |
124 | {loop="$plugins_header.fields_toolbar"} | ||
125 | <form | ||
126 | {loop="$value.attr"} | ||
127 | {$key}="{$value}" | ||
128 | {/loop}> | ||
129 | <div class="subheader-form open pure-u-0 pure-u-lg-visible pure-u-lg-1"> | ||
130 | {loop="$value.inputs"} | ||
131 | <input | ||
132 | {loop="$value"} | ||
133 | {$key}="{$value}" | ||
134 | {/loop}> | ||
135 | {/loop} | ||
136 | </div> | ||
137 | </form> | ||
138 | {/loop} | ||
139 | {if="!isLoggedIn()"} | 124 | {if="!isLoggedIn()"} |
140 | <form method="post" name="loginform"> | 125 | <form method="post" name="loginform"> |
141 | <div class="subheader-form" id="header-login-form"> | 126 | <div class="subheader-form" id="header-login-form"> |
diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html index 57669340..b9ae2f2e 100644 --- a/tpl/default/picwall.html +++ b/tpl/default/picwall.html | |||
@@ -7,8 +7,8 @@ | |||
7 | {include="page.header"} | 7 | {include="page.header"} |
8 | 8 | ||
9 | <div class="pure-g"> | 9 | <div class="pure-g"> |
10 | <div class="pure-u-lg-1-6 pure-u-1-8"></div> | 10 | <div class="pure-u-lg-1-6 pure-u-1-24"></div> |
11 | <div class="pure-u-lg-2-3 pure-u-3-4 page-form page-visitor"> | 11 | <div class="pure-u-lg-2-3 pure-u-22-24 page-form page-visitor"> |
12 | {$countPics=count($linksToDisplay)} | 12 | {$countPics=count($linksToDisplay)} |
13 | <h2 class="window-title">{'Picture Wall'|t} - {$countPics} {'pics'|t}</h2> | 13 | <h2 class="window-title">{'Picture Wall'|t} - {$countPics} {'pics'|t}</h2> |
14 | 14 | ||
diff --git a/tpl/default/pluginsadmin.html b/tpl/default/pluginsadmin.html index ac38db97..22fa81f6 100644 --- a/tpl/default/pluginsadmin.html +++ b/tpl/default/pluginsadmin.html | |||
@@ -18,8 +18,8 @@ | |||
18 | 18 | ||
19 | <form method="POST" action="?do=save_pluginadmin" name="pluginform" id="pluginform"> | 19 | <form method="POST" action="?do=save_pluginadmin" name="pluginform" id="pluginform"> |
20 | <div class="pure-g"> | 20 | <div class="pure-g"> |
21 | <div class="pure-u-lg-1-6 pure-u-1-8"></div> | 21 | <div class="pure-u-lg-1-6 pure-u-1-24"></div> |
22 | <div class="pure-u-lg-2-3 pure-u-3-4 page-form page-form-complete"> | 22 | <div class="pure-u-lg-2-3 pure-u-22-24 page-form page-form-complete"> |
23 | <h2 class="window-title">{'Plugin administration'|t}</h2> | 23 | <h2 class="window-title">{'Plugin administration'|t}</h2> |
24 | 24 | ||
25 | <section id="enabled_plugins"> | 25 | <section id="enabled_plugins"> |
@@ -135,8 +135,8 @@ | |||
135 | 135 | ||
136 | <form action="?do=save_pluginadmin" method="POST"> | 136 | <form action="?do=save_pluginadmin" method="POST"> |
137 | <div class="pure-g"> | 137 | <div class="pure-g"> |
138 | <div class="pure-u-lg-1-6 pure-u-1-8"></div> | 138 | <div class="pure-u-lg-1-6 pure-u-1-24"></div> |
139 | <div class="pure-u-lg-2-3 pure-u-3-4 page-form page-form-light"> | 139 | <div class="pure-u-lg-2-3 pure-u-22-24 page-form page-form-light"> |
140 | <h2 class="window-title">{'Plugin configuration'|t}</h2> | 140 | <h2 class="window-title">{'Plugin configuration'|t}</h2> |
141 | <section id="plugin_parameters"> | 141 | <section id="plugin_parameters"> |
142 | <div> | 142 | <div> |
@@ -149,14 +149,14 @@ | |||
149 | <h3 class="window-subtitle">{function="str_replace('_', ' ', $key)"}</h3> | 149 | <h3 class="window-subtitle">{function="str_replace('_', ' ', $key)"}</h3> |
150 | {loop="$value.parameters"} | 150 | {loop="$value.parameters"} |
151 | <div class="plugin_parameter"> | 151 | <div class="plugin_parameter"> |
152 | <div class="float_label"> | 152 | <p class="float_label"> |
153 | <label for="{$key}"> | 153 | <label for="{$key}"> |
154 | <code>{$key}</code> | 154 | <code>{$key}</code> |
155 | {if="isset($value.desc)"} | 155 | {if="isset($value.desc)"} |
156 | · {$value.desc} | 156 | · {$value.desc} |
157 | {/if} | 157 | {/if} |
158 | </label> | 158 | </label> |
159 | </div> | 159 | </p> |
160 | <div class="float_input"> | 160 | <div class="float_input"> |
161 | <input name="{$key}" value="{$value.value}" id="{$key}" type="text" /> | 161 | <input name="{$key}" value="{$value.value}" id="{$key}" type="text" /> |
162 | </div> | 162 | </div> |
diff --git a/tpl/default/tagcloud.html b/tpl/default/tagcloud.html index 8d56f957..53c31748 100644 --- a/tpl/default/tagcloud.html +++ b/tpl/default/tagcloud.html | |||
@@ -7,8 +7,8 @@ | |||
7 | {include="page.header"} | 7 | {include="page.header"} |
8 | 8 | ||
9 | <div class="pure-g"> | 9 | <div class="pure-g"> |
10 | <div class="pure-u-lg-1-6 pure-u-1-8"></div> | 10 | <div class="pure-u-lg-1-6 pure-u-1-24"></div> |
11 | <div class="pure-u-lg-2-3 pure-u-3-4 page-form page-visitor"> | 11 | <div class="pure-u-lg-2-3 pure-u-22-24 page-form page-visitor"> |
12 | {$countTags=count($tags)} | 12 | {$countTags=count($tags)} |
13 | <h2 class="window-title">{'Tag cloud'|t} - {$countTags} {'tags'|t}</h2> | 13 | <h2 class="window-title">{'Tag cloud'|t} - {$countTags} {'tags'|t}</h2> |
14 | 14 | ||
diff --git a/tpl/default/tools.html b/tpl/default/tools.html index a9b8803b..b9df32d9 100644 --- a/tpl/default/tools.html +++ b/tpl/default/tools.html | |||
@@ -7,8 +7,8 @@ | |||
7 | {include="page.header"} | 7 | {include="page.header"} |
8 | 8 | ||
9 | <div class="pure-g"> | 9 | <div class="pure-g"> |
10 | <div class="pure-u-lg-1-3 pure-u-1-8"></div> | 10 | <div class="pure-u-lg-1-3 pure-u-1-24"></div> |
11 | <div class="pure-u-lg-1-3 pure-u-3-4 page-form page-form-light"> | 11 | <div class="pure-u-lg-1-3 pure-u-22-24 page-form page-form-light"> |
12 | <h2 class="window-title">{'Settings'|t}</h2> | 12 | <h2 class="window-title">{'Settings'|t}</h2> |
13 | <div class="tools-item"> | 13 | <div class="tools-item"> |
14 | <a href="?do=configure" title="{'Change Shaarli settings: title, timezone, etc.'|t}"> | 14 | <a href="?do=configure" title="{'Change Shaarli settings: title, timezone, etc.'|t}"> |
@@ -57,13 +57,13 @@ | |||
57 | </div> | 57 | </div> |
58 | 58 | ||
59 | <div class="pure-g"> | 59 | <div class="pure-g"> |
60 | <div class="pure-u-lg-1-3 pure-u-1-8"></div> | 60 | <div class="pure-u-lg-1-3 pure-u-1-24"></div> |
61 | <div class="pure-u-lg-1-3 pure-u-3-4 page-form page-form-light"> | 61 | <div class="pure-u-lg-1-3 pure-u-22-24 page-form page-form-light"> |
62 | <h2 class="window-title">Bookmarklets</h2> | 62 | <h2 class="window-title">Bookmarklets</h2> |
63 | <div> | 63 | <p> |
64 | {'Drag one of these button to your bookmarks toolbar or right-click it and "Bookmark This Link"'|t}, | 64 | {'Drag one of these button to your bookmarks toolbar or right-click it and "Bookmark This Link"'|t}, |
65 | {'then click on the bookmarklet in any page you want to share.'|t} | 65 | {'then click on the bookmarklet in any page you want to share.'|t} |
66 | </div> | 66 | </p> |
67 | <div class="tools-item"> | 67 | <div class="tools-item"> |
68 | <a title="{'Drag this link to your bookmarks toolbar or right-click it and Bookmark This Link'|t}, | 68 | <a title="{'Drag this link to your bookmarks toolbar or right-click it and Bookmark This Link'|t}, |
69 | {'then click ✚Shaare link button in any page you want to share'|t}" | 69 | {'then click ✚Shaare link button in any page you want to share'|t}" |
@@ -96,8 +96,8 @@ | |||
96 | 96 | ||
97 | {if="$sslenabled"} | 97 | {if="$sslenabled"} |
98 | <div class="pure-g"> | 98 | <div class="pure-g"> |
99 | <div class="pure-u-lg-1-3 pure-u-1-8"></div> | 99 | <div class="pure-u-lg-1-3 pure-u-1-24"></div> |
100 | <div class="pure-u-lg-1-3 pure-u-3-4 page-form page-form-light"> | 100 | <div class="pure-u-lg-1-3 pure-u-22-24 page-form page-form-light"> |
101 | <h2 class="window-title">Firefox Social API</h2> | 101 | <h2 class="window-title">Firefox Social API</h2> |
102 | <p>{'You need to browse your Shaarli over <strong>HTTPS</strong> to use this functionality.'|t}</p> | 102 | <p>{'You need to browse your Shaarli over <strong>HTTPS</strong> to use this functionality.'|t}</p> |
103 | 103 | ||
@@ -112,8 +112,8 @@ | |||
112 | {/if} | 112 | {/if} |
113 | 113 | ||
114 | <div class="pure-g"> | 114 | <div class="pure-g"> |
115 | <div class="pure-u-lg-1-3 pure-u-1-8"></div> | 115 | <div class="pure-u-lg-1-3 pure-u-1-24"></div> |
116 | <div class="pure-u-lg-1-3 pure-u-3-4 page-form page-form-light"> | 116 | <div class="pure-u-lg-1-3 pure-u-22-24 page-form page-form-light"> |
117 | <h2 class="window-title">{'3rd party'|t}</h2> | 117 | <h2 class="window-title">{'3rd party'|t}</h2> |
118 | <div class="tools-item"> | 118 | <div class="tools-item"> |
119 | <a href="https://addons.mozilla.org/fr/firefox/addon/shaarli/" title="Firefox {'Plugin'|t}"> | 119 | <a href="https://addons.mozilla.org/fr/firefox/addon/shaarli/" title="Firefox {'Plugin'|t}"> |