diff options
| author | ontowhee <82607723+ontowhee@users.noreply.github.com> | 2023-10-19 08:25:50 -0700 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2023-10-19 17:26:15 +0200 |
| commit | 31bdf67a9c443c9acfee8eba53e8f7a3f379241f (patch) | |
| tree | 265c7e70da3294943fd476752a5524f764ff0833 | |
| parent | 448510a94b9af30e1d9384166f830e8da2ef0438 (diff) | |
[5.0.x] Fixed #34905 -- Corrected admin's main content element rendered in <main> tag.
Regression in 91e617c743b21a0ebad01f18623a8b31f6f58500.
Thanks Tom Carrick for the report.
Backport of 89d2ae257bfdbe6f32c4671d97bf572623992ace from main
| -rw-r--r-- | django/contrib/admin/templates/admin/base.html | 8 | ||||
| -rw-r--r-- | tests/admin_views/test_nav_sidebar.py | 2 | ||||
| -rw-r--r-- | tests/admin_views/tests.py | 7 |
3 files changed, 12 insertions, 5 deletions
diff --git a/django/contrib/admin/templates/admin/base.html b/django/contrib/admin/templates/admin/base.html index 44fd16ee96..9549418729 100644 --- a/django/contrib/admin/templates/admin/base.html +++ b/django/contrib/admin/templates/admin/base.html @@ -81,13 +81,13 @@ {% endblock %} {% endif %} - <main class="main" id="main"> + <div class="main" id="main"> {% if not is_popup and is_nav_sidebar_enabled %} {% block nav-sidebar %} {% include "admin/nav_sidebar.html" %} {% endblock %} {% endif %} - <div id="content-start" class="content" tabindex="-1"> + <main id="content-start" class="content" tabindex="-1"> {% block messages %} {% if messages %} <ul class="messagelist">{% for message in messages %} @@ -109,8 +109,8 @@ </div> <!-- END Content --> {% block footer %}<div id="footer"></div>{% endblock %} - </div> - </main> + </main> + </div> </div> <!-- END Container --> diff --git a/tests/admin_views/test_nav_sidebar.py b/tests/admin_views/test_nav_sidebar.py index 908ad52411..e9b367b63b 100644 --- a/tests/admin_views/test_nav_sidebar.py +++ b/tests/admin_views/test_nav_sidebar.py @@ -42,7 +42,7 @@ class AdminSidebarTests(TestCase): def test_sidebar_not_on_index(self): response = self.client.get(reverse("test_with_sidebar:index")) - self.assertContains(response, '<main class="main" id="main">') + self.assertContains(response, '<div class="main" id="main">') self.assertNotContains( response, '<nav class="sticky" id="nav-sidebar" aria-label="Sidebar">' ) diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index 2e91e9d859..3ab9fd6a26 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -1591,6 +1591,13 @@ class AdminViewBasicTest(AdminViewBasicTestCase): response = self.client.get(reverse("admin:login")) self.assertContains(response, '<header id="header">') + def test_main_content(self): + response = self.client.get(reverse("admin:index")) + self.assertContains( + response, + '<main id="content-start" class="content" tabindex="-1">', + ) + @override_settings( AUTH_PASSWORD_VALIDATORS=[ |