diff options
| author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2025-03-31 23:00:37 +0200 |
|---|---|---|
| committer | Sarah Boyce <42296566+sarahboyce@users.noreply.github.com> | 2025-04-01 09:32:24 +0200 |
| commit | 88ca180bfe9940e338b5d4eca5079fd2280c752c (patch) | |
| tree | 0cef37c5ea14df36f7ceb04135f1a7d399608816 | |
| parent | 0581ec2f1a609c15248ba24db7c6f602b7fb88f7 (diff) | |
[5.2.x] Fixed #36283 -- Reverted "Fixed #35798, Refs #31641 -- Prevented admin navigation sidebar loading flicker."
This reverts commit 747b417a220b0412ed806001a383959449aac6da that caused
a visual regression when both navigation and filter sidebars are
visible.
Backport of 12385b4fa7059aab8e4f671853cc09ae8509501f from main.
| -rw-r--r-- | django/contrib/admin/templates/admin/base.html | 1 | ||||
| -rw-r--r-- | django/contrib/admin/templates/admin/nav_sidebar.html | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/django/contrib/admin/templates/admin/base.html b/django/contrib/admin/templates/admin/base.html index 92f7210e02..7e95550cf2 100644 --- a/django/contrib/admin/templates/admin/base.html +++ b/django/contrib/admin/templates/admin/base.html @@ -10,6 +10,7 @@ {% endblock %} {% if not is_popup and is_nav_sidebar_enabled %} <link rel="stylesheet" href="{% static "admin/css/nav_sidebar.css" %}"> + <script src="{% static 'admin/js/nav_sidebar.js' %}" defer></script> {% endif %} {% block extrastyle %}{% endblock %} {% if LANGUAGE_BIDI %}<link rel="stylesheet" href="{% block stylesheet_rtl %}{% static "admin/css/rtl.css" %}{% endblock %}">{% endif %} diff --git a/django/contrib/admin/templates/admin/nav_sidebar.html b/django/contrib/admin/templates/admin/nav_sidebar.html index 37cdac2184..a413e23754 100644 --- a/django/contrib/admin/templates/admin/nav_sidebar.html +++ b/django/contrib/admin/templates/admin/nav_sidebar.html @@ -1,4 +1,4 @@ -{% load i18n static %} +{% load i18n %} <button class="sticky toggle-nav-sidebar" id="toggle-nav-sidebar" aria-label="{% translate 'Toggle navigation' %}"></button> <nav class="sticky" id="nav-sidebar" aria-label="{% translate 'Sidebar' %}"> <input type="search" id="nav-filter" @@ -6,4 +6,3 @@ aria-label="{% translate 'Filter navigation items' %}"> {% include 'admin/app_list.html' with app_list=available_apps show_changelinks=False %} </nav> -<script src="{% static 'admin/js/nav_sidebar.js' %}"></script> |