mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 19:49:13 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #34670 -- Improved loading of theme in admin.

Browse Source 
Thanks Sarah Abderemane for the review.
This commit is contained in:
Nicolas Lupien 2023-12-30 02:03:13 -05:00 committed by GitHub
parent e16d0c176e
commit 561e16d6a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
django/contrib/admin/static/admin/js/theme.js
View File

@ -1,7 +1,5 @@
'use strict'; 'use strict';
{ {
window.addEventListener('load', function(e) {
function setTheme(mode) { function setTheme(mode) {
if (mode !== "light" && mode !== "dark" && mode !== "auto") { if (mode !== "light" && mode !== "dark" && mode !== "auto") {
console.error(`Got invalid theme mode: ${mode}. Resetting to auto.`); console.error(`Got invalid theme mode: ${mode}. Resetting to auto.`);
@ -42,15 +40,12 @@
currentTheme ? setTheme(currentTheme) : setTheme("auto"); currentTheme ? setTheme(currentTheme) : setTheme("auto");
} }
function setupTheme() { window.addEventListener('load', function(_) {
// Attach event handlers for toggling themes
const buttons = document.getElementsByClassName("theme-toggle"); const buttons = document.getElementsByClassName("theme-toggle");
Array.from(buttons).forEach((btn) => { Array.from(buttons).forEach((btn) => {
btn.addEventListener("click", cycleTheme); btn.addEventListener("click", cycleTheme);
}); });
});
initTheme(); initTheme();
} }
setupTheme();
});
}

2
django/contrib/admin/templates/admin/base.html
View File

@ -6,7 +6,7 @@
<link rel="stylesheet" href="{% block stylesheet %}{% static "admin/css/base.css" %}{% endblock %}"> <link rel="stylesheet" href="{% block stylesheet %}{% static "admin/css/base.css" %}{% endblock %}">
{% block dark-mode-vars %} {% block dark-mode-vars %}
<link rel="stylesheet" href="{% static "admin/css/dark_mode.css" %}"> <link rel="stylesheet" href="{% static "admin/css/dark_mode.css" %}">
<script src="{% static "admin/js/theme.js" %}" defer></script> <script src="{% static "admin/js/theme.js" %}"></script>
{% endblock %} {% endblock %}
{% if not is_popup and is_nav_sidebar_enabled %} {% if not is_popup and is_nav_sidebar_enabled %}
<link rel="stylesheet" href="{% static "admin/css/nav_sidebar.css" %}"> <link rel="stylesheet" href="{% static "admin/css/nav_sidebar.css" %}">