Merge branch 'from-date_range_filter' into dev

jet/filters.py

@@ -44,3 +44,45 @@ class RelatedFieldAjaxListFilter(RelatedFieldListFilter):
 
         queryset = model._default_manager.filter(**{rel_name: self.lookup_val}).all()
         return [(x._get_pk_val(), smart_text(x)) for x in queryset]
+
+
+try:
+    from collections import OrderedDict
+    from django import forms
+    from django.contrib.admin.widgets import AdminDateWidget
+    from rangefilter.filter import DateRangeFilter as OriginalDateRangeFilter
+    from django.utils.translation import ugettext as _
+
+
+    class DateRangeFilter(OriginalDateRangeFilter):
+        def get_template(self):
+            return 'rangefilter/date_filter.html'
+
+        def _get_form_fields(self):
+            # this is here, because in parent DateRangeFilter AdminDateWidget
+            # could be imported from django-suit
+            return OrderedDict((
+                (self.lookup_kwarg_gte, forms.DateField(
+                    label='',
+                    widget=AdminDateWidget(attrs={'placeholder': _('From date')}),
+                    localize=True,
+                    required=False
+                )),
+                (self.lookup_kwarg_lte, forms.DateField(
+                    label='',
+                    widget=AdminDateWidget(attrs={'placeholder': _('To date')}),
+                    localize=True,
+                    required=False
+                )),
+            ))
+
+        @staticmethod
+        def _get_media():
+            css = [
+                'style.css',
+            ]
+            return forms.Media(
+                css={'all': ['range_filter/css/%s' % path for path in css]}
+            )
+except ImportError:
+    pass

jet/static/jet/css/_changelist.scss

@@ -180,6 +180,27 @@
   }
 }
 
+.changelist-filter-popup {
+  position: relative;
+
+  &-content {
+    display: none;
+    position: absolute;
+    top: 0;
+    right: 0;
+    left: 0;
+    min-width: 200px;
+    background: $content-background-color;
+    border-radius: 4px;
+    box-shadow: 0 0 4px 0 $input-shadow-color;
+    z-index: 1;
+
+    &.visible {
+      display: block;
+    }
+  }
+}
+
 /* FILTER COLUMN */
 
 #changelist-filter {

jet/static/jet/js/src/layout-updaters/toolbar.js

@@ -74,6 +74,32 @@ ToolbarUpdater.prototype = {
                 }
 
                 filterName = null;
+            } else if ($element.hasClass('changelist-filter-popup')) {
+                var $toggle = $element.find('.changelist-filter-popup-toggle');
+                var $content = $element.find('.changelist-filter-popup-content');
+                var $wrapper = $('<span>')
+                    .addClass('changelist-filter-select-wrapper')
+                    .append($element);
+
+                if ($search.length) {
+                    $wrapper.insertAfter($search);
+                } else {
+                    $toolbar.append($wrapper);
+                }
+
+                $toggle.on('click', function(e) {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    $content.toggleClass('visible');
+                });
+
+                $content.on('click', function(e) {
+                    e.stopPropagation();
+                });
+
+                $(document.body).on('click', function() {
+                    $content.removeClass('visible');
+                });
             }
         });
 

jet/static/range_filter/css/style.css

@@ -0,0 +1,15 @@
+.admindatefilter fieldset.module {
+	padding: 10px;
+}
+
+.admindatefilter .form-row {
+	padding: 10px;
+}
+
+.admindatefilter .controls {
+	padding: 0 20px 20px 20px;
+}
+
+.admindatefilter .controls input[type="submit"] {
+	margin-bottom: 0 !important;
+}

jet/templates/rangefilter/date_filter.html

@@ -0,0 +1,38 @@
+{% load i18n admin_static %}
+<h3>{% blocktrans with filter_title=title %} By {{ filter_title }} {% endblocktrans %}</h3>
+<script>
+    function datefilter_apply(event, qs_name, form_name){
+        event.preventDefault();
+        var query_string = django.jQuery('input#'+qs_name).val();
+        var form_data = django.jQuery('#'+form_name).serialize();
+        window.location = window.location.pathname + query_string + '&' + form_data;
+    }
+    function datefilter_reset(qs_name){
+        var query_string = django.jQuery('input#'+qs_name).val();
+        window.location = window.location.pathname + query_string;
+    }
+</script>
+<div class="changelist-filter-popup admindatefilter">
+    <input class="changelist-filter-popup-toggle" type="text" value="{% blocktrans with filter_title=title %} By {{ filter_title }} {% endblocktrans %}" readonly>
+    <div class="changelist-filter-popup-content">
+        <form method="GET" action="." id="{{ choices.0.system_name }}-form">
+            {{ spec.form.media }}
+            <fieldset class="module aligned">
+                {% for field in spec.form %}
+                    <div class="form-row {{ field.id }}">
+                        <div>
+                            {{ field }}
+                        </div>
+                    </div>
+                {% endfor %}
+            </fieldset>
+            {% for choice in choices %}
+                <input type="hidden" id="{{ choice.system_name }}-query-string" value="{{ choice.query_string }}">
+            {% endfor %}
+            <div class="controls">
+                <input type="button" value="{% trans "Search" %}" onclick="datefilter_apply(event, '{{ choices.0.system_name }}-query-string', '{{ choices.0.system_name }}-form')">
+                <input type="reset" class="button" value="{% trans "Reset" %}" onclick="datefilter_reset('{{ choices.0.system_name }}-query-string')">
+            </div>
+        </form>
+    </div>
+</div>