Commit e07e4030 authored by Serge G. Spaolonzi's avatar Serge G. Spaolonzi Committed by Tim Graham
Browse files

Fixed #18511 -- Cleaned up admin password reset template titles.

parent 8676318d
Loading
Loading
Loading
Loading
+2 −6
Original line number Diff line number Diff line
@@ -8,12 +8,8 @@
</div>
{% endblock %}

{% block title %}{% trans 'Password change successful' %}{% endblock %}

{% block title %}{{ title }}{% endblock %}
{% block content_title %}<h1>{{ title }}</h1>{% endblock %}
{% block content %}

<h1>{% trans 'Password change successful' %}</h1>

<p>{% trans 'Your password was changed.' %}</p>

{% endblock %}
+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@
</div>
{% endblock %}

{% block title %}{% trans 'Password change' %}{% endblock %}
{% block title %}{{ title }}{% endblock %}
{% block content_title %}<h1>{{ title }}</h1>{% endblock %}

{% block content %}<div id="content-main">

@@ -21,7 +22,6 @@
    </p>
{% endif %}

<h1>{% trans 'Password change' %}</h1>

<p>{% trans "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." %}</p>

+2 −3
Original line number Diff line number Diff line
@@ -8,12 +8,11 @@
</div>
{% endblock %}

{% block title %}{% trans 'Password reset complete' %}{% endblock %}
{% block title %}{{ title }}{% endblock %}
{% block content_title %}<h1>{{ title }}</h1>{% endblock %}

{% block content %}

<h1>{% trans 'Password reset complete' %}</h1>

<p>{% trans "Your password has been set.  You may go ahead and log in now." %}</p>

<p><a href="{{ login_url }}">{% trans 'Log in' %}</a></p>
+2 −6
Original line number Diff line number Diff line
@@ -8,14 +8,12 @@
</div>
{% endblock %}

{% block title %}{% trans 'Password reset' %}{% endblock %}

{% block title %}{{ title }}{% endblock %}
{% block content_title %}<h1>{{ title }}</h1>{% endblock %}
{% block content %}

{% if validlink %}

<h1>{% trans 'Enter new password' %}</h1>

<p>{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}</p>

<form action="" method="post">{% csrf_token %}
@@ -28,8 +26,6 @@

{% else %}

<h1>{% trans 'Password reset unsuccessful' %}</h1>

<p>{% trans "The password reset link was invalid, possibly because it has already been used.  Please request a new password reset." %}</p>

{% endif %}
+2 −4
Original line number Diff line number Diff line
@@ -8,12 +8,10 @@
</div>
{% endblock %}

{% block title %}{% trans 'Password reset successful' %}{% endblock %}

{% block title %}{{ title }}{% endblock %}
{% block content_title %}<h1>{{ title }}</h1>{% endblock %}
{% block content %}

<h1>{% trans 'Password reset successful' %}</h1>

<p>{% trans "We've emailed you instructions for setting your password. You should be receiving them shortly." %}</p>

<p>{% trans "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder." %}</p>
Loading