summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorpriyank.panchal <priyankpanchal872000@gmail.com>2023-06-25 23:46:06 +0530
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2023-07-14 12:05:30 +0200
commit0016a4299569a8f09ff24053ff2b8224f7fa4113 (patch)
tree36b0c7baa1b2a0162b9b6c8fc9825ecd708218ac /django
parent1d0dfc0b920916900d2770f3b5640da08af36d97 (diff)
Fixed #34677 -- Made admin password reset templates more consistent.
Diffstat (limited to 'django')
-rw-r--r--django/contrib/admin/templates/registration/password_reset_confirm.html14
-rw-r--r--django/contrib/admin/templates/registration/password_reset_form.html10
2 files changed, 17 insertions, 7 deletions
diff --git a/django/contrib/admin/templates/registration/password_reset_confirm.html b/django/contrib/admin/templates/registration/password_reset_confirm.html
index c93f9c4692..a07645c97a 100644
--- a/django/contrib/admin/templates/registration/password_reset_confirm.html
+++ b/django/contrib/admin/templates/registration/password_reset_confirm.html
@@ -16,20 +16,26 @@
<p>{% translate "Please enter your new password twice so we can verify you typed it in correctly." %}</p>
<form method="post">{% csrf_token %}
-<fieldset class="module aligned">
+ <fieldset class="module aligned">
<input class="hidden" autocomplete="username" value="{{ form.user.get_username }}">
<div class="form-row field-password1">
- {{ form.new_password1.errors }}
+ {{ form.new_password1.errors }}
+ <div class="flex-container">
<label for="id_new_password1">{% translate 'New password:' %}</label>
{{ form.new_password1 }}
+ </div>
</div>
<div class="form-row field-password2">
- {{ form.new_password2.errors }}
+ {{ form.new_password2.errors }}
+ <div class="flex-container">
<label for="id_new_password2">{% translate 'Confirm password:' %}</label>
{{ form.new_password2 }}
+ </div>
</div>
+ </fieldset>
+ <div class="submit-row">
<input type="submit" value="{% translate 'Change my password' %}">
-</fieldset>
+ </div>
</form>
{% else %}
diff --git a/django/contrib/admin/templates/registration/password_reset_form.html b/django/contrib/admin/templates/registration/password_reset_form.html
index 380441501e..0edfea8ec2 100644
--- a/django/contrib/admin/templates/registration/password_reset_form.html
+++ b/django/contrib/admin/templates/registration/password_reset_form.html
@@ -14,14 +14,18 @@
<p>{% translate 'Forgotten your password? Enter your email address below, and we’ll email instructions for setting a new one.' %}</p>
<form method="post">{% csrf_token %}
-<fieldset class="module aligned">
+ <fieldset class="module aligned">
<div class="form-row field-email">
- {{ form.email.errors }}
+ {{ form.email.errors }}
+ <div class="flex-container">
<label for="id_email">{% translate 'Email address:' %}</label>
{{ form.email }}
+ </div>
</div>
+ </fieldset>
+ <div class="submit-row">
<input type="submit" value="{% translate 'Reset my password' %}">
-</fieldset>
+ </div>
</form>
{% endblock %}