Final cleanup, formset was actually supposed to be fieldset.

This commit is contained in:
2011-12-04 19:23:25 +00:00
parent 8ad4634fe7
commit e2223f6702
21 changed files with 97 additions and 92 deletions

View File

@@ -1,6 +1,9 @@
{% extends "registration/registration_base.html" %}
{% block title %}Activation complete{% endblock %}
{% block content %}
<div class="page-header">
<h1>Activation Complete</h1>
</div>
<p>Thanks, activation complete! You may now <a href='{% url auth_login %}'>login</a> using the username and password you set at registration.</p>
{% endblock %}

View File

@@ -15,30 +15,20 @@
<form method="post" action="{% url django.contrib.auth.views.login %}">
<fieldset>
<div class="clearfix">
{{ form.username.label_tag }}
<div class="input">
{{ form.username }}
</div>
</div>
<div class="clearfix">
{{ form.password.label_tag }}
<div class="input">
{{ form.password }}
</div>
</div>
{% include "formtools/formfield.html" with field=form.username %}
{% include "formtools/formfield.html" with field=form.password %}
<div class="row">
<div class="span10">
<a href="{% url auth_password_reset %}" class="btn">Forgotten Password</a>
<a href="{% url registration_register %}" class="btn success">Create Account</a>
</div>
<div class="span6">
<input type="submit" value="Login" class="btn primary pull-right"/>
</div>
<div class="row">
<div class="span10">
<a href="{% url auth_password_reset %}" class="btn">Forgotten Password</a>
<a href="{% url registration_register %}" class="btn success">Create Account</a>
</div>
<input type="hidden" name="next" value="{{ next }}" />
{% csrf_token %}
<div class="span6">
<input type="submit" value="Login" class="btn primary pull-right"/>
</div>
</div>
<input type="hidden" name="next" value="{{ next }}" />
{% csrf_token %}
</fieldset>
</form>

View File

@@ -1,11 +1,17 @@
{% extends "registration/registration_base.html" %}
{% block title %}Change password{% endblock %}
{% block content %}
<div class="page-header">
<h1>Change Password</h1>
</div>
<form method='post' action=''>
<table>
{{ form }}
</table>
<input type='submit' value="Change password" />
{% csrf_token %}
<fieldset>
{% include "formtools/formfield.html" with field=form.old_password %}
{% include "formtools/formfield.html" with field=form.new_password1 %}
{% include "formtools/formfield.html" with field=form.new_password2 %}
{% csrf_token %}
<input type='submit' value="Change password" class="btn primary"/>
</fieldset>
</form>
{% endblock %}

View File

@@ -1,5 +1,8 @@
{% extends "registration/registration_base.html" %}
{% block title %}Password reset complete{% endblock %}
{% block content %}
<div class="page-header">
<h1>Password Reset Complete</h1>
</div>
<p>Your password has been reset! You may now <a href="{{ login_url }}">log in</a>.</p>
{% endblock %}

View File

@@ -1,8 +1,8 @@
{% extends "registration/registration_base.html" %}
{% block title %}Password reset{% endblock %}
{% block content %}
<p>
We have sent you an email with a link to reset your password. Please check
your email and click the link to continue.
</p>
<div class="page-header">
<h1>Password Reset</h1>
</div>
<p>We have sent you an email with a link to reset your password. Please check your email and click the link to continue.</p>
{% endblock %}

View File

@@ -1,13 +1,15 @@
{% extends "registration/registration_base.html" %}
{% block title %}Reset password{% endblock %}
{% block title %}Forgotten password{% endblock %}
{% block content %}
<p>Forgot your password? Enter your email in the form below and we'll send you
instructions for creating a new one.</p>
<div class="page-header">
<h1>Forgotten Password</h1>
</div>
<p>Forgot your password? Enter your email in the form below and we'll send you instructions for creating a new one.</p>
<form method='post' action=''>
<table>
{{ form }}
</table>
<input type='submit' value="Reset password" />
{% csrf_token %}
<fieldset>
{% include "formtools/formfield.html" with field=form.email %}
{% csrf_token %}
<input type='submit' value="Reset password" class="btn primary"/>
</fieldset>
</form>
{% endblock %}

View File

@@ -13,10 +13,13 @@
<p>In addition, some providers maybe blocked form auth due to their draconian spam detection routines, which has flagged this server numerous times for no reason. These include AT&T services, Cox, and a few other mainland US ISPs. If you have a Google Mail account please consider using that instead of your ISP email account.</p>
<form method='post' action=''>
<table>
{{ form }}
</table>
{% csrf_token %}
<input type="submit" value="Send activation email" class="btn primary"/>
<fieldset>
{% include "formtools/formfield.html" with field=form.username %}
{% include "formtools/formfield.html" with field=form.email %}
{% include "formtools/formfield.html" with field=form.password1 %}
{% include "formtools/formfield.html" with field=form.password2 %}
{% csrf_token %}
<input type="submit" value="Send activation email" class="btn primary"/>
</fieldset>
</form>
{% endblock %}