Skip to content

Fixed #36529 -- Added support for the admin navigation sidebar on mobile screens. #19696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+49 −6
Open

Fixed #36529 -- Added support for the admin navigation sidebar on mobile screens. #19696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions django/contrib/admin/static/admin/css/nav_sidebar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,18 @@
}

@media (max-width: 767px) {
#nav-sidebar, #toggle-nav-sidebar {
display: none;
#container > .main.shifted {
overflow-x: hidden;
flex: 0 1 auto;
}

.main > #nav-sidebar + .content,
.main.shifted > #nav-sidebar + .content {
max-width: 100%;
.main.shifted #nav-sidebar {
flex: none;
}

#nav-sidebar {
width: calc(100% - 23px);
height: 100%;
}
}

Expand Down
3 changes: 2 additions & 1 deletion django/contrib/admin/static/admin/js/nav_sidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
{
const toggleNavSidebar = document.getElementById('toggle-nav-sidebar');
if (toggleNavSidebar !== null) {
const isMobile = window.innerWidth <= 768;
const navSidebar = document.getElementById('nav-sidebar');
const main = document.getElementById('main');
let navSidebarIsOpen = localStorage.getItem('django.admin.navSidebarIsOpen');
let navSidebarIsOpen = isMobile ? false : localStorage.getItem('django.admin.navSidebarIsOpen');
if (navSidebarIsOpen === null) {
navSidebarIsOpen = 'true';
}
Expand Down
37 changes: 37 additions & 0 deletions tests/admin_views/test_nav_sidebar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,3 +232,40 @@ def test_sidebar_filter_persists(self):
filter_input = self.selenium.find_element(By.CSS_SELECTOR, "#nav-filter")
filter_input.send_keys("users")
self.assertEqual(self.selenium.execute_script(filter_value_script), "users")

def test_sidebar_state_ignore_on_mobile(self):
from selenium.webdriver.common.by import By

def get_nav_sidebar():
return self.selenium.find_element(By.ID, "nav-sidebar")

def get_users_link():
return self.selenium.find_element(By.CSS_SELECTOR, "#auth-user a")

self.selenium.get(
self.live_server_url + reverse("test_with_sidebar:auth_user_changelist")
)
with self.mobile_size():
self.assertIsNone(
self.selenium.execute_script(
"return localStorage.getItem('django.admin.navSidebarIsOpen')"
)
)
users_link = get_users_link()
users_link.click()
nav_sidebar = get_nav_sidebar()
self.assertFalse(nav_sidebar.is_displayed())
toggle_button = self.selenium.find_element(
By.CSS_SELECTOR, "#toggle-nav-sidebar"
)
toggle_button.click()
self.assertEqual(
self.selenium.execute_script(
"return localStorage.getItem('django.admin.navSidebarIsOpen')"
),
"true",
)
users_link = get_users_link()
users_link.click()
nav_sidebar = get_nav_sidebar()
self.assertFalse(nav_sidebar.is_displayed())
Loading