Re-add bottom pagination

Also pager.html.twig wasn’t necessary, there weren't enough duplication to put them in a dedicated template

4 files changed, 29 insertions, 25 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 3af88b23..cc150cf1 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} %}
+
+    <div class="results">
+        <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div>
+        <div class="pagination">
+            <i class="btn-clickable download-btn material-icons md-36">file_download</i>
+            <i class="btn-clickable filter-btn material-icons md-36">filter_list</i>
+            {% if entries.getNbPages > 1 %}
+                {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
+            {% endif %}
+        </div>
+    </div>
 
     {% for entry in entries %}
         <div id="entry-{{ entry.id|e }}" class="entry">
@@ -46,6 +56,10 @@
         </div>
     {% endfor %}
 
+    {% if entries.getNbPages > 1 %}
+        {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
+    {% endif %}
+
     <!-- Export -->
     <aside id="download-form">
     {% set currentRoute = app.request.attributes.get('_route') %}
@@ -67,7 +81,7 @@
 
     <!-- Filter -->
     {% if form is not null %}
-    <div id="filters" class="">
+    <div id="filters">
         <form method="get" action="{{ path('all') }}">
             <h2>{{ 'entry.filters.title'|trans }}</h2>
             <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">&times;</a>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig
deleted file mode 100644
index faaa21a8..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig
+++ /dev/null
@@ -1,12 +0,0 @@
-{% block pager %}
-    <div class="results">
-        <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div>
-        <div class="pagination">
-            <i class="btn-clickable download-btn material-icons md-36">file_download</i>
-            <i class="btn-clickable filter-btn material-icons md-36">filter_list</i>
-            {% if entries.getNbPages > 1 %}
-                {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
-            {% endif %}
-        </div>
-    </div>
-{% 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 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 %}