cleaning up, and styling fixes

Author: farridav

Makefile

@@ -1,7 +1,7 @@
 CYAN ?= \033[0;36m
 COFF ?= \033[0m
 
-.PHONY: deps lint check test help test_app test_user seed_data seed_small seed_large build publish publish-test publish-test-only version
+.PHONY: deps lint check test help test_app test_user build publish publish-test publish-test-only version
 .EXPORT_ALL_VARIABLES:
 
 .DEFAULT: help
@@ -36,21 +36,6 @@ test_app: ## Run the test app
 test_user: ## Make the test user
 	uv run python tests/test_app/manage.py shell -c "from django.contrib.auth.models import User; User.objects.create_superuser('test@test.com', password='test')"
 
-seed_data: ## Seed database with sample data (medium dataset)
-	@printf "$(CYAN)Seeding database with sample data$(COFF)\n"
-	uv run python tests/test_app/manage.py migrate
-	uv run python tests/test_app/manage.py seed_data --clear
-
-seed_small: ## Seed database with small dataset (fast)
-	@printf "$(CYAN)Seeding database with small dataset$(COFF)\n"
-	uv run python tests/test_app/manage.py migrate
-	uv run python tests/test_app/manage.py seed_data --small --clear
-
-seed_large: ## Seed database with large dataset (comprehensive testing)
-	@printf "$(CYAN)Seeding database with large dataset$(COFF)\n"
-	uv run python tests/test_app/manage.py migrate
-	uv run python tests/test_app/manage.py seed_data --large --clear
-
 build: ## Build the package
 	uv build --no-sources
 
@@ -77,9 +62,9 @@ version-prerelease: ## Bump to next prerelease (for pre-release workflow)
 	uv version --bump patch --bump alpha --frozen
 
 
-download_bootswatch_css: ## Download the Bootswatch CSS files
+download_bootswatch_css: ## Download the Bootswatch CSS and source map files
 	for theme in default brite cerulean cosmo cyborg darkly flatly journal litera lumen lux materia minty morph pulse quartz sandstone simplex sketchy slate solar spacelab superhero united vapor yeti zephyr; do \
 		mkdir -p jazzmin/static/vendor/bootswatch/$${theme}; \
 		curl -s https://bootswatch.com/5/$${theme}/bootstrap.min.css -o jazzmin/static/vendor/bootswatch/$${theme}/bootstrap.min.css; \
-		sed -i '/sourceMappingURL/d' jazzmin/static/vendor/bootswatch/$${theme}/bootstrap.min.css; \
+		curl -s https://bootswatch.com/5/$${theme}/bootstrap.min.css.map -o jazzmin/static/vendor/bootswatch/$${theme}/bootstrap.min.css.map; \
 	done

README.md

@@ -19,7 +19,7 @@ them as quickly as I would like, but im trying to get through them all now, hope
 [![Docs](https://readthedocs.org/projects/django-jazzmin/badge/?version=latest)](https://django-jazzmin.readthedocs.io)
 ![PyPI download month](https://img.shields.io/pypi/dm/django-jazzmin.svg)
 [![PyPI version](https://badge.fury.io/py/django-jazzmin.svg)](https://pypi.python.org/pypi/django-jazzmin/)
-![Python versions](https://img.shields.io/badge/python-%3E=3.9-brightgreen)
+![Python versions](https://img.shields.io/badge/python-%3E=3.10-brightgreen)
 ![Django Versions](https://img.shields.io/badge/django-%3E=4.2-brightgreen)
 [![Coverage Status](https://coveralls.io/repos/github/farridav/django-jazzmin/badge.svg?branch=main)](https://coveralls.io/github/farridav/django-jazzmin?branch=main)
 

docs/bugs_and_features.md

@@ -36,4 +36,4 @@ Some useful links for feature development:
 - [https://adminlte.io/themes/v3/index3.html](https://adminlte.io/themes/v3/index3.html)
 - [https://adminlte.io/docs/3.0/index.html](https://adminlte.io/docs/3.0/index.html)
 - [Font awesome 5.13.0 free icons](https://fontawesome.com/icons?d=gallery&m=free&v=5.0.0,5.0.1,5.0.10,5.0.11,5.0.12,5.0.13,5.0.2,5.0.3,5.0.4,5.0.5,5.0.6,5.0.7,5.0.8,5.0.9,5.1.0,5.1.1,5.2.0,5.3.0,5.3.1,5.4.0,5.4.1,5.4.2,5.13.0,5.12.0,5.11.2,5.11.1,5.10.0,5.9.0,5.8.2,5.8.1,5.7.2,5.7.1,5.7.0,5.6.3,5.5.0,5.4.2)
-- [https://getbootstrap.com/docs/4.5/getting-started/introduction/](https://getbootstrap.com/docs/4.5/getting-started/introduction/)
+- [https://getbootstrap.com/docs/5.3/getting-started/introduction/](https://getbootstrap.com/docs/5.3/getting-started/introduction/)

docs/configuration.md

@@ -131,6 +131,8 @@ JAZZMIN_SETTINGS = {
     "use_google_fonts_cdn": True,
     # Whether to show the UI customizer on the sidebar
     "show_ui_builder": False,
+    # Whether to show the theme chooser dropdown in the top navbar
+    "show_theme_chooser": False,
 
     ###############
     # Change view #
@@ -343,7 +345,7 @@ class BookAdmin(admin.ModelAdmin):
 You can enable a language chooser dropdown using `"language_chooser": True` in your `JAZZMIN_SETTINGS`, we mainly use this for
 assisting with translations, but it could be of use to some people in their admin site.
 
-To make proper use of this, please ensure you have internationalisation setup properly, See [https://docs.djangoproject.com/en/3.1/topics/i18n/translation/](https://docs.djangoproject.com/en/3.1/topics/i18n/translation/)
+To make proper use of this, please ensure you have internationalisation setup properly, See [https://docs.djangoproject.com/en/stable/topics/i18n/translation/](https://docs.djangoproject.com/en/stable/topics/i18n/translation/)
 
 Namely:
 

docs/development.md

@@ -2,39 +2,42 @@
 
 ## Installation
 
-This project manages dependencies using [poetry](https://python-poetry.org/)
+This project manages dependencies using [uv](https://docs.astral.sh/uv/)
 
-Ensure you have poetry installed (`pip install poetry`)
+Ensure you have uv installed (see [uv installation docs](https://docs.astral.sh/uv/getting-started/installation/))
 
-Then get setup with `poetry install`
+Then get setup:
 
     git clone git@github.com:farridav/django-jazzmin.git
-    poetry install
+    cd django-jazzmin
+    make deps
 
 ## Running the test project
 
 Setup db tables etc.
 
-    python tests/test_app/manage.py migrate
+    uv run python tests/test_app/manage.py migrate
 
 Generate test data
 
-    python tests/test_app/manage.py reset
+    uv run python tests/test_app/manage.py reset
 
 Run development server (with werkzeug debugger)
 
-    python tests/test_app/manage.py runserver_plus
+    uv run python tests/test_app/manage.py runserver_plus
+
+Or simply use the Makefile:
+
+    make test_app
 
 ## Running the tests
 
 Tests are run via github actions on any pull request into `main`, and are written for use with the [pytest](https://docs.pytest.org/en/latest/)
 framework, we should have good enough tests for you to base your own off of, though where we are lacking, feel free to contribute,
 but keep it clean, concise and simple, leave the magic to the wizards.
 
-Run the test suite with your current python interpreter and Django version using `pytest` or target an individual test
-with `pytest -k my_test_name`
-
-Run against all supported Python and Django Versions using `tox`
+Run the test suite with `make test` or target an individual test
+with `uv run pytest -k my_test_name`
 
 ## Contribution guidelines
 
@@ -47,7 +50,7 @@ Run against all supported Python and Django Versions using `tox`
 
 ## Coding guidelines
 
-- autoformat your code with [black](https://github.com/psf/black)
+- autoformat your code with `make lint` (uses [ruff](https://docs.astral.sh/ruff/))
 - When fixing something display related, please bear the following in mind:
   - Try fixing the problem using HTML, else CSS, else JS
   - Try removing code, else changing code, else adding code

docs/index.md

@@ -32,10 +32,8 @@ Live demo https://django-jazzmin-test.onrender.com
 You can also view the demo app by cloning the repository, and running the following commands:
 
 ```bash
-    poetry install
- ./tests/test_app/manage.py migrate
- ./tests/test_app/manage.py reset
- ./tests/test_app/manage.py runserver_plus
+make deps
+make test_app
 ```
 
 ## Screenshots

docs/ui_customisation.md

@@ -59,6 +59,7 @@ below.
 ### Available themes
 
 - default (standard Bootstrap-based theme)
+- brite [preview](https://bootswatch.com/brite/)
 - cerulean [preview](https://bootswatch.com/cerulean/)
 - cosmo [preview](https://bootswatch.com/cosmo/)
 - cyborg [preview](https://bootswatch.com/cyborg/)

jazzmin/settings.py

@@ -84,6 +84,8 @@
     "use_google_fonts_cdn": True,
     # Whether to show the UI customizer on the sidebar
     "show_ui_builder": False,
+    # Whether to show the theme chooser dropdown in the top navbar
+    "show_theme_chooser": False,
     ###############
     # Change view #
     ###############
@@ -345,6 +347,7 @@ def classes(*args: str) -> str:
         "brand_classes": classes("brand_small_text", "brand_colour"),
         "footer_classes": classes("footer_small_text"),
         "button_classes": tweaks["button_classes"],
+        "theme_list": list(THEMES.keys()),
     }
 
     return ret

jazzmin/static/jazzmin/css/main.css

@@ -500,6 +500,22 @@ html[data-bs-theme="dark"] .selector select option:checked {
 }
 
 
+/* ============================================================================
+   CHANGELIST - Checkbox select-all column
+   ========================================================================== */
+.djn-checkbox-select-all {
+    width: 1.5em;
+    text-align: center;
+    padding-right: 0 !important;
+}
+
+.table td.action-checkbox {
+    width: 1.5em;
+    text-align: center;
+    padding-right: 0 !important;
+}
+
+
 /* ============================================================================
    USER PANEL - Sidebar user info (not a native AdminLTE v4 component)
    ========================================================================== */

jazzmin/static/jazzmin/js/main.js

@@ -48,13 +48,71 @@
         $main_li_parent.addClass('menu-is-opening menu-open');
     };
 
+    function initThemeChooser() {
+        const $themeSelect = $('#jazzmin-theme-select');
+        const $modeSelect = $('#jazzmin-mode-select');
+
+        if (!$themeSelect.length && !$modeSelect.length) {
+            return;
+        }
+
+        // Restore saved theme from localStorage
+        const savedTheme = localStorage.getItem('jazzmin-theme');
+        if (savedTheme && $themeSelect.length) {
+            $themeSelect.val(savedTheme);
+        }
+
+        // Restore saved mode from localStorage
+        const savedMode = localStorage.getItem('jazzmin-theme-mode');
+        if (savedMode && $modeSelect.length) {
+            $modeSelect.val(savedMode);
+        }
+
+        // Theme switching — #jazzmin-theme link is always present in the DOM
+        $themeSelect.on('change', function () {
+            const newTheme = $(this).val();
+            const $themeCSS = $('#jazzmin-theme');
+            const base = $themeCSS.data('theme-base');
+
+            if (newTheme === 'default') {
+                $themeCSS.removeAttr('href');
+            } else {
+                $themeCSS.attr('href', base + '/' + newTheme + '/bootstrap.min.css');
+            }
+
+            $('body').removeClass(function (index, className) {
+                return (className.match(/(^|\s)theme-\S+/g) || []).join(' ');
+            }).addClass('theme-' + newTheme);
+
+            localStorage.setItem('jazzmin-theme', newTheme);
+        });
+
+        // Color scheme switching
+        $modeSelect.on('change', function () {
+            const mode = $(this).val();
+            var resolved = mode === 'auto'
+                ? (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light')
+                : mode;
+            document.documentElement.setAttribute('data-bs-theme', resolved);
+            localStorage.setItem('jazzmin-theme-mode', mode);
+        });
+
+        // Keep dropdown open when interacting with selects
+        $('#jazzy-theme-chooser').on('click', function (e) {
+            e.stopPropagation();
+        });
+    }
+
     $(document).ready(function () {
         // Set active status on links
         setActiveLinks()
 
         // When we use the menu, store its state in a cookie to preserve it
         handleMenu();
 
+        // Theme chooser (navbar dropdown)
+        initThemeChooser();
+
         // Add minimal changelist styling to templates that we have been unable to override (e.g MPTT)
         // Needs to be here and not in change_list.js because this is the only JS we are guaranteed to run
         // (as its included in base.html)