diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-22 13:07:37 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-22 13:09:16 +0200 |
commit | 817724a7b8507877a81f3ff53639f7b49cb05851 (patch) | |
tree | 5a953d0ad4c57333bdfe3b0d47b0a6d597c49491 /src/Wallabag/CoreBundle/Resources/views/themes/material | |
parent | ab61dbc073fa97afa2b3b9f9d3faed66d5d05b7b (diff) | |
download | wallabag-817724a7b8507877a81f3ff53639f7b49cb05851.tar.gz wallabag-817724a7b8507877a81f3ff53639f7b49cb05851.tar.zst wallabag-817724a7b8507877a81f3ff53639f7b49cb05851.zip |
Re-add bottom pagination
Also pager.html.twig wasn’t necessary, there weren't enough duplication to put them in a dedicated template
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | 14 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/pager.html.twig | 10 |
2 files changed, 13 insertions, 11 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 d0786936..2c145b2a 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 | |||
@@ -5,7 +5,15 @@ | |||
5 | {% endblock %} | 5 | {% endblock %} |
6 | 6 | ||
7 | {% block content %} | 7 | {% block content %} |
8 | {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} | 8 | <div class="results clearfix"> |
9 | <div class="nb-results left"> | ||
10 | {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} | ||
11 | </div> | ||
12 | {% if entries.getNbPages > 1 %} | ||
13 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} | ||
14 | {% endif %} | ||
15 | </div> | ||
16 | |||
9 | <br /> | 17 | <br /> |
10 | <ul class="row data"> | 18 | <ul class="row data"> |
11 | {% for entry in entries %} | 19 | {% for entry in entries %} |
@@ -82,6 +90,10 @@ | |||
82 | {% endfor %} | 90 | {% endfor %} |
83 | </ul> | 91 | </ul> |
84 | 92 | ||
93 | {% if entries.getNbPages > 1 %} | ||
94 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} | ||
95 | {% endif %} | ||
96 | |||
85 | <!-- Export --> | 97 | <!-- Export --> |
86 | <div id="export" class="side-nav fixed right-aligned"> | 98 | <div id="export" class="side-nav fixed right-aligned"> |
87 | {% set currentRoute = app.request.attributes.get('_route') %} | 99 | {% set currentRoute = app.request.attributes.get('_route') %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/pager.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/pager.html.twig deleted file mode 100644 index 6f8e60fc..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/pager.html.twig +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | {% block pager %} | ||
2 | <div class="results clearfix"> | ||
3 | <div class="nb-results left"> | ||
4 | {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} | ||
5 | </div> | ||
6 | {% if entries.getNbPages > 1 %} | ||
7 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} | ||
8 | {% endif %} | ||
9 | </div> | ||
10 | {% endblock %} | ||