diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2014-02-28 12:17:18 +0100 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2014-02-28 12:17:18 +0100 |
commit | cf75bb31e94df45512f2c04e1cfb8dc7723ffbfb (patch) | |
tree | 6f4a680eb3dcbef2adea7260ca856f5ab3e8f0a8 | |
parent | affbd83b485398a2141839b19b592d316d12d1a9 (diff) | |
parent | fc52df0677cf0477d348a7b71627ea0c2232c2c3 (diff) | |
download | wallabag-cf75bb31e94df45512f2c04e1cfb8dc7723ffbfb.tar.gz wallabag-cf75bb31e94df45512f2c04e1cfb8dc7723ffbfb.tar.zst wallabag-cf75bb31e94df45512f2c04e1cfb8dc7723ffbfb.zip |
Merge pull request #517 from mariroz/dev
effect of block rebuilding on next page removed, issue #479
-rwxr-xr-x | inc/poche/Poche.class.php | 1 | ||||
-rwxr-xr-x | themes/baggy/home.twig | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 4100f156..d42da60d 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php | |||
@@ -660,6 +660,7 @@ class Poche | |||
660 | 'entries' => '', | 660 | 'entries' => '', |
661 | 'page_links' => '', | 661 | 'page_links' => '', |
662 | 'nb_results' => '', | 662 | 'nb_results' => '', |
663 | 'listmode' => (isset($_COOKIE['listmode']) ? true : false), | ||
663 | ); | 664 | ); |
664 | 665 | ||
665 | //if id is given - we retrive entries by tag: id is tag id | 666 | //if id is given - we retrive entries by tag: id is tag id |
diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig index 5262c05b..7bc0472d 100755 --- a/themes/baggy/home.twig +++ b/themes/baggy/home.twig | |||
@@ -32,7 +32,7 @@ | |||
32 | {% endblock %} | 32 | {% endblock %} |
33 | <div class="list-entries"> | 33 | <div class="list-entries"> |
34 | {% for entry in entries %} | 34 | {% for entry in entries %} |
35 | <div id="entry-{{ entry.id|e }}" class="entrie"> | 35 | <div id="entry-{{ entry.id|e }}" class="entrie"{% if listmode %} style="width:100%; margin-left:0;"{% endif %}> |
36 | <h2><a href="index.php?view=view&id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2> | 36 | <h2><a href="index.php?view=view&id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2> |
37 | {% if entry.content| getReadingTime > 0 %} | 37 | {% if entry.content| getReadingTime > 0 %} |
38 | <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> | 38 | <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> |