moparisthebest
/
wallabag
mirror of https://github.com/moparisthebest/wallabag
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'dev' of https://github.com/wallabag/wallabag into dev

This commit is contained in:
Nicolas Lœuillet 2014-02-28 14:06:59 +01:00
parent 346380e131 cf75bb31e9
commit 49c803425c
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
inc/poche/Poche.class.php
View File

@ -661,6 +661,7 @@ class Poche
'entries' => '',
'page_links' => '',
'nb_results' => '',
'listmode' => (isset($_COOKIE['listmode']) ? true : false),
);
//if id is given - we retrive entries by tag: id is tag id

2
themes/baggy/home.twig
View File

@ -32,7 +32,7 @@
{% endblock %}
<div class="list-entries">
{% for entry in entries %}
<div id="entry-{{ entry.id|e }}" class="entrie">
<div id="entry-{{ entry.id|e }}" class="entrie"{% if listmode %} style="width:100%; margin-left:0;"{% endif %}>
<h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
{% if entry.content| getReadingTime > 0 %}
<div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min</span></div>