diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-11-04 08:49:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-04 08:49:52 +0100 |
commit | 2db9142bfc3e34c1f79f3aabf5b302c3a487b3e1 (patch) | |
tree | a840ae833b85d2b4a80e96c1426ab63f001d06cf /src/Wallabag/CoreBundle/Resources/views/themes/baggy | |
parent | f53f542fa51075e742fc2295bfff2681b0375ea1 (diff) | |
parent | d56d416d9bf18722a54a1b262e742767a41fb165 (diff) | |
download | wallabag-2db9142bfc3e34c1f79f3aabf5b302c3a487b3e1.tar.gz wallabag-2db9142bfc3e34c1f79f3aabf5b302c3a487b3e1.tar.zst wallabag-2db9142bfc3e34c1f79f3aabf5b302c3a487b3e1.zip |
Merge pull request #2460 from wallabag/ui-changes
UI Changes
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig | 18 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig | 12 |
2 files changed, 16 insertions, 14 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 5d657c7e..0f1c010f 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 | |||
@@ -9,7 +9,17 @@ | |||
9 | {% endblock %} | 9 | {% endblock %} |
10 | 10 | ||
11 | {% block content %} | 11 | {% block content %} |
12 | {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} | 12 | |
13 | <div class="results"> | ||
14 | <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div> | ||
15 | <div class="pagination"> | ||
16 | <i class="btn-clickable download-btn material-icons md-36">file_download</i> | ||
17 | <i class="btn-clickable filter-btn material-icons md-36">filter_list</i> | ||
18 | {% if entries.getNbPages > 1 %} | ||
19 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} | ||
20 | {% endif %} | ||
21 | </div> | ||
22 | </div> | ||
13 | 23 | ||
14 | {% for entry in entries %} | 24 | {% for entry in entries %} |
15 | <div id="entry-{{ entry.id|e }}" class="entry"> | 25 | <div id="entry-{{ entry.id|e }}" class="entry"> |
@@ -50,6 +60,10 @@ | |||
50 | </div> | 60 | </div> |
51 | {% endfor %} | 61 | {% endfor %} |
52 | 62 | ||
63 | {% if entries.getNbPages > 1 %} | ||
64 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} | ||
65 | {% endif %} | ||
66 | |||
53 | <!-- Export --> | 67 | <!-- Export --> |
54 | <aside id="download-form"> | 68 | <aside id="download-form"> |
55 | {% set currentRoute = app.request.attributes.get('_route') %} | 69 | {% set currentRoute = app.request.attributes.get('_route') %} |
@@ -75,7 +89,7 @@ | |||
75 | 89 | ||
76 | <!-- Filter --> | 90 | <!-- Filter --> |
77 | {% if form is not null %} | 91 | {% if form is not null %} |
78 | <div id="filters" class=""> | 92 | <div id="filters"> |
79 | <form method="get" action="{{ path('all') }}"> | 93 | <form method="get" action="{{ path('all') }}"> |
80 | <h2>{{ 'entry.filters.title'|trans }}</h2> | 94 | <h2>{{ 'entry.filters.title'|trans }}</h2> |
81 | <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">×</a> | 95 | <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">×</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 %} | ||