5 files changed, 27 insertions, 18 deletions

diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index 85e71116..6e56c237 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -532,6 +532,7 @@ class EntryController extends Controller
         $repository = $this->get('wallabag_core.entry_repository');
         $searchTerm = (isset($request->get('search_entry')['term']) ? $request->get('search_entry')['term'] : '');
         $currentRoute = (null !== $request->query->get('currentRoute') ? $request->query->get('currentRoute') : '');
+        $direction = (null !== $request->query->get('entry_sort')['sortOrder'] ? $request->query->get('entry_sort')['sortOrder'] : 'asc');
 
         // defined as null by default because each repository method have the right field as default value too
         // like `getBuilderForStarredByUser` will have `starredAt` sort by default
@@ -540,8 +541,6 @@ class EntryController extends Controller
             $sortBy = $request->get('entry_sort')['sortType'];
         }
 
-        $direction = isset($request->get('entry_sort')['sortOrder']) ? 'DESC' : 'ASC';
-
         switch ($type) {
             case 'search':
                 $qb = $repository->getBuilderForSearchByUser($this->getUser()->getId(), $searchTerm, $currentRoute);
diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php
index 16ded948..06a91e1e 100644
--- a/src/Wallabag/CoreBundle/Controller/TagController.php
+++ b/src/Wallabag/CoreBundle/Controller/TagController.php
@@ -131,6 +131,7 @@ class TagController extends Controller
 
         return $this->render('WallabagCoreBundle:Entry:entries.html.twig', [
             'form' => null,
+            'sortForm' => null,
             'entries' => $entries,
             'currentPage' => $page,
             'tag' => $tag,
diff --git a/src/Wallabag/CoreBundle/Form/Type/EntrySortType.php b/src/Wallabag/CoreBundle/Form/Type/EntrySortType.php
index 2555f68d..ac251c5b 100644
--- a/src/Wallabag/CoreBundle/Form/Type/EntrySortType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/EntrySortType.php
@@ -2,8 +2,6 @@
 
 namespace Wallabag\CoreBundle\Form\Type;
 
-use Doctrine\ORM\EntityRepository;
-use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\CheckboxFilterType;
 use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\ChoiceFilterType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -26,12 +24,20 @@ class EntrySortType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('sortOrder', CheckboxFilterType::class)
+            ->add('sortOrder', ChoiceFilterType::class, [
+                'choices' => [
+                    'entry.sort.ascending' => 'asc',
+                    'entry.sort.descending' => 'desc',
+                ],
+                'label' => 'entry.sort.order_label',
+            ])
             ->add('sortType', ChoiceFilterType::class, [
                 'choices' => [
-                    'createdAt' => 'createdAt',
-                    'title' => 'title',
-                    'updatedAt' => 'updatedAt',
+                    'entry.sort.by.creation_date' => 'createdAt',
+                    'entry.sort.by.starred_date' => 'starredAt',
+                    'entry.sort.by.archive_date' => 'archivedAt',
+                    'entry.sort.by.title' => 'title',
+                    'entry.sort.by.last_updated' => 'updatedAt',
                 ],
                 'label' => 'entry.sort.status_label',
             ])
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:
     sort:
         title: 'Sort options'
         status_label: 'Sort by'
+        order_label: 'Order'
         by:
             creation_date: 'Creation date'
             title: 'Title'
             last_updated: 'Last updated'
-        ascending: 'Asencending'
+        ascending: 'Ascending'
         descending: 'Descending'
     view:
         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 @@
     <!-- Sort -->
     {% if sortForm is not null %}
     <div id="sort" class="side-nav right-aligned">
-        <form action="{{ path('all') }}">
+        <form action="{{ previousRoute }}">
         <h4 class="center">{{ 'entry.sort.title'|trans }}</h4>
 
             <div class="row">
-                <div class="input-field col s6 with-checkbox">
-                    {{ form_widget(sortForm.sortType) }}
+                <div class="col s12">
                     {{ form_label(sortForm.sortType) }}
                 </div>
 
+                <div class="input-field col s12">
+                    {{ form_widget(sortForm.sortType) }}
+                </div>
+
                 <div class="col s12">
-                    <div class="switch">
-                        <label>Ascendant
-                        {{ form_widget(sortForm.sortOrder) }} <span class="lever"></span>
-                            Descendant
-                        </label>
-                    </div>
+                    {{ form_label(sortForm.sortOrder) }}
+                </div>
+
+                <div class="input-field col s12">
+                    {{ form_widget(sortForm.sortOrder) }}
                 </div>
 
                 <div class="col s12">