diff options
Diffstat (limited to 'src')
3 files changed, 17 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php index 636ba324..2fa2f8a0 100644 --- a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php +++ b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php | |||
@@ -10,7 +10,21 @@ class EntryFilterType extends AbstractType | |||
10 | { | 10 | { |
11 | public function buildForm(FormBuilderInterface $builder, array $options) | 11 | public function buildForm(FormBuilderInterface $builder, array $options) |
12 | { | 12 | { |
13 | $builder->add('readingTime', 'filter_number_range'); | 13 | $builder |
14 | ->add('readingTime', 'filter_number_range') | ||
15 | ->add('createdAt', 'filter_date_range', array( | ||
16 | 'left_date_options' => array( | ||
17 | 'attr' => array( | ||
18 | 'placeholder' => 'dd/mm/yyyy'), | ||
19 | 'format' => 'dd/MM/yyyy', | ||
20 | 'widget' => 'single_text' | ||
21 | ), | ||
22 | 'right_date_options' => array( | ||
23 | 'attr' => array( | ||
24 | 'placeholder' => 'dd/mm/yyyy'), | ||
25 | 'format' => 'dd/MM/yyyy', | ||
26 | 'widget' => 'single_text' | ||
27 | ))); | ||
14 | } | 28 | } |
15 | 29 | ||
16 | public function getName() | 30 | public function getName() |
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 b2e2e8d0..d6dd7c37 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 | |||
@@ -82,7 +82,7 @@ | |||
82 | </div> | 82 | </div> |
83 | 83 | ||
84 | <div class="col s6"> | 84 | <div class="col s6"> |
85 | <a href="#!" class="center waves-effect waves-green btn-flat" id="clean_form_filters">{% trans %}Clean{% endtrans %}</a> | 85 | <a href="#!" class="center waves-effect waves-green btn-flat" id="clear_form_filters">{% trans %}Clear{% endtrans %}</a> |
86 | </div> | 86 | </div> |
87 | 87 | ||
88 | <div class="col s6"> | 88 | <div class="col s6"> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js index 0339eba0..c0700c2c 100755 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js | |||
@@ -3,7 +3,7 @@ function init_filters() { | |||
3 | if ($("div").is("#filters")) { | 3 | if ($("div").is("#filters")) { |
4 | $('#button_filters').show(); | 4 | $('#button_filters').show(); |
5 | $('.button-collapse-right').sideNav({ edge: 'right' }); | 5 | $('.button-collapse-right').sideNav({ edge: 'right' }); |
6 | $('#clean_form_filters').on('click', function(){ | 6 | $('#clear_form_filters').on('click', function(){ |
7 | $('#filters input').val(''); | 7 | $('#filters input').val(''); |
8 | return false; | 8 | return false; |
9 | }); | 9 | }); |