aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2016-10-04 20:11:10 +0200
committerThomas Citharel <tcit@tcit.fr>2016-10-04 20:11:10 +0200
commit645c0d5bce85be0dfcb7b58c31ce96a47ceb99e3 (patch)
tree45fbd2bbc8aefacdf9ea1f9ea4909bca47818ff2 /src/Wallabag
parentc36f5adce2dcf30affe972fe8752e98aeb8d57a1 (diff)
downloadwallabag-645c0d5bce85be0dfcb7b58c31ce96a47ceb99e3.tar.gz
wallabag-645c0d5bce85be0dfcb7b58c31ce96a47ceb99e3.tar.zst
wallabag-645c0d5bce85be0dfcb7b58c31ce96a47ceb99e3.zip
better tags on baggy
Diffstat (limited to 'src/Wallabag')
-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
2 files changed, 6 insertions, 4 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>