diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | 3 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | 20 |
2 files changed, 13 insertions, 10 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index d5173707..99425d5a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -260,11 +260,12 @@ entry: | |||
260 | sort: | 260 | sort: |
261 | title: 'Sort options' | 261 | title: 'Sort options' |
262 | status_label: 'Sort by' | 262 | status_label: 'Sort by' |
263 | order_label: 'Order' | ||
263 | by: | 264 | by: |
264 | creation_date: 'Creation date' | 265 | creation_date: 'Creation date' |
265 | title: 'Title' | 266 | title: 'Title' |
266 | last_updated: 'Last updated' | 267 | last_updated: 'Last updated' |
267 | ascending: 'Asencending' | 268 | ascending: 'Ascending' |
268 | descending: 'Descending' | 269 | descending: 'Descending' |
269 | view: | 270 | view: |
270 | left_menu: | 271 | left_menu: |
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 7706896f..505a739b 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 | |||
@@ -211,22 +211,24 @@ | |||
211 | <!-- Sort --> | 211 | <!-- Sort --> |
212 | {% if sortForm is not null %} | 212 | {% if sortForm is not null %} |
213 | <div id="sort" class="side-nav right-aligned"> | 213 | <div id="sort" class="side-nav right-aligned"> |
214 | <form action="{{ path('all') }}"> | 214 | <form action="{{ previousRoute }}"> |
215 | <h4 class="center">{{ 'entry.sort.title'|trans }}</h4> | 215 | <h4 class="center">{{ 'entry.sort.title'|trans }}</h4> |
216 | 216 | ||
217 | <div class="row"> | 217 | <div class="row"> |
218 | <div class="input-field col s6 with-checkbox"> | 218 | <div class="col s12"> |
219 | {{ form_widget(sortForm.sortType) }} | ||
220 | {{ form_label(sortForm.sortType) }} | 219 | {{ form_label(sortForm.sortType) }} |
221 | </div> | 220 | </div> |
222 | 221 | ||
222 | <div class="input-field col s12"> | ||
223 | {{ form_widget(sortForm.sortType) }} | ||
224 | </div> | ||
225 | |||
223 | <div class="col s12"> | 226 | <div class="col s12"> |
224 | <div class="switch"> | 227 | {{ form_label(sortForm.sortOrder) }} |
225 | <label>Ascendant | 228 | </div> |
226 | {{ form_widget(sortForm.sortOrder) }} <span class="lever"></span> | 229 | |
227 | Descendant | 230 | <div class="input-field col s12"> |
228 | </label> | 231 | {{ form_widget(sortForm.sortOrder) }} |
229 | </div> | ||
230 | </div> | 232 | </div> |
231 | 233 | ||
232 | <div class="col s12"> | 234 | <div class="col s12"> |