diff options
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | 10 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index 12b0bc53..87b4424c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | |||
@@ -31,9 +31,13 @@ | |||
31 | </div> | 31 | </div> |
32 | <div class="link mdi-action-today"> {{ entry.createdAt|date('Y-m-d') }}</div> | 32 | <div class="link mdi-action-today"> {{ entry.createdAt|date('Y-m-d') }}</div> |
33 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} | 33 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} |
34 | <div class="link mdi-action-query-builder"> {% if readingTime > 0 %}{{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} | 34 | <div class="link mdi-action-query-builder"> |
35 | {% else %}{{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} | 35 | {% if readingTime > 0 %} |
36 | {% endif %}</div> | 36 | {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} |
37 | {% else %} | ||
38 | {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} | ||
39 | {% endif %} | ||
40 | </div> | ||
37 | {% set nbAnnotations = entry.annotations | length %} | 41 | {% set nbAnnotations = entry.annotations | length %} |
38 | <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> | 42 | <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> |
39 | <aside class="tags"> | 43 | <aside class="tags"> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index e76407b0..94a5dc31 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | |||
@@ -195,9 +195,13 @@ | |||
195 | <aside> | 195 | <aside> |
196 | <span class="link mdi-action-today"> {{ entry.createdAt|date('Y-m-d') }}</span> | 196 | <span class="link mdi-action-today"> {{ entry.createdAt|date('Y-m-d') }}</span> |
197 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} | 197 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} |
198 | <span class="link mdi-action-query-builder"> {% if readingTime > 0 %}{{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} | 198 | <span class="link mdi-action-query-builder"> |
199 | {% else %}{{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} | 199 | {% if readingTime > 0 %} |
200 | {% endif %}</span> | 200 | {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} |
201 | {% else %} | ||
202 | {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} | ||
203 | {% endif %} | ||
204 | </span> | ||
201 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link mdi-content-link"> <span>{{ entry.domainName|removeWww }}</span></a> | 205 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link mdi-content-link"> <span>{{ entry.domainName|removeWww }}</span></a> |
202 | <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> | 206 | <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> |
203 | <div id="list"> | 207 | <div id="list"> |