From: Jeremy Benoist Date: Sat, 22 Oct 2016 11:07:37 +0000 (+0200) Subject: Re-add bottom pagination X-Git-Tag: 2.1.3~3^2~2 X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=817724a7b8507877a81f3ff53639f7b49cb05851 Re-add bottom pagination Also pager.html.twig wasn’t necessary, there weren't enough duplication to put them in a dedicated template --- diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css index 44db2070..4c3e4ce3 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 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} %} + +
+
{{ '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 %} +