diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-06-24 14:23:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-24 14:23:38 +0200 |
commit | 33e2aec18b25d2c47774fede22ecd91e936b4400 (patch) | |
tree | adc266a43baf13509c119bbbab8be7cc06dadd2b /src/Wallabag/CoreBundle/Resources/views/themes | |
parent | b1c9b78203710ad4cfd601b06bf1ec384595b3f3 (diff) | |
parent | eef833d644f90518c712eccac7805d99562fd263 (diff) | |
download | wallabag-33e2aec18b25d2c47774fede22ecd91e936b4400.tar.gz wallabag-33e2aec18b25d2c47774fede22ecd91e936b4400.tar.zst wallabag-33e2aec18b25d2c47774fede22ecd91e936b4400.zip |
Merge pull request #2170 from wallabag/addTagsOnEntriesView
Add tags on entries view and minor ui fixes
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | 18 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | 4 |
2 files changed, 19 insertions, 3 deletions
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 98616635..d1cadea9 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 | |||
@@ -26,6 +26,11 @@ | |||
26 | <div class="card-body"> | 26 | <div class="card-body"> |
27 | {% if not entry.previewPicture is null %} | 27 | {% if not entry.previewPicture is null %} |
28 | <div class="card-image waves-effect waves-block waves-light"> | 28 | <div class="card-image waves-effect waves-block waves-light"> |
29 | <ul class="card-entry-labels"> | ||
30 | {% for tag in entry.tags | slice(0, 3) %} | ||
31 | <li>{{ tag.label }}</li> | ||
32 | {% endfor %} | ||
33 | </ul> | ||
29 | <div class="preview activator" style="background-image: url({{ entry.previewPicture }})"></div> | 34 | <div class="preview activator" style="background-image: url({{ entry.previewPicture }})"></div> |
30 | </div> | 35 | </div> |
31 | {% endif %} | 36 | {% endif %} |
@@ -35,7 +40,7 @@ | |||
35 | <i class="card-title grey-text text-darken-4 activator material-icons right">more_vert</i> | 40 | <i class="card-title grey-text text-darken-4 activator material-icons right">more_vert</i> |
36 | {% endif %} | 41 | {% endif %} |
37 | 42 | ||
38 | <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|striptags|slice(0, 42)|raw }}</a></span> | 43 | <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|striptags }}">{{ entry.title|striptags|raw }}</a></span> |
39 | 44 | ||
40 | <div class="estimatedTime grey-text"> | 45 | <div class="estimatedTime grey-text"> |
41 | <span class="tool reading-time"> | 46 | <span class="tool reading-time"> |
@@ -50,6 +55,11 @@ | |||
50 | 55 | ||
51 | {% if entry.previewPicture is null %} | 56 | {% if entry.previewPicture is null %} |
52 | <p>{{ entry.content|striptags|slice(0, 300)|raw }}…</p> | 57 | <p>{{ entry.content|striptags|slice(0, 300)|raw }}…</p> |
58 | <ul class="card-entry-labels-hidden"> | ||
59 | {% for tag in entry.tags | slice(0, 2) %} | ||
60 | <li>{{ tag.label }}</li> | ||
61 | {% endfor %} | ||
62 | </ul> | ||
53 | {% endif %} | 63 | {% endif %} |
54 | </div> | 64 | </div> |
55 | </div> | 65 | </div> |
@@ -66,6 +76,12 @@ | |||
66 | </div> | 76 | </div> |
67 | 77 | ||
68 | <p>{{ entry.content|striptags|slice(0, 300)|raw }}…</p> | 78 | <p>{{ entry.content|striptags|slice(0, 300)|raw }}…</p> |
79 | |||
80 | <ul class="card-entry-labels-hidden"> | ||
81 | {% for tag in entry.tags %} | ||
82 | <li>{{ tag.label }}</li> | ||
83 | {% endfor %} | ||
84 | </ul> | ||
69 | </div> | 85 | </div> |
70 | {% endif %} | 86 | {% endif %} |
71 | 87 | ||
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 7fc7a552..2a5cdfac 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 | |||
@@ -20,7 +20,7 @@ | |||
20 | <ul class="right"> | 20 | <ul class="right"> |
21 | <li> | 21 | <li> |
22 | <a class="waves-effect" title="{{ 'entry.view.left_menu.set_as_read'|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead"> | 22 | <a class="waves-effect" title="{{ 'entry.view.left_menu.set_as_read'|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead"> |
23 | <i class="material-icons small">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}"</i> | 23 | <i class="material-icons small">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i> |
24 | </a> | 24 | </a> |
25 | </li> | 25 | </li> |
26 | <li> | 26 | <li> |
@@ -30,7 +30,7 @@ | |||
30 | </li> | 30 | </li> |
31 | <li> | 31 | <li> |
32 | <a href="#" data-activates="slide-out" class="button-collapse right"> | 32 | <a href="#" data-activates="slide-out" class="button-collapse right"> |
33 | <i class="material-icons">navigation_menu</i> | 33 | <i class="material-icons">menu</i> |
34 | </a> | 34 | </a> |
35 | </li> | 35 | </li> |
36 | </ul> | 36 | </ul> |