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 %}
+
+{% 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:
+
+ - create "bundles" of patches
+ - update the state of your own patches
+
+
+{% endif %}
+
+{% endblock %}
--
cgit v1.2.3