diff options
author | Thomas Citharel <tcit@tcit.fr> | 2016-10-05 14:06:55 +0200 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2016-10-05 14:06:55 +0200 |
commit | 15f1352ef8761d3e083fc17c8354c30ca3542050 (patch) | |
tree | ffddb97ebfaa4a9e7d46b7560d7084d3cfaf03e3 /src/Wallabag/CoreBundle | |
parent | 645c0d5bce85be0dfcb7b58c31ce96a47ceb99e3 (diff) | |
download | wallabag-15f1352ef8761d3e083fc17c8354c30ca3542050.tar.gz wallabag-15f1352ef8761d3e083fc17c8354c30ca3542050.tar.zst wallabag-15f1352ef8761d3e083fc17c8354c30ca3542050.zip |
better tags on material
Diffstat (limited to 'src/Wallabag/CoreBundle')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | 6 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | 5 |
2 files changed, 6 insertions, 5 deletions
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 01fde953..55b3ee5c 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 | |||
@@ -17,7 +17,7 @@ | |||
17 | <div class="card-image waves-effect waves-block waves-light"> | 17 | <div class="card-image waves-effect waves-block waves-light"> |
18 | <ul class="card-entry-labels"> | 18 | <ul class="card-entry-labels"> |
19 | {% for tag in entry.tags | slice(0, 3) %} | 19 | {% for tag in entry.tags | slice(0, 3) %} |
20 | <li>{{ tag.label }}</li> | 20 | <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li> |
21 | {% endfor %} | 21 | {% endfor %} |
22 | </ul> | 22 | </ul> |
23 | <div class="preview activator" style="background-image: url({{ entry.previewPicture }})"></div> | 23 | <div class="preview activator" style="background-image: url({{ entry.previewPicture }})"></div> |
@@ -46,7 +46,7 @@ | |||
46 | <p>{{ entry.content|striptags|slice(0, 300)|raw }}…</p> | 46 | <p>{{ entry.content|striptags|slice(0, 300)|raw }}…</p> |
47 | <ul class="card-entry-labels-hidden"> | 47 | <ul class="card-entry-labels-hidden"> |
48 | {% for tag in entry.tags | slice(0, 2) %} | 48 | {% for tag in entry.tags | slice(0, 2) %} |
49 | <li>{{ tag.label }}</li> | 49 | <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li> |
50 | {% endfor %} | 50 | {% endfor %} |
51 | </ul> | 51 | </ul> |
52 | {% endif %} | 52 | {% endif %} |
@@ -68,7 +68,7 @@ | |||
68 | 68 | ||
69 | <ul class="card-entry-labels-hidden"> | 69 | <ul class="card-entry-labels-hidden"> |
70 | {% for tag in entry.tags %} | 70 | {% for tag in entry.tags %} |
71 | <li>{{ tag.label }}</li> | 71 | <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li> |
72 | {% endfor %} | 72 | {% endfor %} |
73 | </ul> | 73 | </ul> |
74 | </div> | 74 | </div> |
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 d52ab01c..1ddb5a15 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 | |||
@@ -223,12 +223,13 @@ | |||
223 | </span> | 223 | </span> |
224 | <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i><span class="link">{{ entry.createdAt|date('Y-m-d') }}</span> | 224 | <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i><span class="link">{{ entry.createdAt|date('Y-m-d') }}</span> |
225 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool"> | 225 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool"> |
226 | <i class="material-icons link">link</i> <span class="link">{{ entry.domainName|removeWww }}</span></a> | 226 | <i class="material-icons link">link</i> <span class="link">{{ entry.domainName|removeWww }}</span> |
227 | </a> | ||
227 | <span class="tool"><i class="material-icons link">comment</i> <span class="link">{{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> | 228 | <span class="tool"><i class="material-icons link">comment</i> <span class="link">{{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> |
228 | <div id="list"> | 229 | <div id="list"> |
229 | {% for tag in entry.tags %} | 230 | {% for tag in entry.tags %} |
230 | <div class="chip"> | 231 | <div class="chip"> |
231 | {{ tag.label }} <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i class="material-icons">delete</i></a> | 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 | </div> | 233 | </div> |
233 | {% endfor %} | 234 | {% endfor %} |
234 | </div> | 235 | </div> |