aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorVirtualTam <virtualtam@flibidi.org>2014-12-02 21:00:52 +0100
committerVirtualTam <virtualtam@flibidi.org>2014-12-03 19:28:43 +0100
commitc133612f32849b76785635efe19d4afedcfd0248 (patch)
tree0ecbebedef56698fa991a60196e06435d4e2f3d7
parentfdd8fb2be2c45bd810a2d8b55c1f2cbf7f655fe3 (diff)
downloadShaarli-c133612f32849b76785635efe19d4afedcfd0248.tar.gz
Shaarli-c133612f32849b76785635efe19d4afedcfd0248.tar.zst
Shaarli-c133612f32849b76785635efe19d4afedcfd0248.zip
CSS: remove hardcoded style from templates
Fixes shaarli/Shaarli#29 Style elements refactored as follows: - use existing ids and classes if possible, - else, define new ones and stick with the existing naming convention, - remove hardcoded style attributes from RainTPL templates. Exception: In tpl/tagcloud.html, the display size of each tag is computed at page generation. Signed-off-by: VirtualTam <virtualtam@flibidi.org>
-rw-r--r--inc/shaarli.css117
-rw-r--r--tpl/addlink.html4
-rw-r--r--tpl/changetag.html5
-rw-r--r--tpl/daily.html17
-rw-r--r--tpl/editlink.html14
-rw-r--r--tpl/export.html5
-rw-r--r--tpl/install.html11
-rw-r--r--tpl/linklist.html14
-rw-r--r--tpl/linklist.paging.html4
-rw-r--r--tpl/loginform.html4
-rw-r--r--tpl/page.footer.html2
-rw-r--r--tpl/page.header.html4
-rw-r--r--tpl/tagcloud.html4
-rw-r--r--tpl/tools.html4
14 files changed, 161 insertions, 48 deletions
diff --git a/inc/shaarli.css b/inc/shaarli.css
index 22000ba9..e7396ccb 100644
--- a/inc/shaarli.css
+++ b/inc/shaarli.css
@@ -118,6 +118,14 @@ h1 {
118 cursor: pointer; 118 cursor: pointer;
119} 119}
120 120
121#pageheader #linkcount {
122 float: right;
123 font-style: italic;
124 color: #bbb;
125 text-align: right;
126 padding-right: 5px;
127}
128
121#pageheader { 129#pageheader {
122 background-color: #333333; 130 background-color: #333333;
123 background: -webkit-gradient(linear, 0 0, 0 bottom, from(#333333), to(#111111)); 131 background: -webkit-gradient(linear, 0 0, 0 bottom, from(#333333), to(#111111));
@@ -149,10 +157,19 @@ h1 {
149 text-decoration: none; 157 text-decoration: none;
150} 158}
151 159
160#pageheader .search {
161 width: 100%;
162 white-space: nowrap;
163}
164
152#toolsdiv a { 165#toolsdiv a {
153 clear: both; 166 clear: both;
154} 167}
155 168
169#toolsdiv #bookmark {
170 clear: none;
171}
172
156#toolsdiv a span { 173#toolsdiv a span {
157 color: #ffffff; 174 color: #ffffff;
158} 175}
@@ -191,6 +208,18 @@ h1 {
191 padding: 0; 208 padding: 0;
192} 209}
193 210
211.searchform #searchform_value {
212 width: 30%;
213}
214
215.tagfilter {
216 margin-left:24px;
217}
218
219.tagfilter #tagfilter_value {
220 width: 10%;
221}
222
194.tagfilter input.bigbutton, .searchform input.bigbutton, .addform input.bigbutton { 223.tagfilter input.bigbutton, .searchform input.bigbutton, .addform input.bigbutton {
195 background-color: #dedede; 224 background-color: #dedede;
196 background: -webkit-gradient(linear, 0 0, 0 bottom, from(#dedede), to(#ffffff)); 225 background: -webkit-gradient(linear, 0 0, 0 bottom, from(#dedede), to(#ffffff));
@@ -271,6 +300,14 @@ h1 {
271 padding-right: 5px; 300 padding-right: 5px;
272} 301}
273 302
303#paging_linksperpage form.linksperpage {
304 display: inline;
305}
306
307#paging_linksperpage form.linksperpage input {
308 height: 15px;
309}
310
274#paging_current { 311#paging_current {
275 display: inline; 312 display: inline;
276 color: #fff; 313 color: #fff;
@@ -291,6 +328,10 @@ h1 {
291 clear: both; 328 clear: both;
292} 329}
293 330
331#headerform input.linkurl {
332 width: 50%;
333}
334
294#toolsdiv { 335#toolsdiv {
295 color: #ffffff; 336 color: #ffffff;
296 padding: 5px 5px 5px 5px; 337 padding: 5px 5px 5px 5px;
@@ -311,6 +352,10 @@ h1 {
311 clear: left; 352 clear: left;
312} 353}
313 354
355#editlinkform textarea, #editlinkform .lf_input {
356 width: 100%;
357}
358
314#linklist li { 359#linklist li {
315 padding: 4px 10px 15px 20px; 360 padding: 4px 10px 15px 20px;
316 border-top: 1px solid #bbb; 361 border-top: 1px solid #bbb;
@@ -339,6 +384,16 @@ h1 {
339 color:#E28E3F; 384 color:#E28E3F;
340} 385}
341 386
387.linkqrcode {
388 display: inline;
389 position: relative;
390}
391
392a.qrcode img {
393 width: 13px;
394 height: 13px;
395}
396
342#linklist li.private { 397#linklist li.private {
343 background: url('../images/private.png') no-repeat 10px center; 398 background: url('../images/private.png') no-repeat 10px center;
344 padding-left: 60px; 399 padding-left: 60px;
@@ -440,6 +495,12 @@ h1 {
440 text-decoration: none; 495 text-decoration: none;
441} 496}
442 497
498.linktag .remove {
499 border-left: 1px solid #aaa;
500 padding-left: 5px;
501 color:#6767A7;
502}
503
443.linkshort { 504.linkshort {
444 font-size: 8pt; 505 font-size: 8pt;
445 color: #888; 506 color: #888;
@@ -466,11 +527,11 @@ h1 {
466 clear: both; 527 clear: both;
467} 528}
468 529
469#footer a { 530#footer a {
470 color: #486D08; 531 color: #486D08;
471} 532}
472 533
473#footer a:hover { 534#footer a:hover {
474 color: #000000; 535 color: #000000;
475} 536}
476 537
@@ -484,16 +545,41 @@ h1 {
484 font-size: 9pt; 545 font-size: 9pt;
485} 546}
486 547
548#newversion #version_id {
549 text-decoration: blink;
550}
551
487#cloudtag { 552#cloudtag {
488 padding-left: 10%; 553 padding-left: 10%;
489 padding-right: 10%; 554 padding-right: 10%;
490} 555}
491 556
557#cloudtag .count {
558 color: #99f;
559 font-size: 9pt;
560 padding-left: 5px;
561 padding-right: 2px;
562}
563
492#cloudtag a { 564#cloudtag a {
565 font-weight:bold;
493 color: black; 566 color: black;
494 text-decoration: none; 567 text-decoration: none;
495} 568}
496 569
570#install {
571 margin: 0 20px;
572}
573
574#installform {
575 border: 1px solid black;
576 padding: 10px;
577}
578
579#installform table {
580 border: none;
581}
582
497#installform td { 583#installform td {
498 font-size: 10pt; 584 font-size: 10pt;
499 color: black; 585 color: black;
@@ -501,6 +587,10 @@ h1 {
501 clear: left; 587 clear: left;
502} 588}
503 589
590#installform input.bigbutton {
591 float: right;
592}
593
504#changepasswordform { 594#changepasswordform {
505 color: #ccc; 595 color: #ccc;
506 padding: 10px 5px 10px 5px; 596 padding: 10px 5px 10px 5px;
@@ -513,6 +603,10 @@ h1 {
513 clear: left; 603 clear: left;
514} 604}
515 605
606#changetag #totag {
607 margin-left: 40px;
608}
609
516#configform td { 610#configform td {
517 color: #ccc; 611 color: #ccc;
518 font-size: 10pt; 612 font-size: 10pt;
@@ -676,6 +770,14 @@ div.dailyAbout a {
676 color: #890500; 770 color: #890500;
677} 771}
678 772
773div.dailyAbout img {
774 position: relative;
775 top: 3px;
776 margin-right: 4px;
777 width: 14px;
778 height: 14px;
779}
780
679div.dailyTitle { 781div.dailyTitle {
680 font-weight: bold; 782 font-weight: bold;
681 font-size: 44pt; 783 font-size: 44pt;
@@ -726,6 +828,17 @@ div.dailyEntryDescription {
726 overflow: auto; 828 overflow: auto;
727} 829}
728 830
831div.dailyNoEntry {
832 text-align: center;
833 padding: 40px 0px 90px 0px;
834}
835
836.daily #closing {
837 clear: both;
838 text-align: center;
839 padding-bottom: 20px;
840}
841
729/* Common CSS screwdriver */ 842/* Common CSS screwdriver */
730.clear { 843.clear {
731 clear: both; 844 clear: both;
diff --git a/tpl/addlink.html b/tpl/addlink.html
index 853715dc..da50f45e 100644
--- a/tpl/addlink.html
+++ b/tpl/addlink.html
@@ -6,11 +6,11 @@
6 {include="page.header"} 6 {include="page.header"}
7 <div id="headerform"> 7 <div id="headerform">
8 <form method="GET" action="" name="addform" class="addform"> 8 <form method="GET" action="" name="addform" class="addform">
9 <input type="text" name="post" style="width:50%;"> 9 <input type="text" name="post" class="linkurl">
10 <input type="submit" value="Add link" class="bigbutton"> 10 <input type="submit" value="Add link" class="bigbutton">
11 </form> 11 </form>
12 </div> 12 </div>
13</div> 13</div>
14{include="page.footer"} 14{include="page.footer"}
15</body> 15</body>
16</html> \ No newline at end of file 16</html>
diff --git a/tpl/changetag.html b/tpl/changetag.html
index b22bddea..79fea9a9 100644
--- a/tpl/changetag.html
+++ b/tpl/changetag.html
@@ -9,7 +9,8 @@
9 <form method="POST" action="" name="changetag" id="changetag"> 9 <form method="POST" action="" name="changetag" id="changetag">
10 <input type="hidden" name="token" value="{$token}"> 10 <input type="hidden" name="token" value="{$token}">
11 Tag: <input type="text" name="fromtag" id="fromtag"> 11 Tag: <input type="text" name="fromtag" id="fromtag">
12 <input type="text" name="totag" style="margin-left:40px;"><input type="submit" name="renametag" value="Rename tag" class="bigbutton"> 12 <input type="text" name="totag" id="totag">
13 <input type="submit" name="renametag" value="Rename tag" class="bigbutton">
13 &nbsp;&nbsp;or&nbsp; <input type="submit" name="deletetag" value="Delete tag" class="bigbutton" onClick="return confirmDeleteTag();"><br>(Case sensitive)</form> 14 &nbsp;&nbsp;or&nbsp; <input type="submit" name="deletetag" value="Delete tag" class="bigbutton" onClick="return confirmDeleteTag();"><br>(Case sensitive)</form>
14<script language="JavaScript">function confirmDeleteTag() { var agree=confirm("Are you sure you want to delete this tag from all links ?"); if (agree) return true ; else return false ; }</script> 15<script language="JavaScript">function confirmDeleteTag() { var agree=confirm("Are you sure you want to delete this tag from all links ?"); if (agree) return true ; else return false ; }</script>
15</div> 16</div>
@@ -23,4 +24,4 @@ $(document).ready(function()
23</script> 24</script>
24{/if} 25{/if}
25</body> 26</body>
26</html> \ No newline at end of file 27</html>
diff --git a/tpl/daily.html b/tpl/daily.html
index 4bc8568b..c15a7062 100644
--- a/tpl/daily.html
+++ b/tpl/daily.html
@@ -10,17 +10,17 @@
10 - 10 -
11 {if="$nextday"}<a href="?do=daily&day={$nextday}">Next day<b>&gt;</b></a>{else}Next day<b>&gt;</b>{/if} 11 {if="$nextday"}<a href="?do=daily&day={$nextday}">Next day<b>&gt;</b></a>{else}Next day<b>&gt;</b>{/if}
12 <br><br> 12 <br><br>
13 <a href="?do=dailyrss" title="1 RSS entry per day"><img src="images/feed-icon-14x14.png#" width="14" height="14" style="position:relative;top:3px; margin-right:4px;">Daily RSS Feed</a> 13 <a href="?do=dailyrss" title="1 RSS entry per day"><img src="images/feed-icon-14x14.png#">Daily RSS Feed</a>
14 </div> 14 </div>
15 <div class="dailyTitle"><img src="../images/floral_left.png" width="51" height="50" class="nomobile"> The Daily Shaarli <img src="../images/floral_right.png" width="51" height="50" class="nomobile"></div> 15 <div class="dailyTitle"><img src="../images/floral_left.png" width="51" height="50" class="nomobile"> The Daily Shaarli <img src="../images/floral_right.png" width="51" height="50" class="nomobile"></div>
16 <div class="dailyDate"><span class="nomobile">&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;</span> {$day} <span class="nomobile">&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;</span></div> 16 <div class="dailyDate"><span class="nomobile">&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;</span> {$day} <span class="nomobile">&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;</span></div>
17 <div style="clear:both;"></div> 17 <div class="clear"></div>
18 18
19 {if="$linksToDisplay"} 19 {if="$linksToDisplay"}
20 <div id="daily_col1"> 20 <div id="daily_col1">
21 {loop="col1"} 21 {loop="col1"}
22 <div class="dailyEntry"> 22 <div class="dailyEntry">
23 <div style="float:right;position:relative;top:-1px;"><a href="?{$value.linkdate|smallHash}"><img src="../images/squiggle2.png" width="25" height="26" title="permalink" alt="permalink"></a></div> 23 <div class="dailyEntryPermalink"><a href="?{$value.linkdate|smallHash}"><img src="../images/squiggle2.png" width="25" height="26" title="permalink" alt="permalink"></a></div>
24 {if="$value.tags"}<div class="dailyEntryTags">{loop="value.taglist"}{$value|htmlspecialchars} - {/loop}</div>{/if} 24 {if="$value.tags"}<div class="dailyEntryTags">{loop="value.taglist"}{$value|htmlspecialchars} - {/loop}</div>{/if}
25 <div class="dailyEntryTitle"><a href="{$value.url}">{$value.title|htmlspecialchars}</a></div> 25 <div class="dailyEntryTitle"><a href="{$value.url}">{$value.title|htmlspecialchars}</a></div>
26 {if="$value.thumbnail"}<div class="dailyEntryThumbnail">{$value.thumbnail}</div>{/if} 26 {if="$value.thumbnail"}<div class="dailyEntryThumbnail">{$value.thumbnail}</div>{/if}
@@ -32,7 +32,7 @@
32 <div id="daily_col2"> 32 <div id="daily_col2">
33 {loop="col2"} 33 {loop="col2"}
34 <div class="dailyEntry"> 34 <div class="dailyEntry">
35 <div style="float:right;position:relative;top:-1px;"><a href="?{$value.linkdate|smallHash}"><img src="../images/squiggle2.png" width="25" height="26" title="permalink" alt="permalink"></a></div> 35 <div class="dailyEntryPermalink"><a href="?{$value.linkdate|smallHash}"><img src="../images/squiggle2.png" width="25" height="26" title="permalink" alt="permalink"></a></div>
36 {if="$value.tags"}<div class="dailyEntryTags">{loop="value.taglist"}{$value|htmlspecialchars} - {/loop}</div>{/if} 36 {if="$value.tags"}<div class="dailyEntryTags">{loop="value.taglist"}{$value|htmlspecialchars} - {/loop}</div>{/if}
37 <div class="dailyEntryTitle"><a href="{$value.url}">{$value.title|htmlspecialchars}</a></div> 37 <div class="dailyEntryTitle"><a href="{$value.url}">{$value.title|htmlspecialchars}</a></div>
38 {if="$value.thumbnail"}<div class="dailyEntryThumbnail">{$value.thumbnail}</div>{/if} 38 {if="$value.thumbnail"}<div class="dailyEntryThumbnail">{$value.thumbnail}</div>{/if}
@@ -44,7 +44,7 @@
44 <div id="daily_col3"> 44 <div id="daily_col3">
45 {loop="col3"} 45 {loop="col3"}
46 <div class="dailyEntry"> 46 <div class="dailyEntry">
47 <div style="float:right;position:relative;top:-1px;"><a href="?{$value.linkdate|smallHash}"><img src="../images/squiggle2.png" width="25" height="26" title="permalink" alt="permalink"></a></div> 47 <div class="dailyEntryPermalink"><a href="?{$value.linkdate|smallHash}"><img src="../images/squiggle2.png" width="25" height="26" title="permalink" alt="permalink"></a></div>
48 {if="$value.tags"}<div class="dailyEntryTags">{loop="value.taglist"}{$value|htmlspecialchars} - {/loop}</div>{/if} 48 {if="$value.tags"}<div class="dailyEntryTags">{loop="value.taglist"}{$value|htmlspecialchars} - {/loop}</div>{/if}
49 <div class="dailyEntryTitle"><a href="{$value.url}">{$value.title|htmlspecialchars}</a></div> 49 <div class="dailyEntryTitle"><a href="{$value.url}">{$value.title|htmlspecialchars}</a></div>
50 {if="$value.thumbnail"}<div class="dailyEntryThumbnail">{$value.thumbnail}</div>{/if} 50 {if="$value.thumbnail"}<div class="dailyEntryThumbnail">{$value.thumbnail}</div>{/if}
@@ -53,11 +53,10 @@
53 {/loop} 53 {/loop}
54 </div> 54 </div>
55 {else} 55 {else}
56 <div style="text-align:center; padding:40px 0px 90px 0px;">No articles on this day.</div> 56 <div class="dailyNoEntry">No articles on this day.</div>
57 {/if} 57 {/if}
58 <div style="clear:both;"></div> 58 <div id="closing"><img src="../images/squiggle_closing.png" width="66" height="61" alt="-"></div>
59 <div style="text-align:center; padding-bottom:20px;"><img src="../images/squiggle_closing.png" width="66" height="61" alt="-"></div>
60</div> 59</div>
61{include="page.footer"} 60{include="page.footer"}
62</body> 61</body>
63</html> \ No newline at end of file 62</html>
diff --git a/tpl/editlink.html b/tpl/editlink.html
index 48945a30..454dfff4 100644
--- a/tpl/editlink.html
+++ b/tpl/editlink.html
@@ -12,10 +12,10 @@
12 <div id="editlinkform"> 12 <div id="editlinkform">
13 <form method="post" name="linkform"> 13 <form method="post" name="linkform">
14 <input type="hidden" name="lf_linkdate" value="{$link.linkdate}"> 14 <input type="hidden" name="lf_linkdate" value="{$link.linkdate}">
15 <i>URL</i><br><input type="text" name="lf_url" value="{$link.url|htmlspecialchars}" style="width:100%"><br> 15 <i>URL</i><br><input type="text" name="lf_url" value="{$link.url|htmlspecialchars}" class="lf_input"><br>
16 <i>Title</i><br><input type="text" name="lf_title" value="{$link.title|htmlspecialchars}" style="width:100%"><br> 16 <i>Title</i><br><input type="text" name="lf_title" value="{$link.title|htmlspecialchars}" class="lf_input"><br>
17 <i>Description</i><br><textarea name="lf_description" rows="4" cols="25" style="width:100%">{$link.description|htmlspecialchars}</textarea><br> 17 <i>Description</i><br><textarea name="lf_description" rows="4" cols="25">{$link.description|htmlspecialchars}</textarea><br>
18 <i>Tags</i><br><input type="text" id="lf_tags" name="lf_tags" value="{$link.tags|htmlspecialchars}" style="width:100%"><br> 18 <i>Tags</i><br><input type="text" id="lf_tags" name="lf_tags" value="{$link.tags|htmlspecialchars}" class="lf_input"><br>
19 {if="($link_is_new && $GLOBALS['privateLinkByDefault']==true) || $link.private == true"} 19 {if="($link_is_new && $GLOBALS['privateLinkByDefault']==true) || $link.private == true"}
20 <input type="checkbox" checked="checked" name="lf_private" id="lf_private"> 20 <input type="checkbox" checked="checked" name="lf_private" id="lf_private">
21 &nbsp;<label for="lf_private"><i>Private</i></label><br> 21 &nbsp;<label for="lf_private"><i>Private</i></label><br>
@@ -23,9 +23,9 @@
23 <input type="checkbox" name="lf_private" id="lf_private"> 23 <input type="checkbox" name="lf_private" id="lf_private">
24 &nbsp;<label for="lf_private"><i>Private</i></label><br> 24 &nbsp;<label for="lf_private"><i>Private</i></label><br>
25 {/if} 25 {/if}
26 <input type="submit" value="Save" name="save_edit" class="bigbutton" style="margin-left:40px;"> 26 <input type="submit" value="Save" name="save_edit" class="bigbutton">
27 <input type="submit" value="Cancel" name="cancel_edit" class="bigbutton" style="margin-left:40px;"> 27 <input type="submit" value="Cancel" name="cancel_edit" class="bigbutton">
28 {if="!$link_is_new"}<input type="submit" value="Delete" name="delete_link" class="bigbutton" style="margin-left:180px;" onClick="return confirmDeleteLink();">{/if} 28 {if="!$link_is_new"}<input type="submit" value="Delete" name="delete_link" class="bigbutton delete" onClick="return confirmDeleteLink();">{/if}
29 <input type="hidden" name="token" value="{$token}"> 29 <input type="hidden" name="token" value="{$token}">
30 {if="$http_referer"}<input type="hidden" name="returnurl" value="{$http_referer|htmlspecialchars}">{/if} 30 {if="$http_referer"}<input type="hidden" name="returnurl" value="{$http_referer|htmlspecialchars}">{/if}
31 </form> 31 </form>
diff --git a/tpl/export.html b/tpl/export.html
index 938cbe64..911b02c1 100644
--- a/tpl/export.html
+++ b/tpl/export.html
@@ -7,9 +7,10 @@
7 <div id="toolsdiv"> 7 <div id="toolsdiv">
8 <a href="?do=export&what=all"><b>Export all</b> <span>: Export all links</span></a><br><br> 8 <a href="?do=export&what=all"><b>Export all</b> <span>: Export all links</span></a><br><br>
9 <a href="?do=export&what=public"><b>Export public</b> <span>: Export public links only</a><br><br> 9 <a href="?do=export&what=public"><b>Export public</b> <span>: Export public links only</a><br><br>
10 <a href="?do=export&what=private"><b>Export private</b> <span>: Export private links only</a><br><br style="clear:both;"> 10 <a href="?do=export&what=private"><b>Export private</b> <span>: Export private links only</a>
11 <div class="clear"></div>
11 </div> 12 </div>
12</div> 13</div>
13{include="page.footer"} 14{include="page.footer"}
14</body> 15</body>
15</html> \ No newline at end of file 16</html>
diff --git a/tpl/install.html b/tpl/install.html
index 4034ef1b..32b8811b 100644
--- a/tpl/install.html
+++ b/tpl/install.html
@@ -2,20 +2,19 @@
2<html> 2<html>
3<head>{include="includes"}{$timezone_js}</head> 3<head>{include="includes"}{$timezone_js}</head>
4<body onload="document.installform.setlogin.focus();"> 4<body onload="document.installform.setlogin.focus();">
5<div style="margin-left:20px;"> 5<div id="install">
6<h1>Shaarli</h1> 6<h1>Shaarli</h1>
7It looks like it's the first time you run Shaarli. Please configure it:<br> 7It looks like it's the first time you run Shaarli. Please configure it:<br>
8<div style="color:white !important;"> 8<form method="POST" action="" name="installform" id="installform">
9<form method="POST" action="" name="installform" id="installform" style="border:1px solid black; padding:10 10 10 10;"> 9<table>
10<table border="0" cellpadding="20">
11<tr><td><b>Login:</b></td><td><input type="text" name="setlogin" size="30"></td></tr> 10<tr><td><b>Login:</b></td><td><input type="text" name="setlogin" size="30"></td></tr>
12<tr><td><b>Password:</b></td><td><input type="password" name="setpassword" size="30"></td></tr> 11<tr><td><b>Password:</b></td><td><input type="password" name="setpassword" size="30"></td></tr>
13{$timezone_html} 12{$timezone_html}
14<tr><td><b>Page title:</b></td><td><input type="text" name="title" size="30"></td></tr> 13<tr><td><b>Page title:</b></td><td><input type="text" name="title" size="30"></td></tr>
15<tr><td></td><td align="right"><input type="submit" name="Save" value="Save config" class="bigbutton"></td></tr> 14<tr><td colspan="2"><input type="submit" name="Save" value="Save config" class="bigbutton"></td></tr>
16</table> 15</table>
17</form> 16</form>
18</div> 17</div>
19{include="page.footer"} 18{include="page.footer"}
20</body> 19</body>
21</html> \ No newline at end of file 20</html>
diff --git a/tpl/linklist.html b/tpl/linklist.html
index d33fc3c3..eadbc4cd 100644
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@ -4,9 +4,9 @@
4<body> 4<body>
5<div id="pageheader"> 5<div id="pageheader">
6 {include="page.header"} 6 {include="page.header"}
7 <div id="headerform" style="width:100%; white-space:nowrap;"> 7 <div id="headerform" class="search">
8 <form method="GET" class="searchform" name="searchform" style="display:inline;"><input type="text" id="searchform_value" name="searchterm" style="width:30%" value=""> <input type="submit" value="Search" class="bigbutton"></form> 8 <form method="GET" class="searchform" name="searchform"><input type="text" id="searchform_value" name="searchterm" value=""> <input type="submit" value="Search" class="bigbutton"></form>
9 <form method="GET" class="tagfilter" name="tagfilter" style="display:inline;margin-left:24px;"><input type="text" name="searchtags" id="tagfilter_value" style="width:10%" value=""> <input type="submit" value="Filter by tag" class="bigbutton"></form> 9 <form method="GET" class="tagfilter" name="tagfilter"><input type="text" name="searchtags" id="tagfilter_value" value=""> <input type="submit" value="Filter by tag" class="bigbutton"></form>
10 </div> 10 </div>
11</div> 11</div>
12 12
@@ -23,7 +23,7 @@
23 {if="$search_type=='tags'"} 23 {if="$search_type=='tags'"}
24 <div id="searchcriteria">{$result_count} results for tags <i> 24 <div id="searchcriteria">{$result_count} results for tags <i>
25 {loop="search_crits"} 25 {loop="search_crits"}
26 <span class="linktag" title="Remove tag"><a href="?removetag={$value|htmlspecialchars}">{$value|htmlspecialchars} <span style="border-left:1px solid #aaa; padding-left:5px; color:#6767A7;">x</span></a></span> 26 <span class="linktag" title="Remove tag"><a href="?removetag={$value|htmlspecialchars}">{$value|htmlspecialchars} <span class="remove">x</span></a></span>
27 {/loop}</i></div> 27 {/loop}</i></div>
28 {/if} 28 {/if}
29 {/if} 29 {/if}
@@ -42,7 +42,7 @@
42 {/if} 42 {/if}
43 <span class="linktitle"><a href="{$redirector}{$value.url|htmlspecialchars}">{$value.title|htmlspecialchars}</a></span> 43 <span class="linktitle"><a href="{$redirector}{$value.url|htmlspecialchars}">{$value.title|htmlspecialchars}</a></span>
44 <br> 44 <br>
45 {if="$value.description"}<div class="linkdescription"{if="$search_type=='permalink'"} style="max-height:none !important;"{/if}>{$value.description}</div>{/if} 45 {if="$value.description"}<div class="linkdescription">{$value.description}</div>{/if}
46 {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"} 46 {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"}
47 <span class="linkdate" title="Permalink"><a href="?{$value.linkdate|smallHash}">{$value.localdate|htmlspecialchars} - permalink</a> - </span> 47 <span class="linkdate" title="Permalink"><a href="?{$value.linkdate|smallHash}">{$value.localdate|htmlspecialchars} - permalink</a> - </span>
48 {else} 48 {else}
@@ -51,8 +51,8 @@
51 {if="$GLOBALS['config']['ARCHIVE_ORG']"} 51 {if="$GLOBALS['config']['ARCHIVE_ORG']"}
52 <span class="linkarchive"><a href="https://web.archive.org/web/{$value.url|htmlspecialchars}">archive</a> - </span> 52 <span class="linkarchive"><a href="https://web.archive.org/web/{$value.url|htmlspecialchars}">archive</a> - </span>
53 {/if} 53 {/if}
54 <div style="position:relative;display:inline;"><a href="http://qrfree.kaywa.com/?l=1&s=8&d={$scripturl|urlencode}%3F{$value.linkdate|smallHash}" 54 <div class="linkqrcode"><a href="http://qrfree.kaywa.com/?l=1&s=8&d={$scripturl|urlencode}%3F{$value.linkdate|smallHash}"
55 onclick="showQrCode(this); return false;" class="qrcode" data-permalink="{$scripturl}?{$value.linkdate|smallHash}"><img src="images/qrcode.png#" width="13" height="13" title="QR-Code"></a></div> - 55 onclick="showQrCode(this); return false;" class="qrcode" data-permalink="{$scripturl}?{$value.linkdate|smallHash}"><img src="images/qrcode.png#" title="QR-Code"></a></div> -
56 <a href={$value.url|htmlspecialchars}><span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span></a><br> 56 <a href={$value.url|htmlspecialchars}><span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span></a><br>
57 {if="$value.tags"} 57 {if="$value.tags"}
58 <div class="linktaglist"> 58 <div class="linktaglist">
diff --git a/tpl/linklist.paging.html b/tpl/linklist.paging.html
index b0c119d9..c2b98971 100644
--- a/tpl/linklist.paging.html
+++ b/tpl/linklist.paging.html
@@ -12,9 +12,9 @@
12{/if} 12{/if}
13 <div id="paging_linksperpage"> 13 <div id="paging_linksperpage">
14 Links per page: <a href="?linksperpage=20">20</a> <a href="?linksperpage=50">50</a> <a href="?linksperpage=100">100</a> 14 Links per page: <a href="?linksperpage=20">20</a> <a href="?linksperpage=50">50</a> <a href="?linksperpage=100">100</a>
15 <form method="GET" style="display:inline;" class="linksperpage"><input type="text" name="linksperpage" size="2" style="height:15px;"></form> 15 <form method="GET" class="linksperpage"><input type="text" name="linksperpage" size="2"></form>
16 </div> 16 </div>
17 {if="$previous_page_url"} <a href="{$previous_page_url}" id="paging_older">&#x25C4;Older</a> {/if} 17 {if="$previous_page_url"} <a href="{$previous_page_url}" id="paging_older">&#x25C4;Older</a> {/if}
18 <div id="paging_current">page {$page_current} / {$page_max} </div> 18 <div id="paging_current">page {$page_current} / {$page_max} </div>
19 {if="$next_page_url"} <a href="{$next_page_url}" id="paging_newer">Newer&#x25BA;</a> {/if} 19 {if="$next_page_url"} <a href="{$next_page_url}" id="paging_newer">Newer&#x25BA;</a> {/if}
20</div> \ No newline at end of file 20</div>
diff --git a/tpl/loginform.html b/tpl/loginform.html
index 805a0148..954f6f1f 100644
--- a/tpl/loginform.html
+++ b/tpl/loginform.html
@@ -13,7 +13,7 @@
13 Login: <input type="text" name="login" tabindex="1">&nbsp;&nbsp;&nbsp; 13 Login: <input type="text" name="login" tabindex="1">&nbsp;&nbsp;&nbsp;
14 Password : <input type="password" name="password" tabindex="2"> 14 Password : <input type="password" name="password" tabindex="2">
15 <input type="submit" value="Login" class="bigbutton" tabindex="4"><br> 15 <input type="submit" value="Login" class="bigbutton" tabindex="4"><br>
16 <input style="margin:10 0 0 40;" type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="3"><label for="longlastingsession">&nbsp;Stay signed in (Do not check on public computers)</label> 16 <input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="3"><label for="longlastingsession">&nbsp;Stay signed in (Do not check on public computers)</label>
17 <input type="hidden" name="token" value="{$token}"> 17 <input type="hidden" name="token" value="{$token}">
18 {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl|htmlspecialchars}">{/if} 18 {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl|htmlspecialchars}">{/if}
19 </form> 19 </form>
@@ -23,4 +23,4 @@
23 23
24{include="page.footer"} 24{include="page.footer"}
25</body> 25</body>
26</html> \ No newline at end of file 26</html>
diff --git a/tpl/page.footer.html b/tpl/page.footer.html
index 8e5869c5..b494bf7d 100644
--- a/tpl/page.footer.html
+++ b/tpl/page.footer.html
@@ -2,7 +2,7 @@
2 <b><a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli">Shaarli {$version|htmlspecialchars}</a></b> - The personal, minimalist, super-fast, no-database delicious clone. By <a href="http://sebsauvage.net" target="_blank">sebsauvage.net</a>. Theme by <a href="http://blog.idleman.fr" target="_blank">idleman.fr</a>. 2 <b><a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli">Shaarli {$version|htmlspecialchars}</a></b> - The personal, minimalist, super-fast, no-database delicious clone. By <a href="http://sebsauvage.net" target="_blank">sebsauvage.net</a>. Theme by <a href="http://blog.idleman.fr" target="_blank">idleman.fr</a>.
3</div> 3</div>
4{if="$newversion"} 4{if="$newversion"}
5 <div id="newversion"><span style="text-decoration:blink;">&#x25CF;</span> Shaarli {$newversion|htmlspecialchars} is <a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli#download">available</a>.</div> 5 <div id="newversion"><span id="version_id">&#x25CF;</span> Shaarli {$newversion|htmlspecialchars} is <a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli#download">available</a>.</div>
6{/if} 6{/if}
7{if="isLoggedIn()"} 7{if="isLoggedIn()"}
8<script language="JavaScript">function confirmDeleteLink() { var agree=confirm("Are you sure you want to delete this link ?"); if (agree) return true ; else return false ; }</script> 8<script language="JavaScript">function confirmDeleteLink() { var agree=confirm("Are you sure you want to delete this link ?"); if (agree) return true ; else return false ; }</script>
diff --git a/tpl/page.header.html b/tpl/page.header.html
index 654a551d..17c0c75c 100644
--- a/tpl/page.header.html
+++ b/tpl/page.header.html
@@ -1,6 +1,6 @@
1 1
2 <div id="logo" title="Share your links !" onclick="document.location='?';"></div> 2 <div id="logo" title="Share your links !" onclick="document.location='?';"></div>
3 <div style="float:right; font-style:italic; color:#bbb; text-align:right; padding:0 5 0 0;" class="nomobile">Shaare your links...<br> 3 <div id="linkcount" class="nomobile">Shaare your links...<br>
4 {if="!empty($linkcount)"}{$linkcount} links{/if}</div> 4 {if="!empty($linkcount)"}{$linkcount} links{/if}</div>
5 <span id="shaarli_title"><a href="{$titleLink}">{$shaarlititle|htmlspecialchars}</a></span> 5 <span id="shaarli_title"><a href="{$titleLink}">{$shaarlititle|htmlspecialchars}</a></span>
6 6
@@ -17,7 +17,7 @@
17 {/if} 17 {/if}
18 <a href="{$feedurl}?do=rss{$searchcrits}" class="nomobile">RSS Feed</a> 18 <a href="{$feedurl}?do=rss{$searchcrits}" class="nomobile">RSS Feed</a>
19 {if="$GLOBALS['config']['SHOW_ATOM']"} 19 {if="$GLOBALS['config']['SHOW_ATOM']"}
20 <a href="{$feedurl}?do=atom{$searchcrits}" style="padding-left:10px;" class="nomobile">ATOM Feed</a> 20 <a href="{$feedurl}?do=atom{$searchcrits}" class="nomobile">ATOM Feed</a>
21 {/if} 21 {/if}
22 <a href="?do=tagcloud">Tag cloud</a> 22 <a href="?do=tagcloud">Tag cloud</a>
23 <a href="?do=picwall{$searchcrits}">Picture wall</a> 23 <a href="?do=picwall{$searchcrits}">Picture wall</a>
diff --git a/tpl/tagcloud.html b/tpl/tagcloud.html
index 0dd2c0d3..9418e248 100644
--- a/tpl/tagcloud.html
+++ b/tpl/tagcloud.html
@@ -6,10 +6,10 @@
6<center> 6<center>
7<div id="cloudtag"> 7<div id="cloudtag">
8 {loop="tags"} 8 {loop="tags"}
9 <span style="color:#99f; font-size:9pt; padding-left:5px; padding-right:2px;">{$value.count}</span><a href="?searchtags={$key|urlencode}" style="font-size:{$value.size}pt; font-weight:bold; color:black; text-decoration:none">{$key|htmlspecialchars}</a> 9 <span class="count">{$value.count}</span><a href="?searchtags={$key|urlencode}" style="font-size:{$value.size}pt;">{$key|htmlspecialchars}</a>
10 {/loop} 10 {/loop}
11</div> 11</div>
12</center> 12</center>
13{include="page.footer"} 13{include="page.footer"}
14</body> 14</body>
15</html> \ No newline at end of file 15</html>
diff --git a/tpl/tools.html b/tpl/tools.html
index ba1c1e8e..ae31902b 100644
--- a/tpl/tools.html
+++ b/tpl/tools.html
@@ -10,10 +10,10 @@
10 <a href="?do=changetag"><b>Rename/delete tags</b> <span>: Rename or delete a tag in all links</span></a><br><br> 10 <a href="?do=changetag"><b>Rename/delete tags</b> <span>: Rename or delete a tag in all links</span></a><br><br>
11 <a href="?do=import"><b>Import</b> <span>: Import Netscape html bookmarks (as exported from Firefox, Chrome, Opera, delicious...)</span></a> <br><br> 11 <a href="?do=import"><b>Import</b> <span>: Import Netscape html bookmarks (as exported from Firefox, Chrome, Opera, delicious...)</span></a> <br><br>
12 <a href="?do=export"><b>Export</b> <span>: Export Netscape html bookmarks (which can be imported in Firefox, Chrome, Opera, delicious...)</span></a><br><br> 12 <a href="?do=export"><b>Export</b> <span>: Export Netscape html bookmarks (which can be imported in Firefox, Chrome, Opera, delicious...)</span></a><br><br>
13 <a class="smallbutton" onclick="alert('Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link...');return false;" href="javascript:javascript:(function(){var%20url%20=%20location.href;var%20title%20=%20document.title%20||%20url;window.open('{$pageabsaddr}?post='%20+%20encodeURIComponent(url)+'&amp;title='%20+%20encodeURIComponent(title)+'&amp;description='%20+%20encodeURIComponent(document.getSelection())+'&amp;source=bookmarklet','_blank','menubar=no,height=390,width=600,toolbar=no,scrollbars=no,status=no,dialog=1');})();"><b>Shaare link</b></a> <a href="#" style="clear:none;"><span>&#x21D0; Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....).<br>&nbsp;&nbsp;&nbsp;&nbsp;Then click "Shaare link" button in any page you want to share.</span></a><br><br> 13 <a class="smallbutton" onclick="alert('Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link...');return false;" href="javascript:javascript:(function(){var%20url%20=%20location.href;var%20title%20=%20document.title%20||%20url;window.open('{$pageabsaddr}?post='%20+%20encodeURIComponent(url)+'&amp;title='%20+%20encodeURIComponent(title)+'&amp;description='%20+%20encodeURIComponent(document.getSelection())+'&amp;source=bookmarklet','_blank','menubar=no,height=390,width=600,toolbar=no,scrollbars=no,status=no,dialog=1');})();"><b>Shaare link</b></a> <a href="#" id="bookmark"><span>&#x21D0; Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....).<br>&nbsp;&nbsp;&nbsp;&nbsp;Then click "Shaare link" button in any page you want to share.</span></a><br><br>
14 <div class="clear"></div> 14 <div class="clear"></div>
15 </div> 15 </div>
16</div> 16</div>
17{include="page.footer"} 17{include="page.footer"}
18</body> 18</body>
19</html> \ No newline at end of file 19</html>