diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-05-04 10:18:08 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-05-04 10:18:08 +0200 |
commit | 8ae9a3f52f6359b2f9170a46298719020f38b928 (patch) | |
tree | 09a25c73c344a84f1918f8feefe514bddbd52608 | |
parent | 9b57bac8b9ad95d1b4de051222b0f351991997f0 (diff) | |
parent | 09e5b9391e0a09db02b2aa4c8f649b59e3baeb16 (diff) | |
download | wallabag-8ae9a3f52f6359b2f9170a46298719020f38b928.tar.gz wallabag-8ae9a3f52f6359b2f9170a46298719020f38b928.tar.zst wallabag-8ae9a3f52f6359b2f9170a46298719020f38b928.zip |
Merge pull request #2022 from wallabag/fix-pagination-bar
Fix pagination bar on small devices
5 files changed, 28 insertions, 21 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css b/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css index a3915b1d..b106d91a 100755 --- a/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css +++ b/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css | |||
@@ -437,6 +437,9 @@ main ul.row { | |||
437 | .indicator { | 437 | .indicator { |
438 | display: none; | 438 | display: none; |
439 | } | 439 | } |
440 | .pagination li.prev, .pagination li.next { | ||
441 | width: auto; | ||
442 | } | ||
440 | } | 443 | } |
441 | 444 | ||
442 | @media only screen and (min-width : 400px) { | 445 | @media only screen and (min-width : 400px) { |
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 @@ | |||
3 | {% block title %}{{ 'entry.page_titles.unread'|trans }}{% endblock %} | 3 | {% block title %}{{ 'entry.page_titles.unread'|trans }}{% endblock %} |
4 | 4 | ||
5 | {% block content %} | 5 | {% block content %} |
6 | {% block pager %} | 6 | {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} |
7 | <div class="results"> | ||
8 | <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div> | ||
9 | <div class="pagination"> | ||
10 | <a href="#" id="filter">{{ 'entry.filters.title'|trans }}</a> | ||
11 | {% if entries.getNbPages > 1 %} | ||
12 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} | ||
13 | {% endif %} | ||
14 | </div> | ||
15 | </div> | ||
16 | {% endblock %} | ||
17 | 7 | ||
18 | {% for entry in entries %} | 8 | {% for entry in entries %} |
19 | <div id="entry-{{ entry.id|e }}" class="entry"> | 9 | <div id="entry-{{ entry.id|e }}" class="entry"> |
@@ -121,4 +111,5 @@ | |||
121 | </form> | 111 | </form> |
122 | </aside> | 112 | </aside> |
123 | 113 | ||
114 | {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} | ||
124 | {% endblock %} | 115 | {% 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 @@ | |||
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 | <a href="#" id="filter">{{ 'entry.filters.title'|trans }}</a> | ||
6 | {% if entries.getNbPages > 1 %} | ||
7 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} | ||
8 | {% endif %} | ||
9 | </div> | ||
10 | </div> | ||
11 | {% 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 @@ | |||
16 | {% endblock %} | 16 | {% endblock %} |
17 | 17 | ||
18 | {% block content %} | 18 | {% block content %} |
19 | {% block pager %} | 19 | {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} |
20 | <div class="results clearfix"> | ||
21 | <div class="nb-results left"> | ||
22 | {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} | ||
23 | </div> | ||
24 | {% if entries.getNbPages > 1 %} | ||
25 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} | ||
26 | {% endif %} | ||
27 | </div> | ||
28 | {% endblock %} | ||
29 | <br /> | 20 | <br /> |
30 | <ul class="row data"> | 21 | <ul class="row data"> |
31 | {% for entry in entries %} | 22 | {% for entry in entries %} |
@@ -193,4 +184,5 @@ | |||
193 | 184 | ||
194 | </form> | 185 | </form> |
195 | </div> | 186 | </div> |
187 | {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} | ||
196 | {% endblock %} | 188 | {% 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 @@ | |||
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 %} | ||