diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-02-11 16:49:03 +0100 |
---|---|---|
committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-02-11 16:49:03 +0100 |
commit | 9b5edf33a00490b033692efca9987a35225835ba (patch) | |
tree | 73d3c24ecdeab3b65b1ea2ca2d90fe6d31d5780c /src/Wallabag/CoreBundle/Resources | |
parent | 5db084e05b84ac87179336b96b5db9579fa78c67 (diff) | |
parent | e686a76d343a3745c3dfe8010d9e5784e56bb17c (diff) | |
download | wallabag-9b5edf33a00490b033692efca9987a35225835ba.tar.gz wallabag-9b5edf33a00490b033692efca9987a35225835ba.tar.zst wallabag-9b5edf33a00490b033692efca9987a35225835ba.zip |
Merge pull request #1663 from wallabag/v2-remove-tags-from-entry
remove tag from entry #1377
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig | 2 |
2 files changed, 2 insertions, 2 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 2d3fd516..87af07dd 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 | |||
@@ -159,7 +159,7 @@ main { | |||
159 | <div id="list"> | 159 | <div id="list"> |
160 | {% for tag in entry.tags %} | 160 | {% for tag in entry.tags %} |
161 | <div class="chip"> | 161 | <div class="chip"> |
162 | {{ tag.label }} | 162 | {{ tag.label }} <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i class="chip">✘</i></a> |
163 | </div> | 163 | </div> |
164 | {% endfor %} | 164 | {% endfor %} |
165 | </div> | 165 | </div> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig index 9f92c178..19754d41 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig | |||
@@ -9,7 +9,7 @@ | |||
9 | <br /> | 9 | <br /> |
10 | <ul class="row data"> | 10 | <ul class="row data"> |
11 | {% for tag in tags %} | 11 | {% for tag in tags %} |
12 | <li id="tag-{{ tag.id|e }}" class="col l4 m6 s12">{{tag.label}}</li> | 12 | <li id="tag-{{ tag.id|e }}" class="col l4 m6 s12">{{tag.label}} ({{ tag.entries.getValues | length }})</li> |
13 | {% endfor %} | 13 | {% endfor %} |
14 | </ul> | 14 | </ul> |
15 | {% endblock %} | 15 | {% endblock %} |