Updated CHANGELOG and version.

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.14.1](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.14.1) - 2020-11-12
+-  Fixed sticky list-filter floating. #100
+
+## [0.14.0](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.14.0) - 2020-10-15
+-  Added list filter sticky option (only for `django >= 3.1.2`).
+-  Enabled list filter dropdown by default.
+-  Fixed changelist searchbar style.
+
 ## [0.13.7](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.13.7) - 2020-10-14
 -  Improved responsive widgets style.
 -  Prevented body horizontal scroll.

admin_interface/admin.py

@@ -112,7 +112,10 @@ class ThemeAdmin(admin.ModelAdmin):
         }),
         (_('List Filter'), {
             'classes': ('wide', ),
-            'fields': ('list_filter_dropdown', )
+            'fields': (
+                'list_filter_dropdown',
+                'list_filter_sticky',
+            )
         }),
         (_('Recent Actions'), {
             'classes': ('wide', ),

admin_interface/migrations/0017_change_list_filter_dropdown.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('admin_interface', '0016_add_language_chooser_display'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='theme',
+            name='list_filter_dropdown',
+            field=models.BooleanField(default=True, verbose_name='use dropdown'),
+        ),
+    ]

admin_interface/migrations/0018_theme_list_filter_sticky.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('admin_interface', '0017_change_list_filter_dropdown'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='theme',
+            name='list_filter_sticky',
+            field=models.BooleanField(default=True, verbose_name='sticky position'),
+        ),
+    ]

admin_interface/models.py

@@ -289,8 +289,12 @@ class Theme(models.Model):
         verbose_name=_('close button visible'))
 
     list_filter_dropdown = models.BooleanField(
-        default=False,
+        default=True,
         verbose_name=_('use dropdown'))
+    list_filter_sticky = models.BooleanField(
+        default=True,
+        verbose_name=_('sticky position'))
+
     recent_actions_visible = models.BooleanField(
         default=True,
         verbose_name=_('visible'))

admin_interface/templates/admin_interface/css/admin-interface-fix.css

@@ -485,19 +485,28 @@ body.admin-interface .paginator a.showall:visited {
     border-bottom-right-radius: 0;
 }
 
-@media (max-width: 767px) {
-
-    /* fixed changelist search size when there are search results and .quiet is visible */
-    .admin-interface #changelist-search label img {
-        margin-top: 7px;
+/* fix searchbar overriden padding */
+.admin-interface #changelist #changelist-search #searchbar {
+    padding: 2px 5px 3px 5px;
 }
 
+@media (max-width: 1024px) {
+    .admin-interface #changelist #toolbar {
+        border-top: 1px solid #eee;
+        border-bottom: 1px solid #eee;
+    }
+    /* fixed changelist search size when there are search results and .quiet is visible */
+    .admin-interface #changelist-search label img {
+        margin-top: 2px;
+    }
     .admin-interface #changelist-search .quiet {
         margin: 0 0 0 10px;
         align-self: center;
         flex-basis: content;
     }
+}
 
+@media (max-width: 767px) {
     /* fixed responsive widgets */
     .admin-interface .aligned.collapsed .form-row {
         display: none;

admin_interface/templates/admin_interface/css/admin-interface.css

@@ -282,11 +282,21 @@
     color:{{ theme.css_generic_link_hover_color }};
 }
 
-.admin-interface .module.filtered #toolbar {
-    {% if theme.css_module_rounded_corners %}
-    border-radius: 4px;
-    {% endif %}
+/* list-filter sticky */
+{% if theme.list_filter_sticky %}
+@media (min-width: 768px) {
+    .admin-interface .module.filtered #changelist-filter {
+        position: sticky;
+        top: 40px;
+        float: right;
     }
+    /* feature not available for django < 3.1.2 */
+    .admin-interface .module.filtered #toolbar + #changelist-filter {
+        position: absolute;
+        top: 0px;
+    }
+}
+{% endif %}
 
 .admin-interface .module.filtered #changelist-filter {
     {% if theme.css_module_rounded_corners %}

admin_interface/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.13.7'
+__version__ = '0.14.1'

setup.py

@@ -3,7 +3,7 @@
 
 from setuptools import find_packages, setup
 
-import os
+import os, sys
 
 exec(open('admin_interface/version.py').read())
 
@@ -15,7 +15,8 @@ long_description_file_path = os.path.join(package_path, 'README.md')
 long_description_content_type = 'text/markdown'
 long_description = ''
 try:
-    with open(long_description_file_path) as f:
+    long_description_file_options = {} if sys.version_info[0] < 3 else { 'encoding':'utf-8' }
+    with open(long_description_file_path, 'r', **long_description_file_options) as f:
         long_description = f.read()
 except IOError:
     pass

tests/settings.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+
 import django
 import os
 
@@ -91,6 +93,15 @@ DATABASES = {
     'default': database_config.get(database_engine),
 }
 
+USE_I18N = True
+LANGUAGES = (
+    ('en', 'English', ),
+    ('it', 'Italian', ),
+)
+LANGUAGE_CODE = 'en'
+
+ROOT_URLCONF = 'tests.urls'
+
 MEDIA_ROOT = os.path.join(BASE_DIR, 'admin_interface/public/media/')
 MEDIA_URL = '/media/'
 

tests/test_fixtures.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+
 from django.core.management import call_command
 from django.test import TestCase
 

tests/test_models.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+
 from django.conf import settings
 from django.test import TestCase
 

tests/test_settings.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+
 import django
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured

tests/test_templatetags.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 
-from django.test import TestCase
+from __future__ import unicode_literals
+
+from django.test import override_settings, TestCase
 from django.test.client import RequestFactory
 from django.template import Context, Template
 
@@ -20,6 +22,63 @@ class AdminInterfaceTemplateTagsTestCase(TestCase):
     def __render_template(self, string, context=None):
         return Template(string).render(Context(context or {}))
 
+    def test_get_admin_interface_languages(self):
+        context = Context({
+            'request': self.request_factory.get('/en/admin/'),
+        })
+        languages = templatetags.get_admin_interface_languages(context)
+        expected_languages = [
+            {'code': 'en', 'name': 'English', 'default': True, 'active': True, 'activation_url': '/i18n/setlang/?next=/en/admin/'},
+            {'code': 'it', 'name': 'Italian', 'default': False, 'active': False, 'activation_url': '/i18n/setlang/?next=/it/admin/'}
+        ]
+        self.assertEqual(len(languages), len(expected_languages))
+        self.assertEqual(languages[0], expected_languages[0])
+        self.assertEqual(languages[1], expected_languages[1])
+
+    @override_settings(
+        USE_I18N = False,
+    )
+    def test_get_admin_interface_languages_with_i18n_disabled(self):
+        context = Context({
+            'request': self.request_factory.get('/en/admin/'),
+        })
+        languages = templatetags.get_admin_interface_languages(context)
+        self.assertEqual(languages, None)
+
+    @override_settings(
+        ROOT_URLCONF = 'tests.urls_without_i18n_patterns',
+    )
+    def test_get_admin_interface_languages_without_i18n_url_patterns(self):
+        context = Context({
+            'request': self.request_factory.get('/en/admin/'),
+        })
+        languages = templatetags.get_admin_interface_languages(context)
+        self.assertEqual(languages, None)
+
+    @override_settings(
+        LANGUAGES = (
+            ('en', 'English'),
+        ),
+    )
+    def test_get_admin_interface_languages_without_multiple_languages(self):
+        context = Context({
+            'request': self.request_factory.get('/en/admin/'),
+        })
+        languages = templatetags.get_admin_interface_languages(context)
+        self.assertEqual(languages, None)
+
+    def test_get_admin_interface_languages_without_request(self):
+        context = Context({})
+        languages = templatetags.get_admin_interface_languages(context)
+        self.assertEqual(languages, None)
+
+    def test_get_admin_interface_languages_without_language_prefix_in_url(self):
+        context = Context({
+            'request': self.request_factory.get('/admin/'),
+        })
+        languages = templatetags.get_admin_interface_languages(context)
+        self.assertEqual(languages, None)
+
     def test_get_theme(self):
         Theme.objects.all().delete()
         context = Context({})

tests/urls.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+
+import django
+from django.contrib import admin
+if django.VERSION < (2, 0):
+    from django.conf.urls import include, url as re_path
+else:
+    from django.urls import include, re_path
+from django.conf.urls.i18n import i18n_patterns
+
+
+urlpatterns = []
+urlpatterns += [
+    re_path(r'^i18n/', include('django.conf.urls.i18n')),
+]
+urlpatterns += i18n_patterns(
+    re_path(r'^admin/', admin.site.urls),
+)

tests/urls_without_i18n_patterns.py

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+
+import django
+from django.contrib import admin
+if django.VERSION < (2, 0):
+    from django.conf.urls import url as re_path
+else:
+    from django.urls import re_path
+
+
+urlpatterns = [
+    re_path(r'^admin/', admin.site.urls),
+]