mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-10-03 16:52:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2724 from Simounet/fix/reading-time

Browse source 
Fix entry reading time
This commit is contained in:
Thomas Citharel 2016-12-28 18:11:01 +01:00 committed by GitHub
commit 90f6ee4dbe
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig
View file

@ -1,8 +1,6 @@
<div class="card-action"> <div class="card-action">
<span class="reading-time grey-text"> <span class="reading-time grey-text">
<i class="material-icons" title="{{ 'entry.list.reading_time'|trans }}">timer</i> {% include "@WallabagCore/themes/material/Entry/_reading_time.html.twig" with {'entry': entry} only %}
{{ entry.readingTime / app.user.config.readingSpeed|round }} min&nbsp;
<i class="material-icons hide-on-med-and-down" title="{{ 'entry.view.created_at'|trans }}">today</i> <i class="material-icons hide-on-med-and-down" title="{{ 'entry.view.created_at'|trans }}">today</i>
<span class="hide-on-med-and-down">&nbsp;{{ entry.createdAt|date('Y-m-d') }}</span> <span class="hide-on-med-and-down">&nbsp;{{ entry.createdAt|date('Y-m-d') }}</span>
</span> </span>

7
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig Normal file
View file

@ -0,0 +1,7 @@
{% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
<i class="material-icons">timer</i>
{% if readingTime > 0 %}
{{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }}
{% else %}
{{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }}
{% endif %}

8
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
View file

@ -214,13 +214,7 @@
<aside> <aside>
<ul class="tools"> <ul class="tools">
<li> <li>
{% set readingTime = entry.readingTime / app.user.config.readingSpeed %} {% include "@WallabagCore/themes/material/Entry/_reading_time.html.twig" with {'entry': entry} only %}
<i class="material-icons">timer</i>
{% if readingTime > 0 %}
{{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }}
{% else %}
{{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }}
{% endif %}
</li> </li>
<li> <li>
<i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i> <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i>