From 9f01d0fde09fa055a7db9f26e77c5e6b3d6c2224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Mon, 28 Nov 2016 11:02:10 +0100
Subject: Added list view

---
 .../views/themes/material/Entry/_card_list.html.twig       | 14 ++++++++++++++
 .../views/themes/material/Entry/entries.html.twig          |  8 ++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig
new file mode 100644
index 00000000..3d971f0b
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig
@@ -0,0 +1,14 @@
+<div class="card">
+    <div class="card-stacked">
+        <div class="card-content">
+            <span class="card-title dot-ellipsis dot-resize-update">
+                <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title | raw | striptags }}">
+                        {{ entry.title| striptags | truncate(120, true, '…') | raw }}
+                </a>
+            </span>
+          <p>{{ entry.content|striptags|slice(0, 500)|raw }}&hellip;</p>
+        </div>
+
+        {% include "@WallabagCore/themes/material/Entry/_card_actions.html.twig" with {'entry': entry} only %}
+    </div>
+</div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index 00e8bf63..2921d366 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -12,9 +12,11 @@
 {% endblock %}
 
 {% block content %}
+    {% set viewMode = app.user.config.viewMode %}
     <div class="results clearfix">
         <div class="nb-results left">
             {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
+            <a href="{{ path('switch_view_mode') }}"><i class="material-icons">{% if viewMode == 0 %}view_list{% else %}view_module{% endif %}</i></a>
         </div>
         {% if entries.getNbPages > 1 %}
             {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
@@ -24,8 +26,10 @@
     <br />
     <ul class="row data">
         {% for entry in entries %}
-            <li id="entry-{{ entry.id|e }}" class="col l3 m6 s12">
-                {% if entry.previewPicture is null %}
+            <li id="entry-{{ entry.id|e }}" class="col {% if viewMode == 0 %}l3 m6{% endif %} s12">
+                {% if viewMode == 1 %}
+                    {% include "@WallabagCore/themes/material/Entry/_card_list.html.twig" with {'entry': entry} only %}
+                {% elseif entry.previewPicture is null %}
                     {% include "@WallabagCore/themes/material/Entry/_card_no_preview.html.twig" with {'entry': entry} only %}
                 {% elseif not entry.previewPicture is null and entry.mimetype starts with 'image/' %}
                     {% include "@WallabagCore/themes/material/Entry/_card_full_image.html.twig" with {'entry': entry} only %}
-- 
cgit v1.2.3


From 56a7ce17f3a9a22e0bfc8651cb690a14447e0afd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Mon, 28 Nov 2016 11:26:08 +0100
Subject: Hide article text on mobile with list mode

---
 .../Resources/views/themes/material/Entry/_card_list.html.twig          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig
index 3d971f0b..b77cdc14 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig
@@ -6,7 +6,7 @@
                         {{ entry.title| striptags | truncate(120, true, '…') | raw }}
                 </a>
             </span>
-          <p>{{ entry.content|striptags|slice(0, 500)|raw }}&hellip;</p>
+          <p class="hide-on-med-and-down">{{ entry.content|striptags|slice(0, 500)|raw }}&hellip;</p>
         </div>
 
         {% include "@WallabagCore/themes/material/Entry/_card_actions.html.twig" with {'entry': entry} only %}
-- 
cgit v1.2.3


From 9aa991281ddd315f607cabcfc3b917401d3d2104 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Mon, 28 Nov 2016 12:08:51 +0100
Subject: Renamed view_mode by list_mode and hide excerpt

---
 .../views/themes/material/Entry/_card_list.html.twig         | 12 ++++++++----
 .../Resources/views/themes/material/Entry/entries.html.twig  |  8 ++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig
index b77cdc14..bb9b64ce 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig
@@ -3,12 +3,16 @@
         <div class="card-content">
             <span class="card-title dot-ellipsis dot-resize-update">
                 <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title | raw | striptags }}">
-                        {{ entry.title| striptags | truncate(120, true, '…') | raw }}
+                    {{ entry.title| striptags | truncate(120, true, '…') | raw }}
                 </a>
             </span>
-          <p class="hide-on-med-and-down">{{ entry.content|striptags|slice(0, 500)|raw }}&hellip;</p>
+            <ul class="tools-list right">
+                <li>
+                    <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i></a>
+                    <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isStarred == 0 %}star_border{% else %}star{% endif %}</i></a>
+                    <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a>
+                </li>
+            </ul>
         </div>
-
-        {% include "@WallabagCore/themes/material/Entry/_card_actions.html.twig" with {'entry': entry} only %}
     </div>
 </div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index 2921d366..5fca53ae 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -12,11 +12,11 @@
 {% endblock %}
 
 {% block content %}
-    {% set viewMode = app.user.config.viewMode %}
+    {% set listMode = app.user.config.listMode %}
     <div class="results clearfix">
         <div class="nb-results left">
             {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
-            <a href="{{ path('switch_view_mode') }}"><i class="material-icons">{% if viewMode == 0 %}view_list{% else %}view_module{% endif %}</i></a>
+            <a href="{{ path('switch_view_mode') }}"><i class="material-icons">{% if listMode == 0 %}view_list{% else %}view_module{% endif %}</i></a>
         </div>
         {% if entries.getNbPages > 1 %}
             {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
@@ -26,8 +26,8 @@
     <br />
     <ul class="row data">
         {% for entry in entries %}
-            <li id="entry-{{ entry.id|e }}" class="col {% if viewMode == 0 %}l3 m6{% endif %} s12">
-                {% if viewMode == 1 %}
+            <li id="entry-{{ entry.id|e }}" class="col {% if listMode == 0 %}l3 m6{% endif %} s12">
+                {% if listMode == 1 %}
                     {% include "@WallabagCore/themes/material/Entry/_card_list.html.twig" with {'entry': entry} only %}
                 {% elseif entry.previewPicture is null %}
                     {% include "@WallabagCore/themes/material/Entry/_card_no_preview.html.twig" with {'entry': entry} only %}
-- 
cgit v1.2.3