Fixed #35115 -- Made admin's footer render in <footer> tag.

django · Jan 24, 2024 · e412d85 · e412d85
1 parent 0450c9b
commit e412d85
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/django/contrib/admin/static/admin/css/base.css b/django/contrib/admin/static/admin/css/base.css
@@ -893,11 +893,6 @@ a.deletelink:focus, a.deletelink:hover {
   }
 }
 
-#footer {
-    clear: both;
-    padding: 10px;
-}
-
 /* COLUMN TYPES */
 
 .colMS {

diff --git a/django/contrib/admin/static/admin/css/responsive.css b/django/contrib/admin/static/admin/css/responsive.css
@@ -451,14 +451,10 @@ input[type="submit"], button {
 @media (max-width: 767px) {
     /* Layout */
 
-    #header, #content, #footer {
+    #header, #content {
         padding: 15px;
     }
 
-    #footer:empty {
-        padding: 0;
-    }
-
     div.breadcrumbs {
         padding: 10px 15px;
     }

diff --git a/django/contrib/admin/templates/admin/base.html b/django/contrib/admin/templates/admin/base.html
@@ -108,9 +108,9 @@
           <br class="clear">
         </div>
         <!-- END Content -->
-        {% block footer %}<div id="footer"></div>{% endblock %}
       </main>
     </div>
+    <footer id="footer">{% block footer %}{% endblock %}</footer>
 </div>
 <!-- END Container -->
 

diff --git a/docs/releases/5.1.txt b/docs/releases/5.1.txt
@@ -348,6 +348,10 @@ Miscellaneous
 * In order to improve accessibility, the admin's changelist filter is now
   rendered in a ``<nav>`` tag instead of a ``<div>``.
 
+* In order to improve accessibility, the admin's footer is now rendered in
+  a ``<footer>`` tag instead of a ``<div>``, and also moved below the
+  ``<div id="main">`` element.
+
 * :meth:`.SimpleTestCase.assertURLEqual` and
   :meth:`~django.test.SimpleTestCase.assertInHTML` now add ``": "`` to the
   ``msg_prefix``. This is consistent with the behavior of other assertions.

diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py
@@ -1605,6 +1605,13 @@ def test_main_content(self):
             '<main id="content-start" class="content" tabindex="-1">',
         )
 
+    def test_footer(self):
+        response = self.client.get(reverse("admin:index"))
+        self.assertContains(response, '<footer id="footer">')
+        self.client.logout()
+        response = self.client.get(reverse("admin:login"))
+        self.assertContains(response, '<footer id="footer">')
+
     def test_aria_describedby_for_add_and_change_links(self):
         response = self.client.get(reverse("admin:index"))
         tests = [