|
2 | 2 | {% get_current_language as LANGUAGE_CODE %} |
3 | 3 |
|
4 | 4 | <div class="form-group" style="margin-bottom: 5px;"> |
5 | | - <button id="id_filter_{{ field_name }}" type="button" class="btn btn-default pull-right"> |
6 | | - <i class="fa fa-calendar"></i><span> {{ title }} </span><i class="fa fa-caret-down"></i> |
7 | | - </button> |
8 | | - <input id="id_filter_{{ field_name }}__gte" hidden type="text"> |
9 | | - <input id="id_filter_{{ field_name }}__lte" hidden type="text"> |
| 5 | + <div class="input-group"> |
| 6 | + <div class="input-group-addon"> |
| 7 | + <i class="fa fa-calendar"></i> |
| 8 | + </div> |
| 9 | + <input type="text" class="form-control pull-right" id="id_filter_{{ field_name }}" value="{{ title }}"> |
| 10 | + <input id="id_filter_{{ field_name }}__gte" hidden type="text"> |
| 11 | + <input id="id_filter_{{ field_name }}__lte" hidden type="text"> |
| 12 | + </div> |
10 | 13 |
|
11 | 14 | <script> |
12 | 15 | $(document).ready(function () { |
|
35 | 38 | '{% trans "This Month" %}' : [moment().startOf('month'), moment().endOf('month')], |
36 | 39 | '{% trans "Last Month" %}' : [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')] |
37 | 40 | }, |
38 | | - startDate: moment().subtract(29, 'days'), |
39 | | - endDate : moment() |
40 | 41 | }, |
41 | 42 | function (start, end) { |
42 | | - $drp_input.find('span').html(' ' + start.format('{{ choices.0.date_format }}') + ' - ' + end.format('{{ choices.0.date_format }}') + ' ') |
| 43 | + $drp_input.val(start.format('{{ choices.0.date_format }}') + ' - ' + end.format('{{ choices.0.date_format }}')) |
43 | 44 | } |
44 | 45 | ); |
45 | 46 | // act on date range selection via widget |
46 | 47 | $drp_input.on('apply.daterangepicker', function(ev, picker) { |
47 | | - $drp_input.find('span').html(' ' + picker.startDate.format('{{ choices.0.date_format }}') + ' - ' + picker.endDate.format('{{ choices.0.date_format }}') + ' ') |
| 48 | + $drp_input.val(picker.startDate.format('{{ choices.0.date_format }}') + ' - ' + picker.endDate.format('{{ choices.0.date_format }}')) |
48 | 49 | $('#id_filter_{{ field_name }}__gte').attr('name', '{{ field_name }}__gte').val(picker.startDate.format('YYYY-MM-DD')); |
49 | 50 | $('#id_filter_{{ field_name }}__lte').attr('name', '{{ field_name }}__lte').val(picker.endDate.format('YYYY-MM-DD')); |
50 | 51 | }); |
51 | 52 | $drp_input.on('cancel.daterangepicker', function(ev, picker) { |
52 | | - $drp_input.find('span').html('{{ title }}' + ' ') |
| 53 | + $drp_input.val('{{ title }}') |
53 | 54 | $('#id_filter_{{ field_name }}__gte').attr('name', '').val(''); |
54 | 55 | $('#id_filter_{{ field_name }}__lte').attr('name', '').val(''); |
55 | 56 | }); |
|
63 | 64 | picker.setEndDate(moment(vals[1], 'YYYY-MM-DD')); |
64 | 65 | $('#id_filter_{{ field_name }}__gte').attr('name', '{{ field_name }}__gte').val(vals[0]); |
65 | 66 | $('#id_filter_{{ field_name }}__lte').attr('name', '{{ field_name }}__lte').val(vals[1]); |
66 | | - $drp_input.find('span').html(' ' + (moment(vals[0], 'YYYY-MM-DD').format('{{ choices.0.date_format }}') + ' - ' + moment(vals[1], 'YYYY-MM-DD').format('{{ choices.0.date_format }}') + ' ')); |
| 67 | + $drp_input.val(moment(vals[0], 'YYYY-MM-DD').format('{{ choices.0.date_format }}') + ' - ' + moment(vals[1], 'YYYY-MM-DD').format('{{ choices.0.date_format }}')); |
67 | 68 | } |
| 69 | + } else { |
| 70 | + $drp_input.val('{{ title }}') |
68 | 71 | } |
69 | 72 | }); |
70 | 73 | </script> |
|
0 commit comments