aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2018-01-03 20:37:57 +0100
committerGitHub <noreply@github.com>2018-01-03 20:37:57 +0100
commit410216f435bd9594f37e861d0a0fea8205956a67 (patch)
tree48ee28d0ca14b8297e6b61d3eb53b9be0602a81b /src
parent2679eb9d844379b65cd126975ef2d3625d39081f (diff)
parentb8568662bdb5f118f7382e7b30bff886d6a185a7 (diff)
downloadwallabag-410216f435bd9594f37e861d0a0fea8205956a67.tar.gz
wallabag-410216f435bd9594f37e861d0a0fea8205956a67.tar.zst
wallabag-410216f435bd9594f37e861d0a0fea8205956a67.zip
Merge pull request #3536 from wallabag/tag-link-3534
Fix broken link to remove tags from entries
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_tags.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig
index ab7295d5..1c898f0f 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig
@@ -9,7 +9,7 @@
9 <div class="{{ subClass|default('original grey-text') }}"> 9 <div class="{{ subClass|default('original grey-text') }}">
10 <a href="{{ entry.url|e }}" target="_blank" title="{{ entry.domainName|removeWww }}" class="tool grey-text">{{ entry.domainName|removeWww }}</a> 10 <a href="{{ entry.url|e }}" target="_blank" title="{{ entry.domainName|removeWww }}" class="tool grey-text">{{ entry.domainName|removeWww }}</a>
11 {% if withTags is defined %} 11 {% if withTags is defined %}
12 {% include "@WallabagCore/themes/material/Entry/_tags.html.twig" with {'tags': entry.tags | slice(0, 3), 'listClass': ' hide-on-med-and-down'} only %} 12 {% include "@WallabagCore/themes/material/Entry/_tags.html.twig" with {'tags': entry.tags | slice(0, 3), 'entryId': entry.id, 'listClass': ' hide-on-med-and-down'} only %}
13 {% endif %} 13 {% endif %}
14 </div> 14 </div>
15</div> 15</div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_tags.html.twig
index 144a105e..1317b129 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_tags.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_tags.html.twig
@@ -4,7 +4,7 @@
4 <li class="chip"> 4 <li class="chip">
5 <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> 5 <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a>
6 {% if withRemove %} 6 {% if withRemove %}
7 <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}" onclick="return confirm('{{ 'entry.confirm.delete_tag'|trans|escape('js') }}')"> 7 <a href="{{ path('remove_tag', { 'entry': entryId, 'tag': tag.id }) }}" onclick="return confirm('{{ 'entry.confirm.delete_tag'|trans|escape('js') }}')">
8 <i class="material-icons vertical-align-middle">delete</i> 8 <i class="material-icons vertical-align-middle">delete</i>
9 </a> 9 </a>
10 {% endif %} 10 {% endif %}
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 bebe29a2..54066e95 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
@@ -268,7 +268,7 @@
268 </li> 268 </li>
269 {% endif %} 269 {% endif %}
270 </ul> 270 </ul>
271 {% include "@WallabagCore/themes/material/Entry/_tags.html.twig" with {'tags': entry.tags, 'withRemove': true} only %} 271 {% include "@WallabagCore/themes/material/Entry/_tags.html.twig" with {'tags': entry.tags, 'entryId': entry.id, 'withRemove': true} only %}
272 </div> 272 </div>
273 273
274 <div class="input-field nav-panel-add-tag" style="display: none"> 274 <div class="input-field nav-panel-add-tag" style="display: none">