Initial work on re-themeing auth with Bootstrap CSS

This commit is contained in:
2011-10-27 14:25:25 +01:00
parent d5a291b520
commit 9a26bfd235
14 changed files with 427 additions and 247 deletions

View File

@@ -1,7 +1,12 @@
{% extends "registration/registration_base.html" %}
{% block title %}{% if account %}Activation complete{% else %}Activation problem{% endif %}{% endblock %}
{% block content %}
{% if account %}
<div class="page-header">
<h1>Account Activation</h1>
</div>
<p>Thanks {{ account }}, activation complete! You may now <a href='{% url auth_login %}'>login</a> using the username and password you set at registration.</p>
{% else %}
<p>Oops &ndash; it seems that your activation key is invalid. Please check the url again.</p>

View File

@@ -3,25 +3,40 @@
{% block content %}
{% if form.errors %}
<p>Your username and password didn't match. Please try again.</p>
<div class="alert-message fade in error" data-alert="alert">
<a class="close" href="#">x</a>
<p>Your username or password was incorrect, please try again.</p>
</div>
{% endif %}
<form method="post" action="{% url django.contrib.auth.views.login %}">
<table>
<tr>
<td>{{ form.username.label_tag }}</td>
<td>{{ form.username }}</td>
</tr>
<tr>
<td>{{ form.password.label_tag }}</td>
<td>{{ form.password }}</td>
</tr>
</table>
<p><a href="{% url auth_password_reset %}">Forgot</a> your password? <a href="{% url registration_register %}">Need an account</a>?</p>
<fieldset>
<legend>Login</legend>
<div class="clearfix">
{{ form.username.label_tag }}
<div class="input">
<td>{{ form.username }}</td>
</div>
</div>
<div class="clearfix">
{{ form.password.label_tag }}
<div class="input">
<td>{{ form.password }}</td>
</div>
</div>
<input type="submit" value="login" />
<input type="hidden" name="next" value="{{ next }}" />
{% csrf_token %}
<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>
<input type="hidden" name="next" value="{{ next }}" />
{% csrf_token %}
</fieldset>
</form>
{% endblock %}

View File

@@ -1,5 +1,8 @@
{% extends "registration/registration_base.html" %}
{% block title %}Logged out{% endblock %}
{% block HeadTag %}
<meta http-equiv="refresh" content="3; url=/">
{% endblock %}
{% block content %}
<p>Successfully logged out!</p>
{% endblock %}

View File

@@ -1,15 +1,22 @@
{% extends "registration/registration_base.html" %}
{% block title %}Register for an account{% endblock %}
{% block content %}
<h3>Registration</h3>
<div class="page-header">
<h1>Registration</h1>
</div>
<p>Please complete this form to register for a new Auth account, please be aware that you are required to confirm your email account so please use a valid address.</p>
<h3>Problematic Providers</h3>
<h2>Problematic Providers</h2>
<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" />
<table>
{{ form }}
</table>
{% csrf_token %}
<input type="submit" value="Send activation email" class="btn primary"/>
</form>
{% endblock %}