aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2016-10-05 16:16:21 +0200
committerGitHub <noreply@github.com>2016-10-05 16:16:21 +0200
commit046f33e21bb96429933fc37ad756105f0ec67873 (patch)
treec6aa518ebb32a4ab2e33ccbe4925e7aab7edeae3 /src
parent145d69fe5d79f8d4edf493ed42e80f73beb689a3 (diff)
parent15f1352ef8761d3e083fc17c8354c30ca3542050 (diff)
downloadwallabag-046f33e21bb96429933fc37ad756105f0ec67873.tar.gz
wallabag-046f33e21bb96429933fc37ad756105f0ec67873.tar.zst
wallabag-046f33e21bb96429933fc37ad756105f0ec67873.zip
Merge pull request #2374 from wallabag/clickable-tags
Clickable tags
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig6
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig4
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig6
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig5
4 files changed, 12 insertions, 9 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
index 1c0430e8..3af88b23 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
@@ -29,16 +29,16 @@
29 <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.domainName|removeWww }}</span></a></li> 29 <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.domainName|removeWww }}</span></a></li>
30 </ul> 30 </ul>
31 {% if entry.previewPicture is null %} 31 {% if entry.previewPicture is null %}
32 <p>{{ entry.content|striptags|slice(0, 300) }}&hellip;</p>
33 <ul class="card-entry-tags"> 32 <ul class="card-entry-tags">
34 {% for tag in entry.tags %} 33 {% for tag in entry.tags %}
35 <li>{{ tag.label }}</li> 34 <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
36 {% endfor %} 35 {% endfor %}
37 </ul> 36 </ul>
37 <p>{{ entry.content|striptags|slice(0, 300) }}&hellip;</p>
38 {% else %} 38 {% else %}
39 <ul class="card-entry-labels"> 39 <ul class="card-entry-labels">
40 {% for tag in entry.tags | slice(0, 3) %} 40 {% for tag in entry.tags | slice(0, 3) %}
41 <li>{{ tag.label }}</li> 41 <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
42 {% endfor %} 42 {% endfor %}
43 </ul> 43 </ul>
44 <img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" /> 44 <img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" />
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index 9a5c8fe0..b1aabf9b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -57,9 +57,11 @@
57 {% set nbAnnotations = entry.annotations | length %} 57 {% set nbAnnotations = entry.annotations | length %}
58 <span class="tool link"><i class="material-icons link">comment</i> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> 58 <span class="tool link"><i class="material-icons link">comment</i> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
59 <aside class="tags"> 59 <aside class="tags">
60 <div class="card-entry-tags">
60 {% for tag in entry.tags %} 61 {% for tag in entry.tags %}
61 <span class="label-outline"><i class="material-icons">label_outline</i> {{ tag.label }}</span> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"class="nostyle"><i>✘</i></a> 62 <span class="label-outline"><i class="material-icons">label_outline</i> <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}" class="nostyle"><i>✘</i></a></span>
62 {% endfor %} 63 {% endfor %}
64 </div>
63 <div class="input-field nav-panel-add-tag" style="display: none"> 65 <div class="input-field nav-panel-add-tag" style="display: none">
64 {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} 66 {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
65 </div> 67 </div>
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 }}&hellip;</p> 46 <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</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>