From 25dc07d3c9d88dcb84444d69fd0b4822315c3fac Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Thu, 23 Jun 2016 09:06:54 +0200
Subject: Add tags on entries view

Should be tested on old browsers
---
 .../views/themes/material/Entry/entries.html.twig     | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig')

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 98616635..d245c8fd 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
@@ -26,6 +26,11 @@
                     <div class="card-body">
                         {% if not entry.previewPicture is null %}
                             <div class="card-image waves-effect waves-block waves-light">
+                                <ul class="card-entry-labels">
+                                {% for tag in entry.tags | slice(0, 3) %}
+                                    <li>{{ tag.label }}</li>
+                                {% endfor %}
+                                </ul>
                                 <div class="preview activator" style="background-image: url({{ entry.previewPicture }})"></div>
                             </div>
                         {% endif %}
@@ -50,6 +55,11 @@
 
                             {% if entry.previewPicture is null %}
                                 <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p>
+                                <ul class="card-entry-labels-hidden">
+                                {% for tag in entry.tags | slice(0, 2) %}
+                                    <li>{{ tag.label }}</li>
+                                {% endfor %}
+                            </ul>
                             {% endif %}
                         </div>
                     </div>
@@ -66,6 +76,15 @@
                             </div>
 
                             <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p>
+
+                            <ul class="card-entry-labels-hidden">
+                                {% for tag in entry.tags | slice(0, 2) %}
+                                    <li>{{ tag.label }}</li>
+                                {% endfor %}
+                            </ul>
+                            {% if entry.tags | length > 2 %}
+                                {{ 'entry.list.number_of_tags'|transchoice(entry.tags | length - 2) }}
+                            {% endif %}
                         </div>
                     {% endif %}
 
-- 
cgit v1.2.3


From a15022db96fb031f7a9bccbdcc9420a8ca94174c Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Thu, 23 Jun 2016 23:13:25 +0200
Subject: minor ui fixes

---
 .../Resources/views/themes/material/Entry/entries.html.twig        | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig')

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 d245c8fd..d1cadea9 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
@@ -40,7 +40,7 @@
                                 <i class="card-title grey-text text-darken-4 activator material-icons right">more_vert</i>
                             {% endif %}
 
-                            <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|striptags|slice(0, 42)|raw }}</a></span>
+                            <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|striptags }}">{{ entry.title|striptags|raw }}</a></span>
 
                             <div class="estimatedTime grey-text">
                                 <span class="tool reading-time">
@@ -78,13 +78,10 @@
                             <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p>
 
                             <ul class="card-entry-labels-hidden">
-                                {% for tag in entry.tags | slice(0, 2) %}
+                                {% for tag in entry.tags %}
                                     <li>{{ tag.label }}</li>
                                 {% endfor %}
                             </ul>
-                            {% if entry.tags | length > 2 %}
-                                {{ 'entry.list.number_of_tags'|transchoice(entry.tags | length - 2) }}
-                            {% endif %}
                         </div>
                     {% endif %}
 
-- 
cgit v1.2.3