Skip to content

Commit

Permalink
Make Shaarli\'s template W3C compliant \shaarli#64
Browse files Browse the repository at this point in the history
  • Loading branch information
ArthurHoaro committed Jan 7, 2015
1 parent 002f962 commit 2514915
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 36 deletions.
20 changes: 12 additions & 8 deletions inc/shaarli.css
Original file line number Diff line number Diff line change
Expand Up @@ -291,24 +291,24 @@ h1 {
color: #fff;
}

#paging_privatelinks {
.paging_privatelinks {
float: left;
}

#paging_linksperpage {
.paging_linksperpage {
float: right;
padding-right: 5px;
}

#paging_linksperpage form.linksperpage {
.paging_linksperpage form.linksperpage {
display: inline;
}

#paging_linksperpage form.linksperpage input {
.paging_linksperpage form.linksperpage input {
height: 15px;
}

#paging_current {
.paging_current {
display: inline;
color: #fff;
padding: 0 20 0 20;
Expand Down Expand Up @@ -958,17 +958,17 @@ div.dailyNoEntry {
left: 0px;
}

#paging_privatelinks {
.paging_privatelinks {
float: none;
}

#paging_linksperpage {
.paging_linksperpage {
float: none;
margin-bottom: 10px;
font-size: smaller;
}

#paging_older, #paging_newer, #paging_linksperpage a {
#paging_older, #paging_newer, .paging_linksperpage a {
border: 1px solid black;
padding: 3px 5px 3px 5px;
background-color: #666;
Expand Down Expand Up @@ -1029,3 +1029,7 @@ div.dailyNoEntry {
.highlight {
background-color: #FFFF33;
}

.center {
text-align: center;
}
12 changes: 6 additions & 6 deletions tpl/daily.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<div class="daily">
<div class="dailyAbout">
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="$nextday"}<a href="?do=daily&day={$nextday}">Next day<b>&gt;</b></a>{else}Next day<b>&gt;</b>{/if}
{if="$previousday"} <a href="?amp;do=daily&amp;day={$previousday}"><b>&lt;</b>Previous day</a>{else}<b>&lt;</b>Previous day{/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>
<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 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="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="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">&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>

{if="$linksToDisplay"}
Expand Down
10 changes: 5 additions & 5 deletions tpl/linklist.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<ul>
{loop="links"}
<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="linkcontainer">
{if="isLoggedIn()"}
Expand All @@ -51,9 +51,9 @@
{if="$GLOBALS['config']['ARCHIVE_ORG']"}
<span class="linkarchive"><a href="https://web.archive.org/web/{$value.url|htmlspecialchars}">archive</a> - </span>
{/if}
<div class="linkqrcode"><a href="http://qrfree.kaywa.com/?l=1&s=8&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> -
<a href={$value.url|htmlspecialchars}><span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span></a><br>
<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" alt="QR-Code"></a></div> -
<a href="{$value.url|htmlspecialchars}"><span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span></a><br>
{if="$value.tags"}
<div class="linktaglist">
{loop="value.taglist"}<span class="linktag" title="Add tag"><a href="?addtag={$value|urlencode}">{$value|htmlspecialchars}</a></span> {/loop}
Expand All @@ -70,7 +70,7 @@

{include="page.footer"}

<script language="JavaScript">
<script>
// Remove any displayed QR-Code
function remove_qrcode()
{
Expand Down
6 changes: 3 additions & 3 deletions tpl/linklist.paging.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="paging">
{if="isLoggedIn()"}
<div id="paging_privatelinks">
<div class="paging_privatelinks">
<a href="?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">
Expand All @@ -10,11 +10,11 @@
</a>
</div>
{/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>
<form method="GET" class="linksperpage"><input type="text" name="linksperpage" size="2"></form>
</div>
{if="$previous_page_url"} <a href="{$previous_page_url}" id="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}
</div>
16 changes: 8 additions & 8 deletions tpl/picwall.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
</head>
<body>
<div id="pageheader">{include="page.header"}</div>
<center>
<div class="picwall_container">
{loop="linksToDisplay"}
<div class="picwall_pictureframe">
{$value.thumbnail}<a href="{$value.permalink}"><span class="info">{$value.title|htmlspecialchars}</span></a>
</div>
{/loop}
<div class="center">
<div id="picwall_container">
{loop="linksToDisplay"}
<div class="picwall_pictureframe">
{$value.thumbnail}<a href="{$value.permalink}"><span class="info">{$value.title|htmlspecialchars}</span></a>
</div>
{/loop}
</div>
</div>
</center>
{include="page.footer"}

{if="empty($GLOBALS['disablejquery'])"}
Expand Down
12 changes: 6 additions & 6 deletions tpl/tagcloud.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<head>{include="includes"}</head>
<body>
<div id="pageheader">{include="page.header"}</div>
<center>
<div id="cloudtag">
{loop="tags"}
<span class="count">{$value.count}</span><a href="?searchtags={$key|urlencode}" style="font-size:{$value.size}pt;">{$key|htmlspecialchars}</a>
{/loop}
<div class="center">
<div id="cloudtag">
{loop="tags"}
<span class="count">{$value.count}</span><a href="?searchtags={$key|urlencode}" style="font-size:{$value.size}pt;">{$key|htmlspecialchars}</a>
{/loop}
</div>
</div>
</center>
{include="page.footer"}
</body>
</html>

0 comments on commit 2514915

Please sign in to comment.