mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-05-07 15:36:29 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #35798, Refs #31641 -- Prevented admin navigation sidebar loading flicker.

Browse Source 
Thank you to Mario Munoz and Thibaud Colas for the testing and review.
This commit is contained in:
Gavin Wahl 2022-11-02 16:29:17 -06:00 committed by Ryan Cheley
parent 9d77f92d9b
commit 74e11d759b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,6 @@
{% 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" %}">
<script src="{% static 'admin/js/nav_sidebar.js' %}" defer></script>
{% endif %} {% endif %}
{% block extrastyle %}{% endblock %} {% block extrastyle %}{% endblock %}
{% if LANGUAGE_BIDI %}<link rel="stylesheet" href="{% block stylesheet_rtl %}{% static "admin/css/rtl.css" %}{% endblock %}">{% endif %} {% if LANGUAGE_BIDI %}<link rel="stylesheet" href="{% block stylesheet_rtl %}{% static "admin/css/rtl.css" %}{% endblock %}">{% endif %}

3
django/contrib/admin/templates/admin/nav_sidebar.html
View File

@ -1,4 +1,4 @@
{% load i18n %} {% load i18n static %}
<button class="sticky toggle-nav-sidebar" id="toggle-nav-sidebar" aria-label="{% translate 'Toggle navigation' %}"></button> <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' %}"> <nav class="sticky" id="nav-sidebar" aria-label="{% translate 'Sidebar' %}">
<input type="search" id="nav-filter" <input type="search" id="nav-filter"
@ -6,3 +6,4 @@
aria-label="{% translate 'Filter navigation items' %}"> aria-label="{% translate 'Filter navigation items' %}">
{% include 'admin/app_list.html' with app_list=available_apps show_changelinks=False %} {% include 'admin/app_list.html' with app_list=available_apps show_changelinks=False %}
</nav> </nav>
<script src="{% static 'admin/js/nav_sidebar.js' %}"></script>