diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views')
3 files changed, 34 insertions, 5 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 92eecb9b..a07285bd 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 | |||
@@ -1,10 +1,36 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | 1 | {% extends "WallabagCoreBundle::layout.html.twig" %} |
2 | 2 | ||
3 | {% block title %}{{ 'entry.page_titles.unread'|trans }}{% endblock %} | 3 | {% block title %} |
4 | {% set currentRoute = app.request.attributes.get('_route') %} | ||
5 | |||
6 | {% if currentRoute == 'starred' %} | ||
7 | {{ 'entry.page_titles.starred'|trans }} | ||
8 | {% elseif currentRoute == 'archive' %} | ||
9 | {{ 'entry.page_titles.archived'|trans }} | ||
10 | {% elseif currentRoute == 'all' %} | ||
11 | {{ 'entry.page_titles.filtered'|trans }} | ||
12 | {% elseif currentRoute == 'tag_entries' %} | ||
13 | {{ 'entry.page_titles.filtered_tags'|trans }} | ||
14 | {% else %} | ||
15 | {{ 'entry.page_titles.unread'|trans }} | ||
16 | {% endif %} | ||
17 | {% endblock %} | ||
4 | 18 | ||
5 | {% block content %} | 19 | {% block content %} |
6 | {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} | 20 | {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} |
7 | 21 | ||
22 | {% block pager %} | ||
23 | <div class="results"> | ||
24 | <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div> | ||
25 | <div class="pagination"> | ||
26 | {% if form is not null %}<a href="#" id="filter">{{ 'entry.filters.title'|trans }}</a>{% endif %} | ||
27 | {% if entries.getNbPages > 1 %} | ||
28 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} | ||
29 | {% endif %} | ||
30 | </div> | ||
31 | </div> | ||
32 | {% endblock %} | ||
33 | |||
8 | {% for entry in entries %} | 34 | {% for entry in entries %} |
9 | <div id="entry-{{ entry.id|e }}" class="entry"> | 35 | <div id="entry-{{ entry.id|e }}" class="entry"> |
10 | <h2><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|raw }}</a></h2> | 36 | <h2><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|raw }}</a></h2> |
@@ -44,7 +70,6 @@ | |||
44 | </div> | 70 | </div> |
45 | {% endfor %} | 71 | {% endfor %} |
46 | 72 | ||
47 | |||
48 | <!-- Export --> | 73 | <!-- Export --> |
49 | <aside id="download-form"> | 74 | <aside id="download-form"> |
50 | {% set currentRoute = app.request.attributes.get('_route') %} | 75 | {% set currentRoute = app.request.attributes.get('_route') %} |
@@ -63,8 +88,10 @@ | |||
63 | {% if craue_setting('export_xml') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'xml' }) }}">XML</a></li>{% endif %} | 88 | {% if craue_setting('export_xml') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'xml' }) }}">XML</a></li>{% endif %} |
64 | </ul> | 89 | </ul> |
65 | </aside> | 90 | </aside> |
91 | |||
66 | <!-- Filter --> | 92 | <!-- Filter --> |
67 | <aside id="filter-form"> | 93 | {% if form is not null %} |
94 | <aside id="filter-form" class=""> | ||
68 | <form method="get" action="{{ path('all') }}"> | 95 | <form method="get" action="{{ path('all') }}"> |
69 | <h2>{{ 'entry.filters.title'|trans }}</h2> | 96 | <h2>{{ 'entry.filters.title'|trans }}</h2> |
70 | <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">×</a> | 97 | <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">×</a> |
@@ -145,6 +172,7 @@ | |||
145 | </div> | 172 | </div> |
146 | </form> | 173 | </form> |
147 | </aside> | 174 | </aside> |
175 | {% endif %} | ||
148 | 176 | ||
149 | {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} | 177 | {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} |
150 | {% endblock %} | 178 | {% endblock %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig index 524a1d23..739e1486 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig | |||
@@ -9,7 +9,7 @@ | |||
9 | 9 | ||
10 | <ul> | 10 | <ul> |
11 | {% for tag in tags %} | 11 | {% for tag in tags %} |
12 | <li id="tag-{{ tag.id|e }}">{{tag.label}} ({{ tag.getEntriesByUserId(app.user.id) | length }})</li> | 12 | <li id="tag-{{ tag.id|e }}"><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.entries.getValues | length }})</a></li> |
13 | {% endfor %} | 13 | {% endfor %} |
14 | </ul> | 14 | </ul> |
15 | {% endblock %} | 15 | {% endblock %} |
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 a0a0b02f..2a972e1c 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 | |||
@@ -9,10 +9,11 @@ | |||
9 | {{ 'entry.page_titles.archived'|trans }} | 9 | {{ 'entry.page_titles.archived'|trans }} |
10 | {% elseif currentRoute == 'all' %} | 10 | {% elseif currentRoute == 'all' %} |
11 | {{ 'entry.page_titles.filtered'|trans }} | 11 | {{ 'entry.page_titles.filtered'|trans }} |
12 | {% elseif currentRoute == 'tag_entries' %} | ||
13 | {{ 'entry.page_titles.filtered_tags'|trans }} | ||
12 | {% else %} | 14 | {% else %} |
13 | {{ 'entry.page_titles.unread'|trans }} | 15 | {{ 'entry.page_titles.unread'|trans }} |
14 | {% endif %} | 16 | {% endif %} |
15 | |||
16 | {% endblock %} | 17 | {% endblock %} |
17 | 18 | ||
18 | {% block content %} | 19 | {% block content %} |