Updated CHANGELOG and version.

* Add sticky action button option.

* Add sticky_pagination field. Handle top submit row. Update Admin section

* Add sticky-pagination styles. Fix trailing whitespace issue in models.

* Update sticky pagination max-width

CHANGELOG.md

@@ -4,6 +4,33 @@ 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.15.5](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.15.5) - 2021-03-02
+-  Fixed sticky submit and pagination `z-index` issue with related modal.
+
+## [0.15.4](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.15.4) - 2021-03-01
+-  Fixed sticky submit and pagination `z-index` issue with sticky `list_filter` and `django-json-widget`.
+
+## [0.15.3](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.15.3) - 2021-02-08
+-  Fixed sticky submit and pagination width when `admin.site.enable_nav_sidebar = False`. #113
+
+## [0.15.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.15.2) - 2021-02-03
+-  Fixed body classes template rendering.
+-  Improved sticky submit and pagination backward compatibility.
+
+## [0.15.1](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.15.1) - 2021-02-03
+-  Fixed and improved sticky form controls and pagination style.
+
+## [0.15.0](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.15.0) - 2021-02-03
+-  Added sticky form controls and pagination options. #110
+-  Added support to 4-digit language code in language chooser. #111
+-  Added theme css variables for third-party libraries.
+-  Fixed app module section link hover color.
+
+## [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
 

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

@@ -22,10 +22,12 @@ django-admin-interface is a modern **responsive flat admin interface customizabl
 - Beautiful default **django-theme**
 - Themes management and customization *(you can **customize admin title, logo and colors**)*
 - Responsive
-- List filter dropdown *(optional)*
-- `NEW` **Related modal** *(instead of the old popup window, optional)*
-- `NEW` **Environment name/marker**
-- `NEW` **Language chooser**
+- Related modal *(instead of the old popup window)*
+- Environment name/marker
+- Language chooser
+- List filter dropdown
+- `NEW` **List filter sticky**
+- `NEW` **Form controls sticky** *(pagination and save/delete buttons)*
 - Compatibility / Style optimizations for:
   - `django-ckeditor`
   - `django-dynamic-raw-id`
@@ -77,7 +79,7 @@ Run ``python manage.py loaddata admin_interface_theme_foundation.json``
 Run ``python manage.py loaddata admin_interface_theme_uswds.json``
 
 ### Add more themes
-You can add a theme you've created through the admin to this repository by [sending us a PR](http://makeapullrequest.com/). Here are the steps to follow to add :
+You can add a theme you've created through the admin to this repository by [sending us a PR](http://makeapullrequest.com/). Here are the steps to follow to add:
 
 1. Export your exact theme as fixture using the `dumpdata` admin command:
 ``python manage.py dumpdata admin_interface.Theme --indent 4 -o admin_interface_theme_{{name}}.json --pks=N``
@@ -88,6 +90,32 @@ You can add a theme you've created through the admin to this repository by [send
 
 4. Edit the section above to document your theme.
 
+### Add theme support to third-party libraries
+You can add **theme support to existing third-party libraries** using the following **css variables**:
+
+- `--admin-interface-title-color`
+- `--admin-interface-logo-color`
+- `--admin-interface-env-color`
+- `--admin-interface-header-background-color:`
+- `--admin-interface-header-text-color`
+- `--admin-interface-header-link-color`
+- `--admin-interface-header-link_hover-color`
+- `--admin-interface-module-background-color`
+- `--admin-interface-module-text-color`
+- `--admin-interface-module-link-color`
+- `--admin-interface-module-link-hover-color`
+- `--admin-interface-generic-link-color`
+- `--admin-interface-generic-link-hover-color`
+- `--admin-interface-save-button-background-color`
+- `--admin-interface-save-button-background-hover-color`
+- `--admin-interface-save-button-text-color`
+- `--admin-interface-delete-button-background-color`
+- `--admin-interface-delete-button-background-hover-color`
+- `--admin-interface-delete-button-text-color`
+- `--admin-interface-related-modal-background-color`
+- `--admin-interface-related-modal-background-opacity`
+
+
 ## Screenshots
 ###### Admin login
 ![django-admin-interface_login](https://cloud.githubusercontent.com/assets/1035294/11240233/55c8d4ba-8df1-11e5-9568-00fdc987ede8.gif)
@@ -148,3 +176,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/admin.py

@@ -110,6 +110,13 @@ class ThemeAdmin(admin.ModelAdmin):
                 'related_modal_close_button_visible',
             )
         }),
+        (_('Form Controls'), {
+            'classes': ('wide', ),
+            'fields': (
+                'form_submit_sticky',
+                'form_pagination_sticky',
+            )
+        }),
         (_('List Filter'), {
             'classes': ('wide', ),
             'fields': (

admin_interface/migrations/0019_add_form_sticky.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.1.5 on 2021-01-29 20:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('admin_interface', '0018_theme_list_filter_sticky'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='theme',
+            name='form_pagination_sticky',
+            field=models.BooleanField(default=False, verbose_name='sticky pagination'),
+        ),
+        migrations.AddField(
+            model_name='theme',
+            name='form_submit_sticky',
+            field=models.BooleanField(default=False, verbose_name='sticky submit'),
+        ),
+    ]

admin_interface/models.py

@@ -299,6 +299,13 @@ class Theme(models.Model):
         default=True,
         verbose_name=_('visible'))
 
+    form_submit_sticky = models.BooleanField(
+        default=False,
+        verbose_name=_('sticky submit'))
+    form_pagination_sticky = models.BooleanField(
+        default=False,
+        verbose_name=_('sticky pagination'))
+
     def set_active(self):
         self.active = True
         self.save()

admin_interface/templates/admin/base_site.html

@@ -17,6 +17,7 @@ https://github.com/fabiocaccamo/django-admin-interface
 */
 {% include "admin_interface/css/admin-interface.css" %}
 {% include "admin_interface/css/admin-interface-fix.css" %}
+{% include "admin_interface/css/form-controls.css" %}
 {% include "admin_interface/css/list-filter-dropdown.css" %}
 {% include "admin_interface/css/recent-actions.css" %}
 {% include "admin_interface/css/related-modal.css" %}
@@ -52,7 +53,7 @@ https://github.com/fabiocaccamo/django-admin-interface
 {% include "admin_interface/related-modal.html" %}
 {% endblock %}
 
-{% block bodyclass %}admin-interface flat-theme {% get_admin_interface_theme as theme %}{% if theme.name %}{{ theme.name|slugify }}-theme{% endif %}{% endblock %}
+{% block bodyclass %}admin-interface flat-theme {% get_admin_interface_theme as theme %}{% if theme.name %}{{ theme.name|slugify }}-theme{% endif %}{% if theme.form_submit_sticky %} sticky-submit {% endif %}{% if theme.form_pagination_sticky %} sticky-pagination {% endif %}{% endblock %}
 
 {% block branding %}
 {% get_admin_interface_theme as theme %}

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-form:not(.popup) #main.shifted > .content {
+    .admin-interface.change-list:not(.popup) #main.shifted > #nav-sidebar + .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

@@ -1,3 +1,27 @@
+:root {
+    --admin-interface-title-color: {{ theme.title_color }};
+    --admin-interface-logo-color: {{ theme.logo_color }};
+    --admin-interface-env-color: {{ theme.env_color }};
+    --admin-interface-header-background-color: {{ theme.css_header_background_color }};
+    --admin-interface-header-text-color: {{ theme.css_header_text_color }};
+    --admin-interface-header-link-color: {{ theme.css_header_link_color }};
+    --admin-interface-header-link_hover-color: {{ theme.css_header_link_hover_color }};
+    --admin-interface-module-background-color: {{ theme.css_module_background_color }};
+    --admin-interface-module-text-color: {{ theme.css_module_text_color }};
+    --admin-interface-module-link-color: {{ theme.css_module_link_color }};
+    --admin-interface-module-link-hover-color: {{ theme.css_module_link_hover_color }};
+    --admin-interface-generic-link-color: {{ theme.css_generic_link_color }};
+    --admin-interface-generic-link-hover-color: {{ theme.css_generic_link_hover_color }};
+    --admin-interface-save-button-background-color: {{ theme.css_save_button_background_color }};
+    --admin-interface-save-button-background-hover-color: {{ theme.css_save_button_background_hover_color }};
+    --admin-interface-save-button-text-color: {{ theme.css_save_button_text_color }};
+    --admin-interface-delete-button-background-color: {{ theme.css_delete_button_background_color }};
+    --admin-interface-delete-button-background-hover-color: {{ theme.css_delete_button_background_hover_color }};
+    --admin-interface-delete-button-text-color: {{ theme.css_delete_button_text_color }};
+    --admin-interface-related-modal-background-color: {{ theme.related_modal_background_color }};
+    --admin-interface-related-modal-background-opacity: {{ theme.related_modal_background_opacity }};
+}
+
 .admin-interface #header {
     background: {{ theme.css_header_background_color }};
     color: {{ theme.css_header_text_color }};
@@ -40,7 +64,7 @@
     position: absolute;
     top: 15px;
     right: 15px;
-    z-index: 5;
+    z-index: 10;
 }
 @media (min-width:768px) {
     .admin-interface .language-chooser {
@@ -100,6 +124,25 @@
     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-app .section:focus,
+.admin-interface #nav-sidebar .current-app .section:hover {
+    color: {{ theme.css_module_link_hover_color }};
+}
+
+.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 {
@@ -289,11 +332,13 @@
         position: sticky;
         top: 40px;
         float: right;
+        z-index: 30;
     }
     /* feature not available for django < 3.1.2 */
     .admin-interface .module.filtered #toolbar + #changelist-filter {
         position: absolute;
         top: 0px;
+        z-index: 30;
     }
 }
 {% endif %}

admin_interface/templates/admin_interface/css/form-controls.css

@@ -0,0 +1,95 @@
+/* sticky pagination */
+
+.admin-interface.sticky-pagination.change-list #content-main {
+    padding-bottom: 4.375rem;
+}
+
+.admin-interface.sticky-pagination.change-list .paginator {
+    width: 100%;
+    position: fixed;
+    bottom: 0;
+    right: 0;
+    z-index: 40;
+    box-sizing: border-box;
+    padding-left: 15px;
+    padding-right: 15px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    border-radius: 0;
+    border-top: 1px solid #EEEEEE;
+    border-bottom: none;
+    margin: 0;
+}
+
+.admin-interface.sticky-pagination.change-list.popup .paginator {
+    padding-left: 20px;
+    padding-right: 20px;
+}
+
+@media (min-width:768px) {
+    .admin-interface.sticky-pagination.change-list:not(.popup) .paginator {
+        padding-left: 30px;
+        padding-right: 30px;
+    }
+}
+
+@media (min-width:1024px) {
+    .admin-interface.sticky-pagination.change-list:not(.popup) .paginator {
+        padding-left: 40px;
+        padding-right: 40px;
+    }
+}
+
+@media (min-width:1280px) {
+    .admin-interface.sticky-pagination.change-list:not(.popup) #main.shifted > #nav-sidebar + .content .paginator {
+        width: calc(100% - 359px);
+    }
+}
+
+/* sticky submit */
+
+@media (min-width:768px) {
+    .admin-interface.sticky-submit.change-form #content-main {
+        padding-bottom: 4.375rem;
+    }
+
+    .admin-interface.sticky-submit.change-form .submit-row:last-of-type {
+        width: 100%;
+        position: fixed;
+        bottom: 0;
+        right: 0;
+        z-index: 40;
+        box-sizing: border-box;
+        padding-left: 15px;
+        padding-right: 15px;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        border-radius: 0;
+        border-top: 1px solid #EEEEEE;
+        border-bottom: none;
+        margin: 0;
+    }
+
+    .admin-interface.sticky-submit.change-form.popup .submit-row:last-of-type {
+        padding-left: 20px;
+        padding-right: 20px;
+    }
+
+    .admin-interface.sticky-submit.change-form:not(.popup) .submit-row:last-of-type {
+        padding-left: 30px;
+        padding-right: 30px;
+    }
+}
+
+@media (min-width:1024px) {
+    .admin-interface.sticky-submit.change-form:not(.popup) .submit-row:last-of-type {
+        padding-left: 40px;
+        padding-right: 40px;
+    }
+}
+
+@media (min-width:1280px) {
+    .admin-interface.sticky-submit.change-form:not(.popup) #main.shifted > #nav-sidebar + .content .submit-row:last-of-type {
+        width: calc(100% - 359px);
+    }
+}

admin_interface/templatetags/admin_interface_tags.py

@@ -42,7 +42,7 @@ def get_admin_interface_languages(context):
     if not request:
         return None
     full_path = request.get_full_path()
-    admin_nolang_url = re.sub(r'^\/([\w]{2})([\-\_]{1}[\w]{2})?\/', '/', full_path)
+    admin_nolang_url = re.sub(r'^\/([\w]{2})([\-\_]{1}[\w]{2,4})?\/', '/', full_path)
     if admin_nolang_url == full_path:
         # ImproperlyConfigured - must include admin urls using i18n_patterns:
         # from django.conf.urls.i18n import i18n_patterns

admin_interface/version.py

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