aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
authorAlexandr Danilov <bitbucket@modos189.ru>2015-08-17 03:12:14 +0300
committerAlexandr Danilov <bitbucket@modos189.ru>2015-08-17 03:12:14 +0300
commit790d18a319e6ac9934318cce339d17217e053c63 (patch)
tree5001b4c4d94989524d5c50e7c01007631e764ced /src/Wallabag
parent6fd3d82c01f3ab9747b5a6f0ca779202f0e9cbe1 (diff)
downloadwallabag-790d18a319e6ac9934318cce339d17217e053c63.tar.gz
wallabag-790d18a319e6ac9934318cce339d17217e053c63.tar.zst
wallabag-790d18a319e6ac9934318cce339d17217e053c63.zip
GUI for filter by creation date #1343
Diffstat (limited to 'src/Wallabag')
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig14
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js7
2 files changed, 19 insertions, 2 deletions
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 4fbc4473..c05e4b87 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
@@ -74,17 +74,27 @@
74 <div class="col s12"> 74 <div class="col s12">
75 <label>{% trans %}Reading time in minutes{% endtrans %}</label> 75 <label>{% trans %}Reading time in minutes{% endtrans %}</label>
76 </div> 76 </div>
77
78 <div class="input-field col s6"> 77 <div class="input-field col s6">
79 {{ form_widget(form.readingTime.left_number, {'type': 'number'}) }} 78 {{ form_widget(form.readingTime.left_number, {'type': 'number'}) }}
80 <label for="entry_filter_readingTime_left_number">{% trans %}from{% endtrans %}</label> 79 <label for="entry_filter_readingTime_left_number">{% trans %}from{% endtrans %}</label>
81 </div> 80 </div>
82
83 <div class="input-field col s6"> 81 <div class="input-field col s6">
84 {{ form_widget(form.readingTime.right_number, {'type': 'number'}) }} 82 {{ form_widget(form.readingTime.right_number, {'type': 'number'}) }}
85 <label for="entry_filter_readingTime_right_number">{% trans %}to{% endtrans %}</label> 83 <label for="entry_filter_readingTime_right_number">{% trans %}to{% endtrans %}</label>
86 </div> 84 </div>
87 85
86 <div class="col s12">
87 <label>{% trans %}Create at{% endtrans %}</label>
88 </div>
89 <div class="input-field col s6">
90 {{ form_widget(form.createdAt.left_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.left_date.vars.value} }) }}
91 <label for="entry_filter_createdAt_left_date" class="active">{% trans %}from{% endtrans %}</label>
92 </div>
93 <div class="input-field col s6">
94 {{ form_widget(form.createdAt.right_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.left_date.vars.value} }) }}
95 <label for="entry_filter_createdAt_right_date" class="active">{% trans %}to{% endtrans %}</label>
96 </div>
97
88 <div class="col s6"> 98 <div class="col s6">
89 <a href="#!" class="center waves-effect waves-green btn-flat" id="clean_form_filters">{% trans %}Clean{% endtrans %}</a> 99 <a href="#!" class="center waves-effect waves-green btn-flat" id="clean_form_filters">{% trans %}Clean{% endtrans %}</a>
90 </div> 100 </div>
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 dffeaaad..0339eba0 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
@@ -17,6 +17,13 @@ $(document).ready(function(){
17 $('.collapsible').collapsible({ 17 $('.collapsible').collapsible({
18 accordion : false 18 accordion : false
19 }); 19 });
20 $('.datepicker').pickadate({
21 selectMonths: true,
22 selectYears: 15,
23 formatSubmit: 'dd/mm/yyyy',
24 hiddenName: true,
25 format: 'dd/mm/yyyy',
26 });
20 init_filters(); 27 init_filters();
21 28
22 $('#nav-btn-add').on('click', function(){ 29 $('#nav-btn-add').on('click', function(){