diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2017-12-05 10:03:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-05 10:03:32 +0100 |
commit | aeab8b342e462a446c6be54896ac76c41d68b471 (patch) | |
tree | 39bf1642c1d7dc768c9b50e3a7df73331eae1f4a /src/Wallabag | |
parent | b9be1cf1ee771a34cbf496cc3b0290a01dbbe1c6 (diff) | |
parent | 1f84aa903d9dbba7420bd6da5e66cfd5d5f78b1a (diff) | |
download | wallabag-aeab8b342e462a446c6be54896ac76c41d68b471.tar.gz wallabag-aeab8b342e462a446c6be54896ac76c41d68b471.tar.zst wallabag-aeab8b342e462a446c6be54896ac76c41d68b471.zip |
Merge pull request #3459 from Simounet/fix/pagination
Pagination improved
Diffstat (limited to 'src/Wallabag')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | 9 |
1 files changed, 5 insertions, 4 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 9d6fb3f5..e883503e 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 | |||
@@ -21,8 +21,8 @@ | |||
21 | {% block content %} | 21 | {% block content %} |
22 | {% set listMode = app.user.config.listMode %} | 22 | {% set listMode = app.user.config.listMode %} |
23 | {% set currentRoute = app.request.attributes.get('_route') %} | 23 | {% set currentRoute = app.request.attributes.get('_route') %} |
24 | <div class="results clearfix"> | 24 | <div class="results"> |
25 | <div class="nb-results left"> | 25 | <div class="nb-results"> |
26 | {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} | 26 | {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} |
27 | <a href="{{ path('switch_view_mode') }}"><i class="material-icons">{% if listMode == 0 %}view_list{% else %}view_module{% endif %}</i></a> | 27 | <a href="{{ path('switch_view_mode') }}"><i class="material-icons">{% if listMode == 0 %}view_list{% else %}view_module{% endif %}</i></a> |
28 | {% if app.user.config.rssToken %} | 28 | {% if app.user.config.rssToken %} |
@@ -34,7 +34,6 @@ | |||
34 | {% endif %} | 34 | {% endif %} |
35 | </div> | 35 | </div> |
36 | 36 | ||
37 | <br /> | ||
38 | <ul class="{% if listMode == 1 %}collection{% else %}row data{% endif %}"> | 37 | <ul class="{% if listMode == 1 %}collection{% else %}row data{% endif %}"> |
39 | {% for entry in entries %} | 38 | {% for entry in entries %} |
40 | <li id="entry-{{ entry.id|e }}" class="col {% if listMode == 0 %}l3 m6{% else %}collection-item{% endif %} s12"> | 39 | <li id="entry-{{ entry.id|e }}" class="col {% if listMode == 0 %}l3 m6{% else %}collection-item{% endif %} s12"> |
@@ -52,7 +51,9 @@ | |||
52 | </ul> | 51 | </ul> |
53 | 52 | ||
54 | {% if entries.getNbPages > 1 %} | 53 | {% if entries.getNbPages > 1 %} |
55 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} | 54 | <div class="results"> |
55 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} | ||
56 | </div> | ||
56 | {% endif %} | 57 | {% endif %} |
57 | 58 | ||
58 | <!-- Export --> | 59 | <!-- Export --> |