mirror of
https://github.com/django/django.git
synced 2025-03-12 02:12:38 +00:00
Fixed #34982 -- Fixed admin's read-only password widget and help texts alignment for tablet screen size.
Co-authored-by: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com>
This commit is contained in:
parent
a652f07596
commit
729266c6f2
@ -24,7 +24,6 @@ form .form-row p {
|
|||||||
|
|
||||||
.flex-container {
|
.flex-container {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-wrap: wrap;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.form-multiline > div {
|
.form-multiline > div {
|
||||||
@ -78,6 +77,7 @@ form ul.inline li {
|
|||||||
.aligned label {
|
.aligned label {
|
||||||
display: block;
|
display: block;
|
||||||
padding: 4px 10px 0 0;
|
padding: 4px 10px 0 0;
|
||||||
|
min-width: 160px;
|
||||||
width: 160px;
|
width: 160px;
|
||||||
word-wrap: break-word;
|
word-wrap: break-word;
|
||||||
line-height: 1;
|
line-height: 1;
|
||||||
|
@ -588,6 +588,7 @@ input[type="submit"], button {
|
|||||||
|
|
||||||
.aligned label {
|
.aligned label {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
min-width: auto;
|
||||||
padding: 0 0 10px;
|
padding: 0 0 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -69,6 +69,7 @@
|
|||||||
padding: 0;
|
padding: 0;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
line-height: 1;
|
line-height: 1;
|
||||||
|
min-width: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.selector .selector-available input,
|
.selector .selector-available input,
|
||||||
|
@ -31,3 +31,7 @@ Bugfixes
|
|||||||
* Fixed a regression in Django 4.2 that caused a crash of querysets with
|
* Fixed a regression in Django 4.2 that caused a crash of querysets with
|
||||||
aggregations on MariaDB when the ``ONLY_FULL_GROUP_BY`` SQL mode was enabled
|
aggregations on MariaDB when the ``ONLY_FULL_GROUP_BY`` SQL mode was enabled
|
||||||
(:ticket:`34992`).
|
(:ticket:`34992`).
|
||||||
|
|
||||||
|
* Fixed a regression in Django 4.2 where the admin's read-only password widget
|
||||||
|
and some help texts were incorrectly aligned at tablet widths
|
||||||
|
(:ticket:`34982`).
|
||||||
|
@ -5754,6 +5754,7 @@ class SeleniumTests(AdminSeleniumTestCase):
|
|||||||
and with stacked and tabular inlines.
|
and with stacked and tabular inlines.
|
||||||
Refs #13068, #9264, #9983, #9784.
|
Refs #13068, #9264, #9983, #9784.
|
||||||
"""
|
"""
|
||||||
|
from selenium.webdriver import ActionChains
|
||||||
from selenium.webdriver.common.by import By
|
from selenium.webdriver.common.by import By
|
||||||
|
|
||||||
self.admin_login(
|
self.admin_login(
|
||||||
@ -5766,6 +5767,8 @@ class SeleniumTests(AdminSeleniumTestCase):
|
|||||||
|
|
||||||
# Main form ----------------------------------------------------------
|
# Main form ----------------------------------------------------------
|
||||||
self.selenium.find_element(By.ID, "id_pubdate").send_keys("2012-02-18")
|
self.selenium.find_element(By.ID, "id_pubdate").send_keys("2012-02-18")
|
||||||
|
status = self.selenium.find_element(By.ID, "id_status")
|
||||||
|
ActionChains(self.selenium).move_to_element(status).click(status).perform()
|
||||||
self.select_option("#id_status", "option two")
|
self.select_option("#id_status", "option two")
|
||||||
self.selenium.find_element(By.ID, "id_name").send_keys(
|
self.selenium.find_element(By.ID, "id_name").send_keys(
|
||||||
" the mAin nÀMë and it's awεšomeıııİ"
|
" the mAin nÀMë and it's awεšomeıııİ"
|
||||||
@ -5784,6 +5787,10 @@ class SeleniumTests(AdminSeleniumTestCase):
|
|||||||
self.selenium.find_element(
|
self.selenium.find_element(
|
||||||
By.ID, "id_relatedprepopulated_set-0-pubdate"
|
By.ID, "id_relatedprepopulated_set-0-pubdate"
|
||||||
).send_keys("2011-12-17")
|
).send_keys("2011-12-17")
|
||||||
|
status = self.selenium.find_element(
|
||||||
|
By.ID, "id_relatedprepopulated_set-0-status"
|
||||||
|
)
|
||||||
|
ActionChains(self.selenium).move_to_element(status).click(status).perform()
|
||||||
self.select_option("#id_relatedprepopulated_set-0-status", "option one")
|
self.select_option("#id_relatedprepopulated_set-0-status", "option one")
|
||||||
self.selenium.find_element(
|
self.selenium.find_element(
|
||||||
By.ID, "id_relatedprepopulated_set-0-name"
|
By.ID, "id_relatedprepopulated_set-0-name"
|
||||||
@ -5815,6 +5822,10 @@ class SeleniumTests(AdminSeleniumTestCase):
|
|||||||
self.selenium.find_element(
|
self.selenium.find_element(
|
||||||
By.ID, "id_relatedprepopulated_set-1-pubdate"
|
By.ID, "id_relatedprepopulated_set-1-pubdate"
|
||||||
).send_keys("1999-01-25")
|
).send_keys("1999-01-25")
|
||||||
|
status = self.selenium.find_element(
|
||||||
|
By.ID, "id_relatedprepopulated_set-1-status"
|
||||||
|
)
|
||||||
|
ActionChains(self.selenium).move_to_element(status).click(status).perform()
|
||||||
self.select_option("#id_relatedprepopulated_set-1-status", "option two")
|
self.select_option("#id_relatedprepopulated_set-1-status", "option two")
|
||||||
self.selenium.find_element(
|
self.selenium.find_element(
|
||||||
By.ID, "id_relatedprepopulated_set-1-name"
|
By.ID, "id_relatedprepopulated_set-1-name"
|
||||||
@ -5838,10 +5849,10 @@ class SeleniumTests(AdminSeleniumTestCase):
|
|||||||
|
|
||||||
# Tabular inlines ----------------------------------------------------
|
# Tabular inlines ----------------------------------------------------
|
||||||
# Initial inline
|
# Initial inline
|
||||||
element = self.selenium.find_element(
|
status = self.selenium.find_element(
|
||||||
By.ID, "id_relatedprepopulated_set-2-0-status"
|
By.ID, "id_relatedprepopulated_set-2-0-status"
|
||||||
)
|
)
|
||||||
self.selenium.execute_script("window.scrollTo(0, %s);" % element.location["y"])
|
ActionChains(self.selenium).move_to_element(status).click(status).perform()
|
||||||
self.selenium.find_element(
|
self.selenium.find_element(
|
||||||
By.ID, "id_relatedprepopulated_set-2-0-pubdate"
|
By.ID, "id_relatedprepopulated_set-2-0-pubdate"
|
||||||
).send_keys("1234-12-07")
|
).send_keys("1234-12-07")
|
||||||
@ -5872,6 +5883,10 @@ class SeleniumTests(AdminSeleniumTestCase):
|
|||||||
self.selenium.find_element(
|
self.selenium.find_element(
|
||||||
By.ID, "id_relatedprepopulated_set-2-1-pubdate"
|
By.ID, "id_relatedprepopulated_set-2-1-pubdate"
|
||||||
).send_keys("1981-08-22")
|
).send_keys("1981-08-22")
|
||||||
|
status = self.selenium.find_element(
|
||||||
|
By.ID, "id_relatedprepopulated_set-2-1-status"
|
||||||
|
)
|
||||||
|
ActionChains(self.selenium).move_to_element(status).click(status).perform()
|
||||||
self.select_option("#id_relatedprepopulated_set-2-1-status", "option one")
|
self.select_option("#id_relatedprepopulated_set-2-1-status", "option one")
|
||||||
self.selenium.find_element(
|
self.selenium.find_element(
|
||||||
By.ID, "id_relatedprepopulated_set-2-1-name"
|
By.ID, "id_relatedprepopulated_set-2-1-name"
|
||||||
@ -5898,6 +5913,8 @@ class SeleniumTests(AdminSeleniumTestCase):
|
|||||||
# Initial inline.
|
# Initial inline.
|
||||||
row_id = "id_relatedprepopulated_set-4-0-"
|
row_id = "id_relatedprepopulated_set-4-0-"
|
||||||
self.selenium.find_element(By.ID, f"{row_id}pubdate").send_keys("2011-12-12")
|
self.selenium.find_element(By.ID, f"{row_id}pubdate").send_keys("2011-12-12")
|
||||||
|
status = self.selenium.find_element(By.ID, f"{row_id}status")
|
||||||
|
ActionChains(self.selenium).move_to_element(status).click(status).perform()
|
||||||
self.select_option(f"#{row_id}status", "option one")
|
self.select_option(f"#{row_id}status", "option one")
|
||||||
self.selenium.find_element(By.ID, f"{row_id}name").send_keys(
|
self.selenium.find_element(By.ID, f"{row_id}name").send_keys(
|
||||||
" sŤāÇkeð inline ! "
|
" sŤāÇkeð inline ! "
|
||||||
@ -5917,6 +5934,8 @@ class SeleniumTests(AdminSeleniumTestCase):
|
|||||||
)[3].click()
|
)[3].click()
|
||||||
row_id = "id_relatedprepopulated_set-4-1-"
|
row_id = "id_relatedprepopulated_set-4-1-"
|
||||||
self.selenium.find_element(By.ID, f"{row_id}pubdate").send_keys("1999-01-20")
|
self.selenium.find_element(By.ID, f"{row_id}pubdate").send_keys("1999-01-20")
|
||||||
|
status = self.selenium.find_element(By.ID, f"{row_id}status")
|
||||||
|
ActionChains(self.selenium).move_to_element(status).click(status).perform()
|
||||||
self.select_option(f"#{row_id}status", "option two")
|
self.select_option(f"#{row_id}status", "option two")
|
||||||
self.selenium.find_element(By.ID, f"{row_id}name").send_keys(
|
self.selenium.find_element(By.ID, f"{row_id}name").send_keys(
|
||||||
" now you haVe anöther sŤāÇkeð inline with a very loooong "
|
" now you haVe anöther sŤāÇkeð inline with a very loooong "
|
||||||
|
Loading…
x
Reference in New Issue
Block a user