aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-10-22 13:07:37 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-10-22 13:09:16 +0200
commit817724a7b8507877a81f3ff53639f7b49cb05851 (patch)
tree5a953d0ad4c57333bdfe3b0d47b0a6d597c49491 /src/Wallabag
parentab61dbc073fa97afa2b3b9f9d3faed66d5d05b7b (diff)
downloadwallabag-817724a7b8507877a81f3ff53639f7b49cb05851.tar.gz
wallabag-817724a7b8507877a81f3ff53639f7b49cb05851.tar.zst
wallabag-817724a7b8507877a81f3ff53639f7b49cb05851.zip
Re-add bottom pagination
Also pager.html.twig wasn’t necessary, there weren't enough duplication to put them in a dedicated template
Diffstat (limited to 'src/Wallabag')
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig18
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig12
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig14
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/pager.html.twig10
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 @@
5{% endblock %} 5{% endblock %}
6 6
7{% block content %} 7{% block content %}
8 {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} 8
9 <div class="results">
10 <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div>
11 <div class="pagination">
12 <i class="btn-clickable download-btn material-icons md-36">file_download</i>
13 <i class="btn-clickable filter-btn material-icons md-36">filter_list</i>
14 {% if entries.getNbPages > 1 %}
15 {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
16 {% endif %}
17 </div>
18 </div>
9 19
10 {% for entry in entries %} 20 {% for entry in entries %}
11 <div id="entry-{{ entry.id|e }}" class="entry"> 21 <div id="entry-{{ entry.id|e }}" class="entry">
@@ -46,6 +56,10 @@
46 </div> 56 </div>
47 {% endfor %} 57 {% endfor %}
48 58
59 {% if entries.getNbPages > 1 %}
60 {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
61 {% endif %}
62
49 <!-- Export --> 63 <!-- Export -->
50 <aside id="download-form"> 64 <aside id="download-form">
51 {% set currentRoute = app.request.attributes.get('_route') %} 65 {% set currentRoute = app.request.attributes.get('_route') %}
@@ -67,7 +81,7 @@
67 81
68 <!-- Filter --> 82 <!-- Filter -->
69 {% if form is not null %} 83 {% if form is not null %}
70 <div id="filters" class=""> 84 <div id="filters">
71 <form method="get" action="{{ path('all') }}"> 85 <form method="get" action="{{ path('all') }}">
72 <h2>{{ 'entry.filters.title'|trans }}</h2> 86 <h2>{{ 'entry.filters.title'|trans }}</h2>
73 <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">&times;</a> 87 <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 @@
1{% block pager %}
2 <div class="results">
3 <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div>
4 <div class="pagination">
5 <i class="btn-clickable download-btn material-icons md-36">file_download</i>
6 <i class="btn-clickable filter-btn material-icons md-36">filter_list</i>
7 {% if entries.getNbPages > 1 %}
8 {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
9 {% endif %}
10 </div>
11 </div>
12{% 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 @@
5{% endblock %} 5{% endblock %}
6 6
7{% block content %} 7{% block content %}
8 {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} 8 <div class="results clearfix">
9 <div class="nb-results left">
10 {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
11 </div>
12 {% if entries.getNbPages > 1 %}
13 {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
14 {% endif %}
15 </div>
16
9 <br /> 17 <br />
10 <ul class="row data"> 18 <ul class="row data">
11 {% for entry in entries %} 19 {% for entry in entries %}
@@ -82,6 +90,10 @@
82 {% endfor %} 90 {% endfor %}
83 </ul> 91 </ul>
84 92
93 {% if entries.getNbPages > 1 %}
94 {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
95 {% endif %}
96
85 <!-- Export --> 97 <!-- Export -->
86 <div id="export" class="side-nav fixed right-aligned"> 98 <div id="export" class="side-nav fixed right-aligned">
87 {% set currentRoute = app.request.attributes.get('_route') %} 99 {% 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 @@
1{% block pager %}
2 <div class="results clearfix">
3 <div class="nb-results left">
4 {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
5 </div>
6 {% if entries.getNbPages > 1 %}
7 {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
8 {% endif %}
9 </div>
10{% endblock %}