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

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 714fa9ee4331323f5da56d4c52bdd85ff9c159e9..49651c5290ffd45112d5e26f3a91257868936e20 100755 (executable)
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -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

diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig
index 5262c05bb5d97916b7198c171040e56b4f23292a..7bc0472dc0cb7fef680c9c022553f4f0702fc9be 100755 (executable)
--- a/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@ -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>