From 09e5b9391e0a09db02b2aa4c8f649b59e3baeb16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 3 May 2016 21:44:57 +0200 Subject: Add pagination bar at the bottom of the page Fix #2021 --- .../Resources/views/themes/baggy/Entry/entries.html.twig | 13 ++----------- .../Resources/views/themes/baggy/Entry/pager.html.twig | 11 +++++++++++ .../Resources/views/themes/material/Entry/entries.html.twig | 12 ++---------- .../Resources/views/themes/material/Entry/pager.html.twig | 10 ++++++++++ 4 files changed, 25 insertions(+), 21 deletions(-) create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/pager.html.twig (limited to 'src') 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 c093edcb..a2caaebf 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 @@ -3,17 +3,7 @@ {% block title %}{{ 'entry.page_titles.unread'|trans }}{% endblock %} {% block content %} - {% block pager %} -
-
{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
- -
- {% endblock %} + {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} {% for entry in entries %}
@@ -121,4 +111,5 @@ + {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} {% endblock %} 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 new file mode 100644 index 00000000..ac74676a --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig @@ -0,0 +1,11 @@ +{% block pager %} +
+
{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
+ +
+{% 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 1abbceed..cc4038c5 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 @@ -16,16 +16,7 @@ {% endblock %} {% block content %} - {% block pager %} -
-
- {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} -
- {% if entries.getNbPages > 1 %} - {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} - {% endif %} -
- {% endblock %} + {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %}
+ {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} {% endblock %} 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 new file mode 100644 index 00000000..6f8e60fc --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/pager.html.twig @@ -0,0 +1,10 @@ +{% block pager %} +
+
+ {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} +
+ {% if entries.getNbPages > 1 %} + {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} + {% endif %} +
+{% endblock %} -- cgit v1.2.3