diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-19 15:30:49 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-19 15:30:49 +0100 |
commit | 68003139e133835805b143b62c4407f19b495dab (patch) | |
tree | 9a71a15d021330fb6d55cc338f125161ddfc61dd /src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | |
parent | bbd4ae7b56d9db744482a5630abad350f2d819af (diff) | |
parent | cb1a6590c0e58c56d0612066501b3a586b103ed5 (diff) | |
download | wallabag-68003139e133835805b143b62c4407f19b495dab.tar.gz wallabag-68003139e133835805b143b62c4407f19b495dab.tar.zst wallabag-68003139e133835805b143b62c4407f19b495dab.zip |
Merge remote-tracking branch 'origin/master' into 2.2
# Conflicts:
# .editorconfig
# docs/de/index.rst
# docs/de/user/import.rst
# docs/en/index.rst
# docs/en/user/configuration.rst
# docs/en/user/import.rst
# docs/fr/index.rst
# docs/fr/user/import.rst
# src/Wallabag/CoreBundle/Command/InstallCommand.php
# src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
# src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
# web/bundles/wallabagcore/themes/baggy/css/style.min.css
# web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
# web/bundles/wallabagcore/themes/material/css/style.min.css
# web/bundles/wallabagcore/themes/material/js/material.min.js
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | 53 |
1 files changed, 32 insertions, 21 deletions
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 7912caa9..bed0fdec 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 | |||
@@ -212,27 +212,38 @@ | |||
212 | <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> | 212 | <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> |
213 | </header> | 213 | </header> |
214 | <aside> | 214 | <aside> |
215 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} | 215 | <ul class="tools"> |
216 | <i class="material-icons">timer</i> | 216 | <li> |
217 | <span class="link"> | 217 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} |
218 | {% if readingTime > 0 %} | 218 | <i class="material-icons">timer</i> |
219 | {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} | 219 | {% if readingTime > 0 %} |
220 | {% else %} | 220 | {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} |
221 | {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} | 221 | {% else %} |
222 | {% endif %} | 222 | {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} |
223 | </span> | 223 | {% endif %} |
224 | <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i><span class="link">{{ entry.createdAt|date('Y-m-d') }}</span> | 224 | </li> |
225 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool"> | 225 | <li> |
226 | <i class="material-icons link">link</i> <span class="link">{{ entry.domainName|removeWww }}</span> | 226 | <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i> |
227 | </a> | 227 | {{ entry.createdAt|date('Y-m-d') }} |
228 | <span class="tool"><i class="material-icons link">comment</i></span> <span class="link">{{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> | 228 | </li> |
229 | <div id="list"> | 229 | <li> |
230 | {% for tag in entry.tags %} | 230 | <i class="material-icons link">link</i> |
231 | <div class="chip"> | 231 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool"> |
232 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i class="material-icons">delete</i></a> | 232 | {{ entry.domainName|removeWww }} |
233 | </div> | 233 | </a> |
234 | {% endfor %} | 234 | </li> |
235 | </div> | 235 | <li> |
236 | <i class="material-icons link">comment</i> | ||
237 | {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }} | ||
238 | </li> | ||
239 | <li id="list"> | ||
240 | {% for tag in entry.tags %} | ||
241 | <div class="chip"> | ||
242 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i class="material-icons">delete</i></a> | ||
243 | </div> | ||
244 | {% endfor %} | ||
245 | </li> | ||
246 | </ul> | ||
236 | 247 | ||
237 | <div class="input-field nav-panel-add-tag" style="display: none"> | 248 | <div class="input-field nav-panel-add-tag" style="display: none"> |
238 | {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} | 249 | {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} |