From c2c6a408c7764fa29389ce160f52776c9308d50a Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Sun, 31 Oct 2010 19:29:29 -0400 Subject: 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 --- templates/patchwork/activation_email.txt | 11 +++ templates/patchwork/activation_email_subject.txt | 1 + templates/patchwork/help/about.html | 4 - templates/patchwork/login.html | 27 +++++ templates/patchwork/logout.html | 8 ++ templates/patchwork/registration-confirm.html | 13 +++ templates/patchwork/registration_form.html | 121 +++++++++++++++++++++++ 7 files changed, 181 insertions(+), 4 deletions(-) create mode 100644 templates/patchwork/activation_email.txt create mode 100644 templates/patchwork/activation_email_subject.txt create mode 100644 templates/patchwork/login.html create mode 100644 templates/patchwork/logout.html create mode 100644 templates/patchwork/registration-confirm.html create mode 100644 templates/patchwork/registration_form.html (limited to 'templates/patchwork') 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 @@

Patchwork is built on the django web framework.

-

Patchwork includes the django-registration -application.

-

Icons from the Sweetie icon set. {% 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 %} +

+{% csrf_token %} + + + + + {% if error %} + + + + {% endif %} + {{ form }} + + + +
login
{{ error }}
+ +
+
+{% 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 %} +

Logged out

+{% 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 %} +

Registraton confirmed!

+ +

Your patchwork registration is complete. Head over to your profile to start using +patchwork's extra features.

+ +{% 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 %} +

Registration successful!

+

A confirmation email has been sent to {{ confirmation.email }}. You'll + need to visit the link provided in that email to confirm your + registration.

+

+{% else %} +

By creating a patchwork account, you can:

+

+
+{% csrf_token %} + + + + + {% if error %} + + + + {% endif %} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
register
{{ error }}
{{ form.first_name.label_tag }} +{% if form.first_name.errors %} + {{ form.first_name.errors }} +{% endif %} + {{ form.first_name }} +{% if form.first_name.help_text %} +
{{ form.first_name.help_text }}
+{% endif %} +
{{ form.last_name.label_tag }} +{% if form.last_name.errors %} + {{ form.last_name.errors }} +{% endif %} + {{ form.last_name }} +{% if form.last_name.help_text %} +
{{ form.last_name.help_text }}
+{% endif %} +
+ Your name is used to identify you on the site +
{{ form.email.label_tag }} +{% if form.email.errors %} + {{ form.email.errors }} +{% endif %} + {{ form.email }} +{% if form.email.help_text %} +
{{ form.email.help_text }}
+{% endif %} +
+ Patchwork will send a confirmation email to this address +
{{ form.username.label_tag }} +{% if form.username.errors %} + {{ form.username.errors }} +{% endif %} + {{ form.username }} +{% if form.username.help_text %} +
{{ form.username.help_text }}
+{% endif %} +
{{ form.password.label_tag }} +{% if form.password.errors %} + {{ form.password.errors }} +{% endif %} + {{ form.password }} +{% if form.password.help_text %} +
{{ form.password.help_text }}
+{% endif %} +
+ +
+
+{% endif %} + +{% endblock %} -- cgit v1.2.3