Updated version and CHANGELOG.

* added transition to nav sidebar and toggle nav sidebar button

* specified transition properties instead of using all

* removed extra blank line

Co-authored-by: Anatol Zakrividoroga <anatol@Anatols-MacBook-Pro.local>

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.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.14.2) - 2021-01-04
+-  Fixed tabular inline scroll bar. #101
+-  Fixed module header selected link color. #102
+-  Fixed main content width when `admin.site.enable_nav_sidebar = False`. #105
+
+## [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.

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Fabio Caccamo - fabio.caccamo@gmail.com
+Copyright (c) 2016 - present, Fabio Caccamo - fabio.caccamo@gmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -148,3 +148,5 @@ Released under [MIT License](LICENSE.txt).
 - [`python-benedict`](https://github.com/fabiocaccamo/python-benedict) - dict subclass with keylist/keypath support, I/O shortcuts (base64, csv, json, pickle, plist, query-string, toml, xml, yaml) and many utilities. 📘
 
 - [`python-codicefiscale`](https://github.com/fabiocaccamo/python-codicefiscale) - encode/decode Italian fiscal codes - codifica/decodifica del Codice Fiscale. 🇮🇹 💳
+
+- [`python-fsutil`](https://github.com/fabiocaccamo/python-fsutil) - file-system utilities for lazy devs. 🧟‍♂️

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

@@ -122,12 +122,6 @@
     padding: 0 1px;
 }
 
-/*
-#changelist table tbody tr.selected {
-    background-color:#FFFFCC;
-}
-*/
-
 .admin-interface #changelist .paginator {
     margin-top:-1px; /* merge 2 borders into 1 */
     line-height:42px;
@@ -311,7 +305,7 @@ body.admin-interface .paginator a.showall:visited {
 
 /* begin fix tabular inlines horizontal scroll */
 .admin-interface .inline-related.tabular fieldset.module {
-    display: block;
+    display: contents;
     overflow-x: scroll;
     width: 100%;
     white-space: nowrap;
@@ -406,6 +400,7 @@ body.admin-interface .paginator a.showall:visited {
     -webkit-box-shadow: 4px 2px 8px -4px #DBDBDB;
     -moz-box-shadow: 4px 2px 8px -4px #DBDBDB;
     box-shadow: 4px 2px 8px -4px #DBDBDB;
+    /*transition: left .3s;*/
 }
 
 .admin-interface .toggle-nav-sidebar::before {
@@ -436,6 +431,7 @@ body.admin-interface .paginator a.showall:visited {
     border-top: none;
     border-bottom: none;
     border-left: none;
+    /*transition: left .3s, margin-left .3s;*/
 }
 
 @media (min-width:1280px) {
@@ -449,22 +445,12 @@ body.admin-interface .paginator a.showall:visited {
     .admin-interface #main:not(.shifted) > .content {
         max-width: 100%;
     }
-    .admin-interface.change-list:not(.popup) #main.shifted > .content,
+    .admin-interface.change-list:not(.popup) #main.shifted > #nav-sidebar + .content,
-    .admin-interface.change-form:not(.popup) #main.shifted > .content {
+    .admin-interface.change-form:not(.popup) #main.shifted > #nav-sidebar + .content {
         max-width: calc(100% - 360px);
     }
 }
 
-.admin-interface #nav-sidebar .current-app .section:link,
-.admin-interface #nav-sidebar .current-app .section:visited {
-    color: #FFFFCC;
-    font-weight: normal;
-}
-
-.admin-interface #nav-sidebar .current-model {
-    background: #FFFFCC;
-}
-
 /* fixed related widget and select2 */
 .admin-interface .aligned .form-row .related-widget-wrapper {
     white-space: nowrap;

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

@@ -100,6 +100,20 @@
     border-bottom-color:rgba(255, 255, 255, 0.5);
 }
 
+.admin-interface #nav-sidebar .current-app .section:link,
+.admin-interface #nav-sidebar .current-app .section:visited {
+    color: {{ theme.css_module_link_color }};
+    font-weight: normal;
+}
+
+.admin-interface #nav-sidebar .current-model {
+    background: #FFFFCC;
+}
+
+.admin-interface #changelist table tbody tr.selected {
+    background-color: #FFFFCC;
+}
+
 .admin-interface .module h2,
 .admin-interface .module caption,
 .admin-interface .module.filtered h2 {
@@ -288,6 +302,7 @@
     .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 {

admin_interface/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.14.0'
+__version__ = '0.14.2'

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),
+]