devol/wallabag
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1861 from wallabag/v2-round-estimated-time

Browse Source 
Round estimated time and add reading speed for Baggy
This commit is contained in:
Jeremy Benoist 2016-04-05 16:18:26 +02:00
commit e543d03fd7
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
View File

@ -23,19 +23,17 @@
{% for entry in entries %} {% for entry in entries %}
<div id="entry-{{ entry.id|e }}" class="entry"> <div id="entry-{{ entry.id|e }}" class="entry">
<h2><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></h2> <h2><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></h2>
{% if entry.readingTime > 0 %}
<div class="estimatedTime"> {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
<div class="estimatedTime">
<span class="tool reading-time"> <span class="tool reading-time">
{{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }} {% if readingTime > 0 %}
</span> {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round}) }}
</div>
{% else %} {% else %}
<div class="estimatedTime"> {{ 'entry.list.reading_time_less_one_minute'|trans|raw }}
<span class="tool reading-time">
{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}
</span>
</div>
{% endif %} {% endif %}
</span>
</div>
<ul class="tools links"> <ul class="tools links">
<li><a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool icon-check icon {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{{ 'entry.list.toogle_as_read'|trans }}</span></a></li> <li><a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool icon-check icon {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{{ 'entry.list.toogle_as_read'|trans }}</span></a></li>

2
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
View File

@ -54,7 +54,7 @@
<span class="tool reading-time"> <span class="tool reading-time">
{% set readingTime = entry.readingTime / app.user.config.readingSpeed %} {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
{% if readingTime > 0 %} {% if readingTime > 0 %}
{{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime}) }} {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round}) }}
{% else %} {% else %}
{{ 'entry.list.reading_time_less_one_minute'|trans|raw }} {{ 'entry.list.reading_time_less_one_minute'|trans|raw }}
{% endif %} {% endif %}