Merge pull request #77 from ArthurHoaro/w3c

Make Shaarli's template W3C compliant #64
This commit is contained in:
nodiscc 2015-01-09 02:34:00 +01:00
commit a2d5ef2127
11 changed files with 68 additions and 54 deletions

View file

@ -291,34 +291,34 @@ h1 {
color: #fff; color: #fff;
} }
#paging_privatelinks { .paging_privatelinks {
float: left; float: left;
} }
#paging_linksperpage { .paging_linksperpage {
float: right; float: right;
padding-right: 5px; padding-right: 5px;
} }
#paging_linksperpage form.linksperpage { .paging_linksperpage form.linksperpage {
display: inline; display: inline;
} }
#paging_linksperpage form.linksperpage input { .paging_linksperpage form.linksperpage input {
height: 15px; height: 15px;
} }
#paging_current { .paging_current {
display: inline; display: inline;
color: #fff; color: #fff;
padding: 0 20 0 20; padding: 0 20 0 20;
} }
#paging_older { .paging_older {
margin-right: 15px; margin-right: 15px;
} }
#paging_newer { .paging_newer {
margin-left: 15px; margin-left: 15px;
} }
@ -843,6 +843,10 @@ div.dailyNoEntry {
clear: both; clear: both;
} }
.right {
text-align: right;
}
/* For lazy images loading in picture wall. /* For lazy images loading in picture wall.
Using http://www.appelsiini.net/projects/lazyload Using http://www.appelsiini.net/projects/lazyload
*/ */
@ -850,6 +854,12 @@ div.dailyNoEntry {
display: none; display: none;
} }
#configuration_table td {
border: none;
padding: 10px;
vertical-align: top;
}
@media print { @media print {
html { html {
border: none; border: none;
@ -958,17 +968,17 @@ div.dailyNoEntry {
left: 0px; left: 0px;
} }
#paging_privatelinks { .paging_privatelinks {
float: none; float: none;
} }
#paging_linksperpage { .paging_linksperpage {
float: none; float: none;
margin-bottom: 10px; margin-bottom: 10px;
font-size: smaller; font-size: smaller;
} }
#paging_older, #paging_newer, #paging_linksperpage a { #paging_older, #paging_newer, .paging_linksperpage a {
border: 1px solid black; border: 1px solid black;
padding: 3px 5px 3px 5px; padding: 3px 5px 3px 5px;
background-color: #666; background-color: #666;
@ -1029,3 +1039,7 @@ div.dailyNoEntry {
.highlight { .highlight {
background-color: #FFFF33; background-color: #FFFF33;
} }
.center {
text-align: center;
}

View file

@ -4,7 +4,7 @@
<body onload="document.changepasswordform.oldpassword.focus();"> <body onload="document.changepasswordform.oldpassword.focus();">
<div id="pageheader"> <div id="pageheader">
{include="page.header"} {include="page.header"}
<form method="POST" action="" name="changepasswordform" id="changepasswordform"> <form method="POST" action="#" name="changepasswordform" id="changepasswordform">
Old password: <input type="password" name="oldpassword">&nbsp; &nbsp; Old password: <input type="password" name="oldpassword">&nbsp; &nbsp;
New password: <input type="password" name="setpassword"> New password: <input type="password" name="setpassword">
<input type="hidden" name="token" value="{$token}"> <input type="hidden" name="token" value="{$token}">

View file

@ -5,26 +5,26 @@
<div id="pageheader"> <div id="pageheader">
{include="page.header"} {include="page.header"}
{$timezone_js} {$timezone_js}
<form method="POST" action="" name="configform" id="configform"> <form method="POST" action="#" name="configform" id="configform">
<input type="hidden" name="token" value="{$token}"> <input type="hidden" name="token" value="{$token}">
<table border="0" cellpadding="20"> <table id="configuration_table">
<tr><td><b>Page title:</b></td><td><input type="text" name="title" id="title" size="50" value="{$title}"></td></tr> <tr><td><b>Page title:</b></td><td><input type="text" name="title" id="title" size="50" value="{$title}"></td></tr>
<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> <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>
<tr><td valign="top"><b>Timezone:</b></td><td valign="top">{$timezone_form}</td></tr> <tr><td><b>Timezone:</b></td><td>{$timezone_form}</td></tr>
<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> <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>
<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> <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>
<tr><td valign="top"><b>Features:</b></td><td> <tr><td><b>Features:</b></td><td>
<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> <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>
</td></tr> </td></tr>
<tr><td valign="top"><b>New link:</b></td><td> <tr><td><b>New link:</b></td><td>
<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> <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>
</tr> </tr>
<tr><td></td><td align="right"><input type="submit" name="Save" value="Save config" class="bigbutton"></td></tr> <tr><td></td><td class="right"><input type="submit" name="Save" value="Save config" class="bigbutton"></td></tr>
</table> </table>
</form> </form>
</div> </div>

View file

@ -6,14 +6,14 @@
<div class="daily"> <div class="daily">
<div class="dailyAbout"> <div class="dailyAbout">
All links of one day<br>in a single page.<br> All links of one day<br>in a single page.<br>
{if="$previousday"} <a href="?do=daily&day={$previousday}"><b>&lt;</b>Previous day</a>{else}<b>&lt;</b>Previous day{/if} {if="$previousday"} <a href="?do=daily&amp;day={$previousday}"><b>&lt;</b>Previous day</a>{else}<b>&lt;</b>Previous day{/if}
- -
{if="$nextday"}<a href="?do=daily&day={$nextday}">Next day<b>&gt;</b></a>{else}Next day<b>&gt;</b>{/if} {if="$nextday"}<a href="?do=daily&amp;day={$nextday}">Next day<b>&gt;</b></a>{else}Next day<b>&gt;</b>{/if}
<br><br> <br><br>
<a href="?do=dailyrss" title="1 RSS entry per day"><img src="images/feed-icon-14x14.png#">Daily RSS Feed</a> <a href="?do=dailyrss" title="1 RSS entry per day"><img src="images/feed-icon-14x14.png#" alt="rss_feed">Daily RSS Feed</a>
</div> </div>
<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> <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>
<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> <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>
<div class="clear"></div> <div class="clear"></div>
{if="$linksToDisplay"} {if="$linksToDisplay"}

View file

@ -5,9 +5,9 @@
<div id="pageheader"> <div id="pageheader">
{include="page.header"} {include="page.header"}
<div id="toolsdiv"> <div id="toolsdiv">
<a href="?do=export&what=all"><b>Export all</b> <span>: Export all links</span></a><br><br> <a href="?do=export&amp;what=all"><b>Export all</b> <span>: Export all links</span></a><br><br>
<a href="?do=export&what=public"><b>Export public</b> <span>: Export public links only</a><br><br> <a href="?do=export&amp;what=public"><b>Export public</b> <span>: Export public links only</span></a><br><br>
<a href="?do=export&what=private"><b>Export private</b> <span>: Export private links only</a> <a href="?do=export&amp;what=private"><b>Export private</b> <span>: Export private links only</span></a>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
</div> </div>

View file

@ -8,7 +8,7 @@
Import Netscape HTML bookmarks (as exported from Firefox/Chrome/Opera/Delicious/Diigo...) (Max: {$maxfilesize|htmlspecialchars} bytes). Import Netscape HTML bookmarks (as exported from Firefox/Chrome/Opera/Delicious/Diigo...) (Max: {$maxfilesize|htmlspecialchars} bytes).
<form method="POST" action="?do=upload" enctype="multipart/form-data" name="uploadform" id="uploadform"> <form method="POST" action="?do=upload" enctype="multipart/form-data" name="uploadform" id="uploadform">
<input type="hidden" name="token" value="{$token}"> <input type="hidden" name="token" value="{$token}">
<input type="file" name="filetoupload" size="80"> <input type="file" name="filetoupload">
<input type="hidden" name="MAX_FILE_SIZE" value="{$maxfilesize|htmlspecialchars}"> <input type="hidden" name="MAX_FILE_SIZE" value="{$maxfilesize|htmlspecialchars}">
<input type="submit" name="import_file" value="Import" class="bigbutton"><br> <input type="submit" name="import_file" value="Import" class="bigbutton"><br>
<input type="checkbox" name="private" id="private"><label for="private">&nbsp;Import all links as private</label><br> <input type="checkbox" name="private" id="private"><label for="private">&nbsp;Import all links as private</label><br>

View file

@ -30,7 +30,7 @@
<ul> <ul>
{loop="links"} {loop="links"}
<li{if="$value.class"} class="{$value.class}"{/if}> <li{if="$value.class"} class="{$value.class}"{/if}>
<a name="{$value.linkdate|smallHash}" id="{$value.linkdate|smallHash}"></a> <a id="{$value.linkdate|smallHash}"></a>
<div class="thumbnail">{$value.url|thumbnail}</div> <div class="thumbnail">{$value.url|thumbnail}</div>
<div class="linkcontainer"> <div class="linkcontainer">
{if="isLoggedIn()"} {if="isLoggedIn()"}
@ -51,9 +51,9 @@
{if="$GLOBALS['config']['ARCHIVE_ORG']"} {if="$GLOBALS['config']['ARCHIVE_ORG']"}
<span class="linkarchive"><a href="https://web.archive.org/web/{$value.url|htmlspecialchars}">archive</a> - </span> <span class="linkarchive"><a href="https://web.archive.org/web/{$value.url|htmlspecialchars}">archive</a> - </span>
{/if} {/if}
<div class="linkqrcode"><a href="http://qrfree.kaywa.com/?l=1&s=8&d={$scripturl|urlencode}%3F{$value.linkdate|smallHash}" <div class="linkqrcode"><a href="http://qrfree.kaywa.com/?l=1&amp;s=8&amp;d={$scripturl|urlencode}%3F{$value.linkdate|smallHash}"
onclick="showQrCode(this); return false;" class="qrcode" data-permalink="{$scripturl}?{$value.linkdate|smallHash}"><img src="images/qrcode.png#" title="QR-Code"></a></div> - 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> -
<a href={$value.url|htmlspecialchars}><span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span></a><br> <a href="{$value.url|htmlspecialchars}"><span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span></a><br>
{if="$value.tags"} {if="$value.tags"}
<div class="linktaglist"> <div class="linktaglist">
{loop="value.taglist"}<span class="linktag" title="Add tag"><a href="?addtag={$value|urlencode}">{$value|htmlspecialchars}</a></span> {/loop} {loop="value.taglist"}<span class="linktag" title="Add tag"><a href="?addtag={$value|urlencode}">{$value|htmlspecialchars}</a></span> {/loop}
@ -70,7 +70,7 @@
{include="page.footer"} {include="page.footer"}
<script language="JavaScript"> <script>
// Remove any displayed QR-Code // Remove any displayed QR-Code
function remove_qrcode() function remove_qrcode()
{ {

View file

@ -1,6 +1,6 @@
<div class="paging"> <div class="paging">
{if="isLoggedIn()"} {if="isLoggedIn()"}
<div id="paging_privatelinks"> <div class="paging_privatelinks">
<a href="?privateonly"> <a href="?privateonly">
{if="$privateonly"} {if="$privateonly"}
<img src="images/private_16x16_active.png#" width="16" height="16" title="Click to see all links" alt="Click to see all links"> <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 @@
</a> </a>
</div> </div>
{/if} {/if}
<div id="paging_linksperpage"> <div class="paging_linksperpage">
Links per page: <a href="?linksperpage=20">20</a> <a href="?linksperpage=50">50</a> <a href="?linksperpage=100">100</a> Links per page: <a href="?linksperpage=20">20</a> <a href="?linksperpage=50">50</a> <a href="?linksperpage=100">100</a>
<form method="GET" class="linksperpage"><input type="text" name="linksperpage" size="2"></form> <form method="GET" class="linksperpage"><input type="text" name="linksperpage" size="2"></form>
</div> </div>
{if="$previous_page_url"} <a href="{$previous_page_url}" id="paging_older">&#x25C4;Older</a> {/if} {if="$previous_page_url"} <a href="{$previous_page_url}" class="paging_older">&#x25C4;Older</a> {/if}
<div id="paging_current">page {$page_current} / {$page_max} </div> <div class="paging_current">page {$page_current} / {$page_max} </div>
{if="$next_page_url"} <a href="{$next_page_url}" id="paging_newer">Newer&#x25BA;</a> {/if} {if="$next_page_url"} <a href="{$next_page_url}" class="paging_newer">Newer&#x25BA;</a> {/if}
</div> </div>

View file

@ -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> <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>
{/if} {/if}
{if="isLoggedIn()"} {if="isLoggedIn()"}
<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> <script>function confirmDeleteLink() { var agree=confirm("Are you sure you want to delete this link ?"); if (agree) return true ; else return false ; }</script>
{/if} {/if}

View file

@ -9,15 +9,15 @@
</head> </head>
<body> <body>
<div id="pageheader">{include="page.header"}</div> <div id="pageheader">{include="page.header"}</div>
<center> <div class="center">
<div class="picwall_container"> <div id="picwall_container">
{loop="linksToDisplay"} {loop="linksToDisplay"}
<div class="picwall_pictureframe"> <div class="picwall_pictureframe">
{$value.thumbnail}<a href="{$value.permalink}"><span class="info">{$value.title|htmlspecialchars}</span></a> {$value.thumbnail}<a href="{$value.permalink}"><span class="info">{$value.title|htmlspecialchars}</span></a>
</div> </div>
{/loop} {/loop}
</div>
</div> </div>
</center>
{include="page.footer"} {include="page.footer"}
{if="empty($GLOBALS['disablejquery'])"} {if="empty($GLOBALS['disablejquery'])"}

View file

@ -3,13 +3,13 @@
<head>{include="includes"}</head> <head>{include="includes"}</head>
<body> <body>
<div id="pageheader">{include="page.header"}</div> <div id="pageheader">{include="page.header"}</div>
<center> <div class="center">
<div id="cloudtag"> <div id="cloudtag">
{loop="tags"} {loop="tags"}
<span class="count">{$value.count}</span><a href="?searchtags={$key|urlencode}" style="font-size:{$value.size}pt;">{$key|htmlspecialchars}</a> <span class="count">{$value.count}</span><a href="?searchtags={$key|urlencode}" style="font-size:{$value.size}pt;">{$key|htmlspecialchars}</a>
{/loop} {/loop}
</div>
</div> </div>
</center>
{include="page.footer"} {include="page.footer"}
</body> </body>
</html> </html>