aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornodiscc <nodiscc@gmail.com>2015-01-09 02:34:00 +0100
committernodiscc <nodiscc@gmail.com>2015-01-09 02:34:00 +0100
commita2d5ef2127881561bf359390fac2d8d336a37335 (patch)
tree124a22ed9b66193d2d42df8a5693878046848da5
parent002f9625ec7d0f7673da1e7098fdea76487d0538 (diff)
parent8079dfd1cdec41a0bb3ee7ec2b974e8e64376d83 (diff)
downloadShaarli-a2d5ef2127881561bf359390fac2d8d336a37335.tar.gz
Shaarli-a2d5ef2127881561bf359390fac2d8d336a37335.tar.zst
Shaarli-a2d5ef2127881561bf359390fac2d8d336a37335.zip
Merge pull request #77 from ArthurHoaro/w3c
Make Shaarli's template W3C compliant #64
Diffstat
-rw-r--r--inc/shaarli.css34
-rw-r--r--tpl/changepassword.html2
-rw-r--r--tpl/configure.html16
-rw-r--r--tpl/daily.html12
-rw-r--r--tpl/export.html6
-rw-r--r--tpl/import.html2
-rw-r--r--tpl/linklist.html10
-rw-r--r--tpl/linklist.paging.html10
-rw-r--r--tpl/page.footer.html2
-rw-r--r--tpl/picwall.html16
-rw-r--r--tpl/tagcloud.html12
11 files changed, 68 insertions, 54 deletions
diff --git a/inc/shaarli.css b/inc/shaarli.css
index d52de925..4bd52810 100644
--- a/inc/shaarli.css
+++ b/inc/shaarli.css
@@ -291,34 +291,34 @@ h1 {
291 color: #fff; 291 color: #fff;
292} 292}
293 293
294#paging_privatelinks { 294.paging_privatelinks {
295 float: left; 295 float: left;
296} 296}
297 297
298#paging_linksperpage { 298.paging_linksperpage {
299 float: right; 299 float: right;
300 padding-right: 5px; 300 padding-right: 5px;
301} 301}
302 302
303#paging_linksperpage form.linksperpage { 303.paging_linksperpage form.linksperpage {
304 display: inline; 304 display: inline;
305} 305}
306 306
307#paging_linksperpage form.linksperpage input { 307.paging_linksperpage form.linksperpage input {
308 height: 15px; 308 height: 15px;
309} 309}
310 310
311#paging_current { 311.paging_current {
312 display: inline; 312 display: inline;
313 color: #fff; 313 color: #fff;
314 padding: 0 20 0 20; 314 padding: 0 20 0 20;
315} 315}
316 316
317#paging_older { 317.paging_older {
318 margin-right: 15px; 318 margin-right: 15px;
319} 319}
320 320
321#paging_newer { 321.paging_newer {
322 margin-left: 15px; 322 margin-left: 15px;
323} 323}
324 324
@@ -843,6 +843,10 @@ div.dailyNoEntry {
843 clear: both; 843 clear: both;
844} 844}
845 845
846.right {
847 text-align: right;
848}
849
846/* For lazy images loading in picture wall. 850/* For lazy images loading in picture wall.
847 Using http://www.appelsiini.net/projects/lazyload 851 Using http://www.appelsiini.net/projects/lazyload
848*/ 852*/
@@ -850,6 +854,12 @@ div.dailyNoEntry {
850 display: none; 854 display: none;
851} 855}
852 856
857#configuration_table td {
858 border: none;
859 padding: 10px;
860 vertical-align: top;
861}
862
853@media print { 863@media print {
854 html { 864 html {
855 border: none; 865 border: none;
@@ -958,17 +968,17 @@ div.dailyNoEntry {
958 left: 0px; 968 left: 0px;
959 } 969 }
960 970
961 #paging_privatelinks { 971 .paging_privatelinks {
962 float: none; 972 float: none;
963 } 973 }
964 974
965 #paging_linksperpage { 975 .paging_linksperpage {
966 float: none; 976 float: none;
967 margin-bottom: 10px; 977 margin-bottom: 10px;
968 font-size: smaller; 978 font-size: smaller;
969 } 979 }
970 980
971 #paging_older, #paging_newer, #paging_linksperpage a { 981 #paging_older, #paging_newer, .paging_linksperpage a {
972 border: 1px solid black; 982 border: 1px solid black;
973 padding: 3px 5px 3px 5px; 983 padding: 3px 5px 3px 5px;
974 background-color: #666; 984 background-color: #666;
@@ -1029,3 +1039,7 @@ div.dailyNoEntry {
1029.highlight { 1039.highlight {
1030 background-color: #FFFF33; 1040 background-color: #FFFF33;
1031} 1041}
1042
1043.center {
1044 text-align: center;
1045}
diff --git a/tpl/changepassword.html b/tpl/changepassword.html
index 48cf5fa3..c40daf9d 100644
--- a/tpl/changepassword.html
+++ b/tpl/changepassword.html
@@ -4,7 +4,7 @@
4<body onload="document.changepasswordform.oldpassword.focus();"> 4<body onload="document.changepasswordform.oldpassword.focus();">
5<div id="pageheader"> 5<div id="pageheader">
6 {include="page.header"} 6 {include="page.header"}
7 <form method="POST" action="" name="changepasswordform" id="changepasswordform"> 7 <form method="POST" action="#" name="changepasswordform" id="changepasswordform">
8 Old password: <input type="password" name="oldpassword">&nbsp; &nbsp; 8 Old password: <input type="password" name="oldpassword">&nbsp; &nbsp;
9 New password: <input type="password" name="setpassword"> 9 New password: <input type="password" name="setpassword">
10 <input type="hidden" name="token" value="{$token}"> 10 <input type="hidden" name="token" value="{$token}">
diff --git a/tpl/configure.html b/tpl/configure.html
index 645107ae..89e48bd1 100644
--- a/tpl/configure.html
+++ b/tpl/configure.html
@@ -5,26 +5,26 @@
5<div id="pageheader"> 5<div id="pageheader">
6 {include="page.header"} 6 {include="page.header"}
7{$timezone_js} 7{$timezone_js}
8 <form method="POST" action="" name="configform" id="configform"> 8 <form method="POST" action="#" name="configform" id="configform">
9 <input type="hidden" name="token" value="{$token}"> 9 <input type="hidden" name="token" value="{$token}">
10 <table border="0" cellpadding="20"> 10 <table id="configuration_table">
11 11
12 <tr><td><b>Page title:</b></td><td><input type="text" name="title" id="title" size="50" value="{$title}"></td></tr> 12 <tr><td><b>Page title:</b></td><td><input type="text" name="title" id="title" size="50" value="{$title}"></td></tr>
13 13
14 <tr><td><b>Title link:</b></td><td><input type="text" name="titleLink" id="titleLink" size="50" value="{$titleLink}"><br/><label for="titleLink">(default value is: ?)</label></td></tr> 14 <tr><td><b>Title link:</b></td><td><input type="text" name="titleLink" id="titleLink" size="50" value="{$titleLink}"><br/><label for="titleLink">(default value is: ?)</label></td></tr>
15 <tr><td valign="top"><b>Timezone:</b></td><td valign="top">{$timezone_form}</td></tr> 15 <tr><td><b>Timezone:</b></td><td>{$timezone_form}</td></tr>
16 16
17 <tr><td valign="top"><b>Redirector</b></td><td><input type="text" name="redirector" id="redirector" size="50" value="{$redirector}"><br>(e.g. <i>http://anonym.to/?</i> will mask the HTTP_REFERER)</td></tr> 17 <tr><td><b>Redirector</b></td><td><input type="text" name="redirector" id="redirector" size="50" value="{$redirector}"><br>(e.g. <i>http://anonym.to/?</i> will mask the HTTP_REFERER)</td></tr>
18 18
19 <tr><td valign="top"><b>Security:</b></td><td><input type="checkbox" name="disablesessionprotection" id="disablesessionprotection" {if="!empty($GLOBALS['disablesessionprotection'])"}checked{/if}><label for="disablesessionprotection">&nbsp;Disable session cookie hijacking protection (Check this if you get disconnected often or if your IP address changes often.)</label></td></tr> 19 <tr><td><b>Security:</b></td><td><input type="checkbox" name="disablesessionprotection" id="disablesessionprotection" {if="!empty($GLOBALS['disablesessionprotection'])"}checked{/if}><label for="disablesessionprotection">&nbsp;Disable session cookie hijacking protection (Check this if you get disconnected often or if your IP address changes often.)</label></td></tr>
20 20
21 <tr><td valign="top"><b>Features:</b></td><td> 21 <tr><td><b>Features:</b></td><td>
22 <input type="checkbox" name="disablejquery" id="disablejquery" {if="!empty($GLOBALS['disablejquery'])"}checked{/if}><label for="disablejquery">&nbsp;Disable jQuery and all heavy JavaScript (for example: Autocomplete in tags. Useful for slow computers.)</label> 22 <input type="checkbox" name="disablejquery" id="disablejquery" {if="!empty($GLOBALS['disablejquery'])"}checked{/if}><label for="disablejquery">&nbsp;Disable jQuery and all heavy JavaScript (for example: Autocomplete in tags. Useful for slow computers.)</label>
23 </td></tr> 23 </td></tr>
24 <tr><td valign="top"><b>New link:</b></td><td> 24 <tr><td><b>New link:</b></td><td>
25 <input type="checkbox" name="privateLinkByDefault" id="privateLinkByDefault" {if="!empty($GLOBALS['privateLinkByDefault'])"}checked{/if}/><label for="privateLinkByDefault">&nbsp;All new link are private by default</label></td> 25 <input type="checkbox" name="privateLinkByDefault" id="privateLinkByDefault" {if="!empty($GLOBALS['privateLinkByDefault'])"}checked{/if}/><label for="privateLinkByDefault">&nbsp;All new link are private by default</label></td>
26 </tr> 26 </tr>
27 <tr><td></td><td align="right"><input type="submit" name="Save" value="Save config" class="bigbutton"></td></tr> 27 <tr><td></td><td class="right"><input type="submit" name="Save" value="Save config" class="bigbutton"></td></tr>
28 </table> 28 </table>
29 </form> 29 </form>
30</div> 30</div>
diff --git a/tpl/daily.html b/tpl/daily.html
index b92425b5..e39ae7ab 100644
--- a/tpl/daily.html
+++ b/tpl/daily.html
@@ -6,14 +6,14 @@
6<div class="daily"> 6<div class="daily">
7 <div class="dailyAbout"> 7 <div class="dailyAbout">
8 All links of one day<br>in a single page.<br> 8 All links of one day<br>in a single page.<br>
9 {if="$previousday"} <a href="?do=daily&day={$previousday}"><b>&lt;</b>Previous day</a>{else}<b>&lt;</b>Previous day{/if} 9 {if="$previousday"} <a href="?do=daily&amp;day={$previousday}"><b>&lt;</b>Previous day</a>{else}<b>&lt;</b>Previous day{/if}
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&amp;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#">Daily RSS Feed</a> 13 <a href="?do=dailyrss" title="1 RSS entry per day"><img src="images/feed-icon-14x14.png#" alt="rss_feed">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" alt="floral_left"> The Daily Shaarli <img src="../images/floral_right.png" width="51" height="50" class="nomobile" alt="floral_right"></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">&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;</span> {$day} <span class="nomobile">&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;</span></div>
17 <div class="clear"></div> 17 <div class="clear"></div>
18 18
19 {if="$linksToDisplay"} 19 {if="$linksToDisplay"}
diff --git a/tpl/export.html b/tpl/export.html
index 911b02c1..9d101db4 100644
--- a/tpl/export.html
+++ b/tpl/export.html
@@ -5,9 +5,9 @@
5<div id="pageheader"> 5<div id="pageheader">
6 {include="page.header"} 6 {include="page.header"}
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&amp;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&amp;what=public"><b>Export public</b> <span>: Export public links only</span></a><br><br>
10 <a href="?do=export&what=private"><b>Export private</b> <span>: Export private links only</a> 10 <a href="?do=export&amp;what=private"><b>Export private</b> <span>: Export private links only</span></a>
11 <div class="clear"></div> 11 <div class="clear"></div>
12 </div> 12 </div>
13</div> 13</div>
diff --git a/tpl/import.html b/tpl/import.html
index 259e56ee..9ac3c2f9 100644
--- a/tpl/import.html
+++ b/tpl/import.html
@@ -8,7 +8,7 @@
8 Import Netscape HTML bookmarks (as exported from Firefox/Chrome/Opera/Delicious/Diigo...) (Max: {$maxfilesize|htmlspecialchars} bytes). 8 Import Netscape HTML bookmarks (as exported from Firefox/Chrome/Opera/Delicious/Diigo...) (Max: {$maxfilesize|htmlspecialchars} bytes).
9 <form method="POST" action="?do=upload" enctype="multipart/form-data" name="uploadform" id="uploadform"> 9 <form method="POST" action="?do=upload" enctype="multipart/form-data" name="uploadform" id="uploadform">
10 <input type="hidden" name="token" value="{$token}"> 10 <input type="hidden" name="token" value="{$token}">
11 <input type="file" name="filetoupload" size="80"> 11 <input type="file" name="filetoupload">
12 <input type="hidden" name="MAX_FILE_SIZE" value="{$maxfilesize|htmlspecialchars}"> 12 <input type="hidden" name="MAX_FILE_SIZE" value="{$maxfilesize|htmlspecialchars}">
13 <input type="submit" name="import_file" value="Import" class="bigbutton"><br> 13 <input type="submit" name="import_file" value="Import" class="bigbutton"><br>
14 <input type="checkbox" name="private" id="private"><label for="private">&nbsp;Import all links as private</label><br> 14 <input type="checkbox" name="private" id="private"><label for="private">&nbsp;Import all links as private</label><br>
diff --git a/tpl/linklist.html b/tpl/linklist.html
index eadbc4cd..42a75a1a 100644
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@ -30,7 +30,7 @@
30 <ul> 30 <ul>
31 {loop="links"} 31 {loop="links"}
32 <li{if="$value.class"} class="{$value.class}"{/if}> 32 <li{if="$value.class"} class="{$value.class}"{/if}>
33 <a name="{$value.linkdate|smallHash}" id="{$value.linkdate|smallHash}"></a> 33 <a id="{$value.linkdate|smallHash}"></a>
34 <div class="thumbnail">{$value.url|thumbnail}</div> 34 <div class="thumbnail">{$value.url|thumbnail}</div>
35 <div class="linkcontainer"> 35 <div class="linkcontainer">
36 {if="isLoggedIn()"} 36 {if="isLoggedIn()"}
@@ -51,9 +51,9 @@
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 class="linkqrcode"><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&amp;s=8&amp;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#" 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" alt="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">
59 {loop="value.taglist"}<span class="linktag" title="Add tag"><a href="?addtag={$value|urlencode}">{$value|htmlspecialchars}</a></span> {/loop} 59 {loop="value.taglist"}<span class="linktag" title="Add tag"><a href="?addtag={$value|urlencode}">{$value|htmlspecialchars}</a></span> {/loop}
@@ -70,7 +70,7 @@
70 70
71 {include="page.footer"} 71 {include="page.footer"}
72 72
73<script language="JavaScript"> 73<script>
74// Remove any displayed QR-Code 74// Remove any displayed QR-Code
75function remove_qrcode() 75function remove_qrcode()
76{ 76{
diff --git a/tpl/linklist.paging.html b/tpl/linklist.paging.html
index c2b98971..848541cd 100644
--- a/tpl/linklist.paging.html
+++ b/tpl/linklist.paging.html
@@ -1,6 +1,6 @@
1<div class="paging"> 1<div class="paging">
2{if="isLoggedIn()"} 2{if="isLoggedIn()"}
3 <div id="paging_privatelinks"> 3 <div class="paging_privatelinks">
4 <a href="?privateonly"> 4 <a href="?privateonly">
5 {if="$privateonly"} 5 {if="$privateonly"}
6 <img src="images/private_16x16_active.png#" width="16" height="16" title="Click to see all links" alt="Click to see all links"> 6 <img src="images/private_16x16_active.png#" width="16" height="16" title="Click to see all links" alt="Click to see all links">
@@ -10,11 +10,11 @@
10 </a> 10 </a>
11 </div> 11 </div>
12{/if} 12{/if}
13 <div id="paging_linksperpage"> 13 <div class="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" class="linksperpage"><input type="text" name="linksperpage" size="2"></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}" class="paging_older">&#x25C4;Older</a> {/if}
18 <div id="paging_current">page {$page_current} / {$page_max} </div> 18 <div class="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}" class="paging_newer">Newer&#x25BA;</a> {/if}
20</div> 20</div>
diff --git a/tpl/page.footer.html b/tpl/page.footer.html
index b494bf7d..e55a3cb4 100644
--- a/tpl/page.footer.html
+++ b/tpl/page.footer.html
@@ -5,5 +5,5 @@
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> 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>function confirmDeleteLink() { var agree=confirm("Are you sure you want to delete this link ?"); if (agree) return true ; else return false ; }</script>
9{/if} 9{/if}
diff --git a/tpl/picwall.html b/tpl/picwall.html
index b78e2609..bfaabf7e 100644
--- a/tpl/picwall.html
+++ b/tpl/picwall.html
@@ -9,15 +9,15 @@
9</head> 9</head>
10<body> 10<body>
11<div id="pageheader">{include="page.header"}</div> 11<div id="pageheader">{include="page.header"}</div>
12<center> 12<div class="center">
13<div class="picwall_container"> 13 <div id="picwall_container">
14 {loop="linksToDisplay"} 14 {loop="linksToDisplay"}
15 <div class="picwall_pictureframe"> 15 <div class="picwall_pictureframe">
16 {$value.thumbnail}<a href="{$value.permalink}"><span class="info">{$value.title|htmlspecialchars}</span></a> 16 {$value.thumbnail}<a href="{$value.permalink}"><span class="info">{$value.title|htmlspecialchars}</span></a>
17 </div> 17 </div>
18 {/loop} 18 {/loop}
19 </div>
19</div> 20</div>
20</center>
21{include="page.footer"} 21{include="page.footer"}
22 22
23{if="empty($GLOBALS['disablejquery'])"} 23{if="empty($GLOBALS['disablejquery'])"}
diff --git a/tpl/tagcloud.html b/tpl/tagcloud.html
index 9418e248..97205e2b 100644
--- a/tpl/tagcloud.html
+++ b/tpl/tagcloud.html
@@ -3,13 +3,13 @@
3<head>{include="includes"}</head> 3<head>{include="includes"}</head>
4<body> 4<body>
5 <div id="pageheader">{include="page.header"}</div> 5 <div id="pageheader">{include="page.header"}</div>
6<center> 6<div class="center">
7<div id="cloudtag"> 7 <div id="cloudtag">
8 {loop="tags"} 8 {loop="tags"}
9 <span class="count">{$value.count}</span><a href="?searchtags={$key|urlencode}" style="font-size:{$value.size}pt;">{$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</div>
12</center>
13{include="page.footer"} 13{include="page.footer"}
14</body> 14</body>
15</html> 15</html>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 10:01:36 +0000