Skip to content

Commit

Permalink
Màj de compatibilité avec Shaarli v0.6.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexisju
alexisju committed Mar 4, 2016
1 parent 1d43efa commit 8a08666
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 29 deletions.
4 changes: 2 additions & 2 deletions dailyrss.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<title>{$title} - {function="strftime('%A %e %B %Y', $daydate)"}</title>
<guid>{$absurl}</guid>
<link>{$absurl}</link>
<pubDate>{$rfc822date}</pubDate>
<pubDate>{$rssdate}</pubDate>
<description><![CDATA[
{loop="links"}
<h3><a href="{$value.url}">{$value.title}</a></h3>
Expand All @@ -13,4 +13,4 @@ <h3><a href="{$value.url}">{$value.title}</a></h3>
<br><br><hr>
{/loop}
]]></description>
</item>
</item>
17 changes: 15 additions & 2 deletions inc/albinomouse.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/* Template : AlbinoMouse pour Shaarli par Alexis J (http://liens.effingo.be) */
/* Sources : https://github.com/alexisju/albinomouse-template */
/* */
/* Version : 20160206 */
/* Version : 20160304 */

@font-face {
font-family: "Open Sans";
Expand Down Expand Up @@ -53,6 +53,10 @@ h1 {
margin-bottom: 20px;
}

em {
font-style: italic;
}

/* Buttons */
.bigbutton {
cursor: pointer;
Expand Down Expand Up @@ -1066,6 +1070,10 @@ width: 80%;
padding: 20px 0 0 20px;
}

#pluginsadmin label {
cursor: pointer;
}

#pluginsadmin section {
padding: 20px 0;
}
Expand Down Expand Up @@ -1122,6 +1130,11 @@ width: 20%;
color: black;
}

.linklist-plugin-icon {
width: 13px;
height: 13px;
}

/* 404 page */
.error-container {

Expand Down Expand Up @@ -1350,4 +1363,4 @@ div#permalinkQrcode {
margin-left:0px;
margin-bottom:10px;
}
}
}
31 changes: 19 additions & 12 deletions linklist.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,25 @@
{include="linklist.paging"}

{if="count($links)==0"}
<div id="searchcriteria">Nothing found.</i></div>
{else}
{if="$search_type=='fulltext'"}
<div id="searchcriteria">{$result_count} results for <span id="searchcriteria_result">{$search_crits}</span></div>
{/if}
{if="$search_type=='tags'"}
<div id="searchcriteria">{$result_count} results for tags
{loop="search_crits"}
<span class="linktag" title="Remove tag"> <a href="?removetag={function="urlencode($value)"}">{$value} <span id="searchcriteria_result"><i class="glyphicon glyphicon-remove"></i></span></a></span>
{/loop}</div>
{/if}
<div id="searchcriteria">Nothing found.</div>
{elseif="!empty($search_term) or !empty($search_tags)"}
<div id="searchcriteria">
{$result_count} results
{if="!empty($search_term)"}
for <em>{$search_term}</em>
{/if}
{if="!empty($search_tags)"}
{$exploded_tags=explode(' ', $search_tags)}
tagged
{loop="$exploded_tags"}
<span class="linktag" title="Remove tag">
<a href="?removetag={function="urlencode($value)"}">{$value} <span class="remove">x</span></a>
</span>
{/loop}
{/if}
</div>
{/if}

<ul>
{loop="links"}
<li{if="$value.class"} class="{$value.class}"{/if}>
Expand Down Expand Up @@ -80,4 +87,4 @@
{include="page.footer"}

</body>
</html>
</html>
10 changes: 5 additions & 5 deletions page.header.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<div id="am-searchcontainer">
<form method="GET" class="searchform" name="searchform">
<input type="text" tabindex="1" id="searchform_value" name="searchterm" placeholder="recherche libre"
{if="!empty($search_crits) && $search_type=='fulltext'"}
value="{$search_crits}"
{if="!empty($search_term)"}
value="{$search_term}"
{/if}
>
</form><br/>
<form method="GET" class="tagfilter" name="tagfilter">
<input type="text" tabindex="2" name="searchtags" id="tagfilter_value" placeholder="recherche par tag"
{if="!empty($search_crits) && $search_type=='tags'"}
value="{function="implode(' ', $search_crits)"}"
{if="!empty($search_tags)"}
value="{$search_tags}"
{/if}
autocomplete="off" class="awesomplete" data-multiple data-minChars="1"
data-list="{loop="$tags"}{$key}, {/loop}"
Expand All @@ -39,4 +39,4 @@
</div>
{/if}
</div>
<div class="clear"></div>
<div class="clear"></div>
16 changes: 8 additions & 8 deletions pluginsadmin.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ <h1>Enabled Plugins</h1>
<tbody>
{loop="$enabledPlugins"}
<tr data-line="{$key}" data-order="{$counter}">
<td class="center"><input type="checkbox" name="{$key}" checked="checked"></td>
<td class="center"><input type="checkbox" name="{$key}" id="{$key}" checked="checked"></td>
<td class="center">
<a href="#"
onclick="return orderUp(this.parentNode.parentNode.getAttribute('data-order'));">
Expand All @@ -50,8 +50,8 @@ <h1>Enabled Plugins</h1>
</a>
<input type="hidden" name="order_{$key}" value="{$counter}">
</td>
<td>{$key}</td>
<td>{$value.description}</td>
<td><label for="{$key}">{function="str_replace('_', ' ', $key)"}</label></td>
<td><label for="{$key}">{$value.description}</label></td>
</tr>
{/loop}
</tbody>
Expand All @@ -75,9 +75,9 @@ <h1>Disabled Plugins</h1>
</tr>
{loop="$disabledPlugins"}
<tr>
<td class="center"><input type="checkbox" name="{$key}"></td>
<td>{$key}</td>
<td>{$value.description}</td>
<td class="center"><input type="checkbox" name="{$key}" id="{$key}"></td>
<td><label for="{$key}">{function="str_replace('_', ' ', $key)"}</label></td>
<td><label for="{$key}">{$value.description}</label></td>
</tr>
{/loop}
</table>
Expand All @@ -101,7 +101,7 @@ <h1>Enabled Plugin Parameters</h1>
{loop="$enabledPlugins"}
{if="count($value.parameters) > 0"}
<div class="plugin_parameters">
<h2>{$key}</h2>
<h2>{function="str_replace('_', ' ', $key)"}</h2>
{loop="$value.parameters"}
<div class="plugin_parameter">
<div class="float_label">
Expand Down Expand Up @@ -131,4 +131,4 @@ <h2>{$key}</h2>

<script src="inc/plugin_admin.js#"></script>
</body>
</html>
</html>

0 comments on commit 8a08666

Please sign in to comment.