Merge branch 'main' into samielachi/add-more-django-python

README.md

@@ -23,7 +23,7 @@ them as quickly as I would like, but im trying to get through them all now, hope
 ![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=master)](https://coveralls.io/github/farridav/django-jazzmin?branch=master)
 
-Drop-in theme for django admin, that utilises AdminLTE 3 & Bootstrap 4 to make yo' admin look jazzy
+Drop-in theme for django admin, that utilises AdminLTE 3.2 & Bootstrap 5 to make yo' admin look jazzy
 
 ## Installation
 
@@ -42,12 +42,12 @@ See [Documentation](https://django-jazzmin.readthedocs.io) or [Test App](https:/
 - Customisable top menu
 - Customisable user menu
 - 4 different Change form templates (horizontal tabs, vertical tabs, carousel, collapsible)
-- Bootstrap 4 modal (instead of the old popup window, optional)
+- Bootstrap 5 modal (instead of the old popup window, optional)
 - Search bar for any given model admin
 - Customisable UI (via Live UI changes, or custom CSS/JS)
 - Responsive
 - Select2 drop-downs
-- Bootstrap 4 & AdminLTE UI components
+- Bootstrap 5 & AdminLTE UI components
 - Using the latest [adminlte](https://adminlte.io/) + [bootstrap](https://getbootstrap.com/)
 
 ## Screenshots
@@ -123,5 +123,5 @@ project were possible, but this project has taken a different direction.
 The javascript modal implementation uses some code from [django-admin-interface](https://github.com/fabiocaccamo/django-admin-interface/blob/master/admin_interface/static/admin/js/popup_response.js), so thanks to @fabiocaccamo for original work
 
 - Based on AdminLTE 3: <https://adminlte.io/>
-- Using Bootstrap 4: <https://getbootstrap.com/>
+- Using Bootstrap 5: <https://getbootstrap.com/>
 - Using Font Awesome 5: <https://fontawesome.com/>

docs/index.md

@@ -7,7 +7,7 @@ customise, including a built-in UI customizer
 
 - Drop-in admin skin, all configuration optional
 - Select2 drop-downs
-- Bootstrap 4 & AdminLTE UI components
+- Bootstrap 5 & AdminLTE UI components
 - Search bar for any given model admin
 - Modal windows instead of popups
 - Customisable side menu
@@ -77,5 +77,5 @@ deserved its own package, big thanks to @wuyue92tree for all of his initial hard
 project were possible, but this project is taking a slightly different direction.
 
 - Based on AdminLTE 3: <https://adminlte.io/>
-- Using Bootstrap 4: <https://getbootstrap.com/>
+- Using Bootstrap 5: <https://getbootstrap.com/>
 - Using Font Awesome 5: <https://fontawesome.com/>

jazzmin/settings.py

@@ -170,6 +170,7 @@
     "lumen": "vendor/bootswatch/lumen/bootstrap.min.css",
     "lux": "vendor/bootswatch/lux/bootstrap.min.css",
     "materia": "vendor/bootswatch/materia/bootstrap.min.css",
+    "morph": "vendor/bootswatch/morph/bootstrap.min.css",
     "minty": "vendor/bootswatch/minty/bootstrap.min.css",
     "pulse": "vendor/bootswatch/pulse/bootstrap.min.css",
     "sandstone": "vendor/bootswatch/sandstone/bootstrap.min.css",
@@ -178,12 +179,15 @@
     "spacelab": "vendor/bootswatch/spacelab/bootstrap.min.css",
     "united": "vendor/bootswatch/united/bootstrap.min.css",
     "yeti": "vendor/bootswatch/yeti/bootstrap.min.css",
+    "quartz": "vendor/bootswatch/quartz/bootstrap.min.css",
+    "zephyr": "vendor/bootswatch/zephyr/bootstrap.min.css",
     # dark themes
     "darkly": "vendor/bootswatch/darkly/bootstrap.min.css",
     "cyborg": "vendor/bootswatch/cyborg/bootstrap.min.css",
     "slate": "vendor/bootswatch/slate/bootstrap.min.css",
     "solar": "vendor/bootswatch/solar/bootstrap.min.css",
     "superhero": "vendor/bootswatch/superhero/bootstrap.min.css",
+    "vapor": "vendor/bootswatch/vapor/bootstrap.min.css",
 }
 
 DARK_THEMES = ("darkly", "cyborg", "slate", "solar", "superhero")

jazzmin/templates/admin/base.html

@@ -362,7 +362,7 @@ <h4 class="modal-title">{% trans 'UI Configuration' %}</h4>
 
 <!-- jQuery -->
 <script src="{% static "admin/js/vendor/jquery/jquery.js" %}"></script>
-<!-- Bootstrap 4 -->
+<!-- Bootstrap 5 -->
 <script src="{% static "vendor/bootstrap/js/bootstrap.min.js" %}"></script>
 <!-- AdminLTE App -->
 <script src="{% static "vendor/adminlte/js/adminlte.min.js" %}"></script>

jazzmin/templates/jazzmin/includes/ui_builder_panel.html

@@ -20,7 +20,9 @@ <h5>Customize</h5>
                 <option>lux</option>
                 <option>materia</option>
                 <option>minty</option>
+                <option>morph</option>
                 <option>pulse</option>
+                <option>quartz</option>
                 <option>sandstone</option>
                 <option>simplex</option>
                 <option>sketchy</option>
@@ -29,16 +31,18 @@ <h5>Customize</h5>
                 <option>spacelab</option>
                 <option>superhero</option>
                 <option>united</option>
+                <option>vapor</option>
                 <option>yeti</option>
+                <option>zephyr</option>
             </select>
         </div>
 
         <div class="mb-1">
             <label for="jazzmin-dark-mode-theme-chooser">Dark Theme:</label>
             <select name="theme" id="jazzmin-dark-mode-theme-chooser">
                 <option selected="selected" value="">None</option>
-                <option>darkly</option>
                 <option>cyborg</option>
+                <option>darkly</option>
                 <option>slate</option>
                 <option>solar</option>
                 <option>superhero</option>

jazzmin/templates/registration/base.html

@@ -71,7 +71,7 @@ <h1>
 
 <!-- jQuery -->
 <script src="{% static "admin/js/vendor/jquery/jquery.js" %}"></script>
-<!-- Bootstrap 4 -->
+<!-- Bootstrap 5 -->
 <script src="{% static 'vendor/bootstrap/js/bootstrap.min.js' %}"></script>
 <!-- AdminLTE App -->
 <script src="{% static 'vendor/adminlte/js/adminlte.min.js' %}"></script>

pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "django-jazzmin"
 version = "0.0.0"
-description = "Drop-in theme for django admin, that utilises AdminLTE 3 & Bootstrap 4 to make yo' admin look jazzy"
+description = "Drop-in theme for django admin, that utilises AdminLTE 3 & Bootstrap 5 to make yo' admin look jazzy"
 license = "MIT"
 authors = ["Shipit <[email protected]>"]
 maintainers = ["Shipit <[email protected]>"]