From cd413bd78ac65bd4282d26cc279bfd1bd4de707d Mon Sep 17 00:00:00 2001 From: Howard Cox Date: Fri, 2 Jun 2023 11:54:07 +0100 Subject: Fixed #34621 -- Made admin site header render in
tag. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was problematic for screen reader users because they use headings to navigate. Having two

is confusing, and the one in the header wasn’t particularly helpful since it’s the same on all pages. --- django/contrib/admin/sites.py | 2 +- django/contrib/admin/static/admin/css/base.css | 4 ++-- django/contrib/admin/static/admin/css/responsive.css | 4 ++-- django/contrib/admin/templates/admin/base_site.html | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'django') diff --git a/django/contrib/admin/sites.py b/django/contrib/admin/sites.py index 3ff7088506..2e400c2e19 100644 --- a/django/contrib/admin/sites.py +++ b/django/contrib/admin/sites.py @@ -45,7 +45,7 @@ class AdminSite: # Text to put at the end of each page's . site_title = gettext_lazy("Django site admin") - # Text to put in each page's <h1>. + # Text to put in each page's <div id="site-name">. site_header = gettext_lazy("Django administration") # Text to put at the top of the admin index page. diff --git a/django/contrib/admin/static/admin/css/base.css b/django/contrib/admin/static/admin/css/base.css index 0bde69d013..c4b7de55f6 100644 --- a/django/contrib/admin/static/admin/css/base.css +++ b/django/contrib/admin/static/admin/css/base.css @@ -937,7 +937,7 @@ a.deletelink:focus, a.deletelink:hover { display: flex; } -#branding h1 { +#site-name { padding: 0; margin: 0; margin-inline-end: 20px; @@ -946,7 +946,7 @@ a.deletelink:focus, a.deletelink:hover { color: var(--header-branding-color); } -#branding h1 a:link, #branding h1 a:visited { +#site-name a:link, #site-name a:visited { color: var(--accent); } diff --git a/django/contrib/admin/static/admin/css/responsive.css b/django/contrib/admin/static/admin/css/responsive.css index 9ce4f67bf2..e3923448ac 100644 --- a/django/contrib/admin/static/admin/css/responsive.css +++ b/django/contrib/admin/static/admin/css/responsive.css @@ -43,7 +43,7 @@ input[type="submit"], button { justify-content: flex-start; } - #branding h1 { + #site-name { margin: 0 0 8px; line-height: 1.2; } @@ -432,7 +432,7 @@ input[type="submit"], button { padding: 15px 20px; } - .login #branding h1 { + .login #site-name { margin: 0; } diff --git a/django/contrib/admin/templates/admin/base_site.html b/django/contrib/admin/templates/admin/base_site.html index d83ac0df9b..4405998164 100644 --- a/django/contrib/admin/templates/admin/base_site.html +++ b/django/contrib/admin/templates/admin/base_site.html @@ -3,7 +3,7 @@ {% block title %}{% if subtitle %}{{ subtitle }} | {% endif %}{{ title }} | {{ site_title|default:_('Django site admin') }}{% endblock %} {% block branding %} -<h1 id="site-name"><a href="{% url 'admin:index' %}">{{ site_header|default:_('Django administration') }}</a></h1> +<div id="site-name"><a href="{% url 'admin:index' %}">{{ site_header|default:_('Django administration') }}</a></div> {% if user.is_anonymous %} {% include "admin/color_theme_toggle.html" %} {% endif %} -- cgit v1.3