minor login template cleanup

This commit is contained in:
elnappo 2014-10-28 17:14:43 +01:00
parent b617396f2a
commit c943728d00
4 changed files with 14 additions and 24 deletions

View File

@ -1,6 +1,7 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load i18n %}{% load bootstrap %} {% load i18n %}{% load bootstrap %}
{% block title %}{% trans "Log out" %}{% endblock %} {% block title %}{% trans "Log out" %}{% endblock %}
{% block content %} {% block content %}
<div class="container"> <div class="container">
<div class="form-signin"> <div class="form-signin">

View File

@ -4,8 +4,6 @@
{% block content %} {% block content %}
<h2>{% trans 'Password reset complete' %}</h2> <h2>{% trans 'Password reset complete' %}</h2>
<p>{% trans "Your password has been set. You may go ahead and log in now." %}</p> <p>{% trans "Your password has been set. You may go ahead and log in now." %}</p>
<p><a href="{{ login_url }}"><button class="btn btn-primary" type="button">{% trans "Log in" %}</button></a></p> <p><a href="{{ login_url }}"><button class="btn btn-primary" type="button">{% trans "Log in" %}</button></a></p>
{% endblock %} {% endblock %}

View File

@ -4,28 +4,21 @@
{% block content %} {% block content %}
{% if validlink %} {% if validlink %}
<h2>{% trans 'Enter new password' %}</h2>
<h2>{% trans 'Enter new password' %}</h2> <p>{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}</p>
<form class="form-horizontal" role="form" method="post">
<p>{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}</p> {% csrf_token %}
{{ form|bootstrap_horizontal }}
<form class="form-horizontal" role="form" method="post"> <div class="form-group">
{% csrf_token %} <div class="col-sm-offset-2 col-sm-10">
{{ form|bootstrap_horizontal }} <input type="submit" class="btn btn-primary" value="{% trans 'Change my password' %}" />
<div class="form-group"> </div>
<div class="col-sm-offset-2 col-sm-10">
<input type="submit" class="btn btn-primary" value="{% trans 'Change my password' %}" />
</div> </div>
</div> </form>
</form>
<script type="text/javascript">document.getElementById("id_new_password1").focus();</script>
<script type="text/javascript">document.getElementById("id_new_password1").focus();</script>
{% else %} {% else %}
<h2>{% trans 'Password reset unsuccessful' %}</h2>
<h2>{% trans 'Password reset unsuccessful' %}</h2> <p>{% trans "The password reset link was invalid, possibly because it has already been used. Please request a new password reset." %}</p>
<p>{% trans "The password reset link was invalid, possibly because it has already been used. Please request a new password reset." %}</p>
{% endif %} {% endif %}
{% endblock %} {% endblock %}

View File

@ -4,8 +4,6 @@
{% block content %} {% block content %}
<h2>{% trans 'Password reset successful' %}</h2> <h2>{% trans 'Password reset successful' %}</h2>
<p>{% trans "We've emailed you instructions for setting your password. You should be receiving them shortly." %}</p> <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> <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>
{% endblock %} {% endblock %}