mirror of
				https://github.com/django/django.git
				synced 2025-10-31 09:41:08 +00:00 
			
		
		
		
	[5.0.x] Fixed #34905 -- Corrected admin's main content element rendered in <main> tag.
Regression in91e617c743. Thanks Tom Carrick for the report. Backport of89d2ae257bfrom main
This commit is contained in:
		
				
					committed by
					
						 Mariusz Felisiak
						Mariusz Felisiak
					
				
			
			
				
	
			
			
			
						parent
						
							448510a94b
						
					
				
				
					commit
					31bdf67a9c
				
			| @@ -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 --> | ||||
|  | ||||
|   | ||||
| @@ -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">' | ||||
|         ) | ||||
|   | ||||
| @@ -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=[ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user