aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2016-06-23 09:06:54 +0200
committerThomas Citharel <tcit@tcit.fr>2016-06-23 22:50:39 +0200
commit25dc07d3c9d88dcb84444d69fd0b4822315c3fac (patch)
treeeb61a08f2820a8b69f566470078a631257bf7dfc /src/Wallabag
parent20218495a79a138833ca84dda37334fa42141d28 (diff)
downloadwallabag-25dc07d3c9d88dcb84444d69fd0b4822315c3fac.tar.gz
wallabag-25dc07d3c9d88dcb84444d69fd0b4822315c3fac.tar.zst
wallabag-25dc07d3c9d88dcb84444d69fd0b4822315c3fac.zip
Add tags on entries view
Should be tested on old browsers
Diffstat (limited to 'src/Wallabag')
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig19
3 files changed, 21 insertions, 0 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index b65e4522..826bd470 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -144,6 +144,7 @@ entry:
144 reading_time: 'estimated reading time' 144 reading_time: 'estimated reading time'
145 reading_time_minutes: 'estimated reading time: %readingTime% min' 145 reading_time_minutes: 'estimated reading time: %readingTime% min'
146 reading_time_less_one_minute: 'estimated reading time: <small class="inferieur">&lt;</small> 1 min' 146 reading_time_less_one_minute: 'estimated reading time: <small class="inferieur">&lt;</small> 1 min'
147 number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
147 original_article: 'original' 148 original_article: 'original'
148 toogle_as_read: 'Toggle mark as read' 149 toogle_as_read: 'Toggle mark as read'
149 toogle_as_star: 'Toggle favorite' 150 toogle_as_star: 'Toggle favorite'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 94300596..7c1464e1 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -144,6 +144,7 @@ entry:
144 reading_time: 'durée de lecture' 144 reading_time: 'durée de lecture'
145 reading_time_minutes: 'durée de lecture: %readingTime% min' 145 reading_time_minutes: 'durée de lecture: %readingTime% min'
146 reading_time_less_one_minute: 'durée de lecture: <small class="inferieur">&lt;</small> 1 min' 146 reading_time_less_one_minute: 'durée de lecture: <small class="inferieur">&lt;</small> 1 min'
147 number_of_tags: '{1}et un autre tag|]1,Inf[et %count% autres tags'
147 original_article: 'original' 148 original_article: 'original'
148 toogle_as_read: 'Marquer comme lu/non lu' 149 toogle_as_read: 'Marquer comme lu/non lu'
149 toogle_as_star: 'Marquer comme favori' 150 toogle_as_star: 'Marquer comme favori'
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 @@
26 <div class="card-body"> 26 <div class="card-body">
27 {% if not entry.previewPicture is null %} 27 {% if not entry.previewPicture is null %}
28 <div class="card-image waves-effect waves-block waves-light"> 28 <div class="card-image waves-effect waves-block waves-light">
29 <ul class="card-entry-labels">
30 {% for tag in entry.tags | slice(0, 3) %}
31 <li>{{ tag.label }}</li>
32 {% endfor %}
33 </ul>
29 <div class="preview activator" style="background-image: url({{ entry.previewPicture }})"></div> 34 <div class="preview activator" style="background-image: url({{ entry.previewPicture }})"></div>
30 </div> 35 </div>
31 {% endif %} 36 {% endif %}
@@ -50,6 +55,11 @@
50 55
51 {% if entry.previewPicture is null %} 56 {% if entry.previewPicture is null %}
52 <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p> 57 <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p>
58 <ul class="card-entry-labels-hidden">
59 {% for tag in entry.tags | slice(0, 2) %}
60 <li>{{ tag.label }}</li>
61 {% endfor %}
62 </ul>
53 {% endif %} 63 {% endif %}
54 </div> 64 </div>
55 </div> 65 </div>
@@ -66,6 +76,15 @@
66 </div> 76 </div>
67 77
68 <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p> 78 <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p>
79
80 <ul class="card-entry-labels-hidden">
81 {% for tag in entry.tags | slice(0, 2) %}
82 <li>{{ tag.label }}</li>
83 {% endfor %}
84 </ul>
85 {% if entry.tags | length > 2 %}
86 {{ 'entry.list.number_of_tags'|transchoice(entry.tags | length - 2) }}
87 {% endif %}
69 </div> 88 </div>
70 {% endif %} 89 {% endif %}
71 90