From 817724a7b8507877a81f3ff53639f7b49cb05851 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 22 Oct 2016 13:07:37 +0200 Subject: [PATCH] Re-add bottom pagination MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also pager.html.twig wasn’t necessary, there weren't enough duplication to put them in a dedicated template --- .../static/themes/baggy/css/main.css | 1 - .../themes/baggy/Entry/entries.html.twig | 18 ++++++++- .../views/themes/baggy/Entry/pager.html.twig | 12 ------ .../themes/material/Entry/entries.html.twig | 14 ++++++- .../themes/material/Entry/pager.html.twig | 10 ----- .../themes/baggy/css/style.min.css | 2 +- .../wallabagcore/themes/baggy/js/baggy.min.js | 38 +++++++++---------- .../themes/material/css/style.min.css | 16 ++------ .../themes/material/css/style.min.css.map | 1 - .../themes/material/js/material.min.js | 32 ++++++++-------- 10 files changed, 68 insertions(+), 76 deletions(-) delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/pager.html.twig delete mode 100644 web/bundles/wallabagcore/themes/material/css/style.min.css.map diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css index 44db2070b..4c3e4ce3c 100755 --- a/app/Resources/static/themes/baggy/css/main.css +++ b/app/Resources/static/themes/baggy/css/main.css @@ -581,7 +581,6 @@ img.preview { div.pagination ul { text-align: right; - margin-bottom: 50px; } .nb-results { 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 3af88b237..cc150cf16 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 @@ -5,7 +5,17 @@ {% endblock %} {% block content %} - {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} + +
+
{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
+ +
{% for entry in entries %}
@@ -46,6 +56,10 @@
{% endfor %} + {% if entries.getNbPages > 1 %} + {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} + {% endif %} +