diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-07-18 15:17:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-18 15:17:33 +0200 |
commit | 2bb138ef6df2d1a608b42907185b274fb87f4513 (patch) | |
tree | 2f7f541c4af9882d60534742290ab4e1024a534a /src | |
parent | 9dbd3e93028630ca808042387e88304020c80c73 (diff) | |
parent | 1d4d9aaf2971e5b4d00a28f935c815e88bcf1487 (diff) | |
download | wallabag-2bb138ef6df2d1a608b42907185b274fb87f4513.tar.gz wallabag-2bb138ef6df2d1a608b42907185b274fb87f4513.tar.zst wallabag-2bb138ef6df2d1a608b42907185b274fb87f4513.zip |
Merge pull request #2183 from wallabag/tags-entries-view-baggy
Bring tags on entries view to baggy
Diffstat (limited to 'src')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig | 10 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | 2 |
2 files changed, 11 insertions, 1 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 8636e3be..92eecb9b 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 | |||
@@ -28,7 +28,17 @@ | |||
28 | </ul> | 28 | </ul> |
29 | {% if entry.previewPicture is null %} | 29 | {% if entry.previewPicture is null %} |
30 | <p>{{ entry.content|striptags|slice(0, 300) }}…</p> | 30 | <p>{{ entry.content|striptags|slice(0, 300) }}…</p> |
31 | <ul class="card-entry-tags"> | ||
32 | {% for tag in entry.tags %} | ||
33 | <li>{{ tag.label }}</li> | ||
34 | {% endfor %} | ||
35 | </ul> | ||
31 | {% else %} | 36 | {% else %} |
37 | <ul class="card-entry-labels"> | ||
38 | {% for tag in entry.tags | slice(0, 3) %} | ||
39 | <li>{{ tag.label }}</li> | ||
40 | {% endfor %} | ||
41 | </ul> | ||
32 | <img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" /> | 42 | <img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" /> |
33 | {% endif %} | 43 | {% endif %} |
34 | </div> | 44 | </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 d1cadea9..e9a2b183 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 | |||
@@ -77,7 +77,7 @@ | |||
77 | 77 | ||
78 | <p>{{ entry.content|striptags|slice(0, 300)|raw }}…</p> | 78 | <p>{{ entry.content|striptags|slice(0, 300)|raw }}…</p> |
79 | 79 | ||
80 | <ul class="card-entry-labels-hidden"> | 80 | <ul class="card-entry-tags"> |
81 | {% for tag in entry.tags %} | 81 | {% for tag in entry.tags %} |
82 | <li>{{ tag.label }}</li> | 82 | <li>{{ tag.label }}</li> |
83 | {% endfor %} | 83 | {% endfor %} |