Merge pull request #1250 from frankoa/v2_pagination_and_api

Adds pagerfanta paginator everywhere, modifies article routing.

2 files changed, 12 insertions, 2 deletions

diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig
index acb96420..bf3caf09 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig
@@ -8,9 +8,9 @@
         <div class="results">
             <div class="nb-results">{{ entries.count }} {% trans %}entries{% endtrans %}</div>
             <div class="pagination">
-                {% for p in range(1, entries.count) %}
+                {% for p in range(1, entries.nbPages) %}
                     <li>
-                        <a href="{{ path(app.request.attributes.get('_route'), {'page': p}) }}">{{ p }}</a>
+                        <a href="{{ path(app.request.attributes.get('_route'), {'page': p}) }}" class="{{ currentPage == p ? 'current':''}}" >{{ p }}</a>
                     </li>
                 {% endfor %}
             </div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css
index ff1a36a1..e2844ccc 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css
@@ -537,6 +537,16 @@ footer a {
   display: none;
 }
 
+.pagination .current {
+  height: 25px;
+  padding: 4px 8px;
+  border: 1px solid #d5d5d5;
+  text-decoration: none;
+  font-weight: bold;
+  color: #000;
+  background-color: #ccc;
+}
+
 /* ==========================================================================
   2.1 = "save a link" related styles
   ========================================================================== */