diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2010-10-31 19:29:29 -0400 |
---|---|---|
committer | Jeremy Kerr <jk@ozlabs.org> | 2011-04-14 17:21:04 +0800 |
commit | c2c6a408c7764fa29389ce160f52776c9308d50a (patch) | |
tree | 1c47388b5494210aeed87f56f0c8b6e9fbeb4633 /templates/patchwork | |
parent | 56e2243f3be7e859666ce0e4e1a8b8b94444f8d4 (diff) | |
download | patchwork-c2c6a408c7764fa29389ce160f52776c9308d50a.tar.bz2 patchwork-c2c6a408c7764fa29389ce160f52776c9308d50a.tar.xz |
registration: use EmailConfimation rather than separate registration app
Since we have infrastructure for email confirmations, we no longer need
the separate registration app.
Requires a migration script, which will delete all inactive users,
including those newly added and pending confirmation. Use carefully.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'templates/patchwork')
-rw-r--r-- | templates/patchwork/activation_email.txt | 11 | ||||
-rw-r--r-- | templates/patchwork/activation_email_subject.txt | 1 | ||||
-rw-r--r-- | templates/patchwork/help/about.html | 4 | ||||
-rw-r--r-- | templates/patchwork/login.html | 27 | ||||
-rw-r--r-- | templates/patchwork/logout.html | 8 | ||||
-rw-r--r-- | templates/patchwork/registration-confirm.html | 13 | ||||
-rw-r--r-- | templates/patchwork/registration_form.html | 121 |
7 files changed, 181 insertions, 4 deletions
diff --git a/templates/patchwork/activation_email.txt b/templates/patchwork/activation_email.txt new file mode 100644 index 0000000..e918e5f --- /dev/null +++ b/templates/patchwork/activation_email.txt @@ -0,0 +1,11 @@ +Hi, + +This email is to confirm your account on the patchwork patch-tracking +system. You can activate your account by visiting the url: + + http://{{site.domain}}{% url patchwork.views.confirm key=confirmation.key %} + +If you didn't request a user account on patchwork, then you can ignore +this mail. + +Happy patchworking. diff --git a/templates/patchwork/activation_email_subject.txt b/templates/patchwork/activation_email_subject.txt new file mode 100644 index 0000000..c409f38 --- /dev/null +++ b/templates/patchwork/activation_email_subject.txt @@ -0,0 +1 @@ +Patchwork account confirmation diff --git a/templates/patchwork/help/about.html b/templates/patchwork/help/about.html index edc381e..0d784d7 100644 --- a/templates/patchwork/help/about.html +++ b/templates/patchwork/help/about.html @@ -11,10 +11,6 @@ <p>Patchwork is built on the <a href="http://djangoproject.com/">django</a> web framework.</p> -<p>Patchwork includes the <a -href="http://code.google.com/p/django-registration/">django-registration</a> -application.</p> - <p>Icons from the <a href="http://sweetie.sublink.ca/">Sweetie</a> icon set.</a> {% endblock %} diff --git a/templates/patchwork/login.html b/templates/patchwork/login.html new file mode 100644 index 0000000..2dfc2a7 --- /dev/null +++ b/templates/patchwork/login.html @@ -0,0 +1,27 @@ +{% extends "base.html" %} + +{% block title %}Login{% endblock %} +{% block heading %}Login{% endblock %} + + +{% block body %} +<form method="post"> +{% csrf_token %} +<table class="form loginform"> + <tr> + <th colspan="2" class="headerrow">login</th> + </tr> + {% if error %} + <tr> + <td colspan="2">{{ error }}</td> + </tr> + {% endif %} + {{ form }} + <tr> + <td colspan="2" class="submitrow"> + <input type="submit" value="Login"/> + </td> + </tr> +</table> +</form> +{% endblock %} diff --git a/templates/patchwork/logout.html b/templates/patchwork/logout.html new file mode 100644 index 0000000..f030aee --- /dev/null +++ b/templates/patchwork/logout.html @@ -0,0 +1,8 @@ +{% extends "base.html" %} + +{% block title %}Logout{% endblock %} +{% block heading %}Logout{% endblock %} + +{% block body %} +<p>Logged out</p> +{% endblock %} diff --git a/templates/patchwork/registration-confirm.html b/templates/patchwork/registration-confirm.html new file mode 100644 index 0000000..f0cc39f --- /dev/null +++ b/templates/patchwork/registration-confirm.html @@ -0,0 +1,13 @@ +{% extends "base.html" %} + +{% block title %}Registration{% endblock %} +{% block heading %}Registration{% endblock %} + +{% block body %} +<p>Registraton confirmed!</p> + +<p>Your patchwork registration is complete. Head over to your <a + href="{% url patchwork.views.user.profile %}">profile</a> to start using +patchwork's extra features.</p> + +{% endblock %} diff --git a/templates/patchwork/registration_form.html b/templates/patchwork/registration_form.html new file mode 100644 index 0000000..3a314b8 --- /dev/null +++ b/templates/patchwork/registration_form.html @@ -0,0 +1,121 @@ +{% extends "base.html" %} + +{% block title %}Registration{% endblock %} +{% block heading %}Registration{% endblock %} + + +{% block body %} + +{% if confirmation and not error %} + <p>Registration successful!</p> + <p>A confirmation email has been sent to {{ confirmation.email }}. You'll + need to visit the link provided in that email to confirm your + registration.</p> +</p> +{% else %} +<p>By creating a patchwork account, you can:<p> +<ul> + <li>create "bundles" of patches</li> + <li>update the state of your own patches</li> +</ul> +<form method="post"> +{% csrf_token %} +<table class="form registerform"> + <tr> + <th colspan="2" class="headerrow">register</th> + </tr> + {% if error %} + <tr> + <td colspan="2">{{ error }}</td> + </tr> + {% endif %} + + <tr> + <td>{{ form.first_name.label_tag }}</td> + <td> +{% if form.first_name.errors %} + {{ form.first_name.errors }} +{% endif %} + {{ form.first_name }} +{% if form.first_name.help_text %} + <div class="help_text"/>{{ form.first_name.help_text }}</div> +{% endif %} + </td> + </tr> + + <tr> + <td>{{ form.last_name.label_tag }}</td> + <td> +{% if form.last_name.errors %} + {{ form.last_name.errors }} +{% endif %} + {{ form.last_name }} +{% if form.last_name.help_text %} + <div class="help_text"/>{{ form.last_name.help_text }}</div> +{% endif %} + </td> + </tr> + + <tr> + <td></td> + <td class="form-help"> + Your name is used to identify you on the site + </td> + </tr> + + <tr> + <td>{{ form.email.label_tag }}</td> + <td> +{% if form.email.errors %} + {{ form.email.errors }} +{% endif %} + {{ form.email }} +{% if form.email.help_text %} + <div class="help_text"/>{{ form.email.help_text }}</div> +{% endif %} + </td> + </tr> + + <tr> + <td></td> + <td class="form-help"> + Patchwork will send a confirmation email to this address + </td> + </tr> + + <tr> + <td>{{ form.username.label_tag }}</td> + <td> +{% if form.username.errors %} + {{ form.username.errors }} +{% endif %} + {{ form.username }} +{% if form.username.help_text %} + <div class="help_text"/>{{ form.username.help_text }}</div> +{% endif %} + </td> + </tr> + + <tr> + <td>{{ form.password.label_tag }}</td> + <td> +{% if form.password.errors %} + {{ form.password.errors }} +{% endif %} + {{ form.password }} +{% if form.password.help_text %} + <div class="help_text"/>{{ form.password.help_text }}</div> +{% endif %} + </td> + </tr> + + <tr> + <td colspan="2" class="submitrow"> + <input type="submit" value="Register"/> + </td> + </tr> +</table> +</form> +{% endif %} + +{% endblock %} |