pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'dev' into savewithtags

Browse Source
This commit is contained in:
Thomas Citharel
2015-02-01 12:23:30 +01:00
parent 308fca6b78 fae15c9f84
commit 8f209e8a26
21 changed files with 1008 additions and 969 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
themes/default/css/style-default.css
View File

@ -67,3 +67,6 @@ a.bad-display span {
a.print span {
background-image: url('../img/default/print.png');
}
a.reload span {
background-image: url('../img/default/reload.png');
}

10
themes/default/css/style.css
View File

@ -151,6 +151,16 @@ a:visited {
text-indent: -9999px;
}
.random {
display: inline-block;
width: 16px;
height: 16px;
overflow: hidden;
text-align: left;
text-indent: -9999px;
background-image: url('../img/default/dice.png');
}
/*** ***/
/*** ARTICLE PAGE ***/

3
themes/default/home.twig
View File

@ -31,7 +31,8 @@
{% block pager %}
{% if nb_results > 1 %}
<div class="results">
<div class="nb-results">{{ nb_results }} {% trans "results" %}{% if searchterm is defined %}{% trans " found for « " %} {{ searchterm }} »{% endif %}</div>
<div class="nb-results">{{ nb_results }} {% trans "results" %}{% if searchterm is defined %}{% trans " found for « " %} {{ searchterm }} »{% endif %}
<a class="random" href="?view=view&id={{ random }}"><span>{% trans "random" %}</span></a></div>
{{ page_links | raw }}
</div>
{% elseif nb_results == 1 %}

BIN
themes/default/img/default/dice.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 243 B

BIN
themes/default/img/default/reload.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 343 B

1
themes/default/view.twig
View File

@ -18,6 +18,7 @@
{% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span></a></li>{% elseif flattr.status == constant('FLATTRED') %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span>{{ flattr.numFlattrs }}</a></li>{% endif %}{% endif %}
{% if constant('CARROT') == 1 %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon" target="_blank" title="{% trans "carrot" %}"><span>{% trans "carrot" %}</span></a></li>{% endif %}
{% if constant('SHOW_PRINTLINK') == 1 %}<li><a title="{% trans "Print" %}" class="tool print" href="javascript: window.print();"><span>{% trans "Print" %}</span></a></li>{% endif %}
{% if constant('RELOAD_ARTICLE') == 1 %}<li><a class="tool reload" href="./?action=reload_article&amp;id={{ entry.id|e }}" title="{% trans "Reload article" %}"><span>{% trans "Reload article" %}</span></a></li>{% endif %}}
{% if constant('EPUB') == 1 %}<li><a href="./?epub&amp;method=id&amp;value={{ entry.id|e }}" title="Generate ePub file">EPUB</a></li>{% endif %}
{% if constant('MOBI') == 1 %}<li><a href="./?mobi&amp;method=id&amp;value={{ entry.id|e }}" title="Generate Mobi file">MOBI</a></li>{% endif %}
{% if constant('PDF') == 1 %}<li><a href="./?pdf&amp;method=id&amp;value={{ entry.id|e }}" title="Generate PDF file">PDF</a></li>{% endif %}