diff options
| author | Jon Dufresne <jon.dufresne@gmail.com> | 2020-09-10 02:53:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-10 11:53:09 +0200 |
| commit | 53c0d16ac1d45ddc973fdffb6a6ee95c55a6fb3d (patch) | |
| tree | 9c0ffc44b7d17993b403844630406fe735c81744 /django | |
| parent | 1db8d8e3a9264eb38e8d0e0d515f598db7520ce6 (diff) | |
Fixed #31992 -- Made admin password reset templates use title/content_title blocks from the base template.
Diffstat (limited to 'django')
6 files changed, 0 insertions, 14 deletions
diff --git a/django/contrib/admin/templates/registration/password_change_done.html b/django/contrib/admin/templates/registration/password_change_done.html index 9cc85f8361..e1bb982aba 100644 --- a/django/contrib/admin/templates/registration/password_change_done.html +++ b/django/contrib/admin/templates/registration/password_change_done.html @@ -8,8 +8,6 @@ </div> {% endblock %} -{% block title %}{{ title }}{% endblock %} -{% block content_title %}<h1>{{ title }}</h1>{% endblock %} {% block content %} <p>{% translate 'Your password was changed.' %}</p> {% endblock %} diff --git a/django/contrib/admin/templates/registration/password_change_form.html b/django/contrib/admin/templates/registration/password_change_form.html index d3a9bf305d..95c84f922d 100644 --- a/django/contrib/admin/templates/registration/password_change_form.html +++ b/django/contrib/admin/templates/registration/password_change_form.html @@ -9,9 +9,6 @@ </div> {% endblock %} -{% block title %}{{ title }}{% endblock %} -{% block content_title %}<h1>{{ title }}</h1>{% endblock %} - {% block content %}<div id="content-main"> <form method="post">{% csrf_token %} diff --git a/django/contrib/admin/templates/registration/password_reset_complete.html b/django/contrib/admin/templates/registration/password_reset_complete.html index 396f339841..e6a383fcfe 100644 --- a/django/contrib/admin/templates/registration/password_reset_complete.html +++ b/django/contrib/admin/templates/registration/password_reset_complete.html @@ -8,9 +8,6 @@ </div> {% endblock %} -{% block title %}{{ title }}{% endblock %} -{% block content_title %}<h1>{{ title }}</h1>{% endblock %} - {% block content %} <p>{% translate "Your password has been set. You may go ahead and log in now." %}</p> diff --git a/django/contrib/admin/templates/registration/password_reset_confirm.html b/django/contrib/admin/templates/registration/password_reset_confirm.html index 7de22336cf..e587c6498c 100644 --- a/django/contrib/admin/templates/registration/password_reset_confirm.html +++ b/django/contrib/admin/templates/registration/password_reset_confirm.html @@ -9,8 +9,6 @@ </div> {% endblock %} -{% block title %}{{ title }}{% endblock %} -{% block content_title %}<h1>{{ title }}</h1>{% endblock %} {% block content %} {% if validlink %} diff --git a/django/contrib/admin/templates/registration/password_reset_done.html b/django/contrib/admin/templates/registration/password_reset_done.html index 1f6e83aaaf..8b1971a76e 100644 --- a/django/contrib/admin/templates/registration/password_reset_done.html +++ b/django/contrib/admin/templates/registration/password_reset_done.html @@ -8,8 +8,6 @@ </div> {% endblock %} -{% block title %}{{ title }}{% endblock %} -{% block content_title %}<h1>{{ title }}</h1>{% endblock %} {% block content %} <p>{% translate 'We’ve emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly.' %}</p> diff --git a/django/contrib/admin/templates/registration/password_reset_form.html b/django/contrib/admin/templates/registration/password_reset_form.html index d5493d9d61..33785f7c14 100644 --- a/django/contrib/admin/templates/registration/password_reset_form.html +++ b/django/contrib/admin/templates/registration/password_reset_form.html @@ -9,8 +9,6 @@ </div> {% endblock %} -{% block title %}{{ title }}{% endblock %} -{% block content_title %}<h1>{{ title }}</h1>{% endblock %} {% block content %} <p>{% translate 'Forgotten your password? Enter your email address below, and we’ll email instructions for setting a new one.' %}</p> |