From 817724a7b8507877a81f3ff53639f7b49cb05851 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sat, 22 Oct 2016 13:07:37 +0200
Subject: 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
---
 .../views/themes/material/Entry/entries.html.twig          | 14 +++++++++++++-
 .../Resources/views/themes/material/Entry/pager.html.twig  | 10 ----------
 2 files changed, 13 insertions(+), 11 deletions(-)
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/pager.html.twig

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material')

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 @@
 {% endblock %}
 
 {% block content %}
-    {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %}
+    <div class="results clearfix">
+        <div class="nb-results left">
+            {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
+        </div>
+        {% if entries.getNbPages > 1 %}
+            {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
+        {% endif %}
+    </div>
+
     <br />
     <ul class="row data">
         {% for entry in entries %}
@@ -82,6 +90,10 @@
         {% endfor %}
     </ul>
 
+    {% if entries.getNbPages > 1 %}
+        {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
+    {% endif %}
+
     <!-- Export -->
     <div id="export" class="side-nav fixed right-aligned">
     {% 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 @@
-{% block pager %}
-    <div class="results clearfix">
-        <div class="nb-results left">
-            {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
-        </div>
-        {% if entries.getNbPages > 1 %}
-            {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
-        {% endif %}
-    </div>
-{% endblock %}
-- 
cgit v1.2.3