diff options
author | Maryana Rozhankivska <mariroz@mr.lviv.ua> | 2014-02-20 19:28:39 +0200 |
---|---|---|
committer | Maryana Rozhankivska <mariroz@mr.lviv.ua> | 2014-02-20 19:28:39 +0200 |
commit | 032e0ca13ab8ebf99b5169f6f733db4184cdde6c (patch) | |
tree | 202f259fc3d9157e66195036584211e4c84515c1 /themes/default/view.twig | |
parent | 6203ef8e51c8b2712e54a01a183f30d282926b0b (diff) | |
download | wallabag-032e0ca13ab8ebf99b5169f6f733db4184cdde6c.tar.gz wallabag-032e0ca13ab8ebf99b5169f6f733db4184cdde6c.tar.zst wallabag-032e0ca13ab8ebf99b5169f6f733db4184cdde6c.zip |
a lot of refactoring: tag action is now handled by home view and uses sorting and pagination. Some small view enhacenments. Fix of #476, #461 for baggy and other themes
Diffstat (limited to 'themes/default/view.twig')
-rw-r--r-- | themes/default/view.twig | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/themes/default/view.twig b/themes/default/view.twig index 9858996f..916abe0d 100644 --- a/themes/default/view.twig +++ b/themes/default/view.twig | |||
@@ -20,12 +20,15 @@ | |||
20 | <header class="mbm"> | 20 | <header class="mbm"> |
21 | <h1>{{ entry.title|raw }}</h1> | 21 | <h1>{{ entry.title|raw }}</h1> |
22 | </header> | 22 | </header> |
23 | <aside class="tags"> | 23 | {% block tags %} |
24 | {% trans "tags:" %} {% for tag in tags %}<a href="./?view=tag&id={{ tag.id }}">{{ tag.value }}</a> {% endfor %}<a href="./?view=edit-tags&id={{ entry.id|e }}" title="{% trans "Edit tags" %}">✎</a> | 24 | <aside class="tags"> |
25 | </aside> | 25 | {% trans "tags:" %} {% for tag in tags %}<a href="./?view=tag&id={{ tag.id }}">{{ tag.value }}</a> {% endfor %}<a href="./?view=edit-tags&id={{ entry.id|e }}" title="{% trans "Edit tags" %}">✎</a> |
26 | </aside> | ||
27 | {% endblock %} | ||
26 | <article> | 28 | <article> |
27 | {{ content | raw }} | 29 | {{ content | raw }} |
28 | </article> | 30 | </article> |
31 | {{ block('tags') }} | ||
29 | </div> | 32 | </div> |
30 | <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/restoreScroll.js"></script> | 33 | <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/restoreScroll.js"></script> |
31 | <script type="text/javascript"> | 34 | <script type="text/javascript"> |
@@ -50,5 +53,5 @@ | |||
50 | $('#article_toolbar .tool.top').parent().hide(); | 53 | $('#article_toolbar .tool.top').parent().hide(); |
51 | } | 54 | } |
52 | }); | 55 | }); |
53 | </script> | 56 | </script> |
54 | {% endblock %} | 57 | {% endblock %} |