Use django-registration infrastructure

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

20 files changed, 46 insertions, 21 deletions

diff --git a/templates/patchwork/base.html b/templates/base.html
index 233ce97..df668aa 100644
--- a/templates/patchwork/base.html
+++ b/templates/base.html
@@ -24,12 +24,12 @@
      <a href="{% url patchwork.views.user.profile %}">profile</a> ::
      <a href="{% url patchwork.views.user.todo_lists %}">todo
       ({{ user.get_profile.n_todo_patches }})</a><br/>
-     <a href="{% url patchwork.views.user.logout %}">logout</a><!-- ::
+     <a href="{% url auth_logout %}">logout</a><!-- ::
      <a href="/help/">help</a> -->
 {% else %}
-     <a href="{% url patchwork.views.user.login %}">login</a>
+     <a href="{% url auth_login %}">login</a>
      <br/>
-     <a href="{% url patchwork.views.user.register %}">register</a>
+     <a href="{% url registration_register %}">register</a>
      <!--
      <br/>
      <a href="/help/">help</a>
diff --git a/templates/patchwork/bundle-public.html b/templates/patchwork/bundle-public.html
index 0ee57da..3590c46 100644
--- a/templates/patchwork/bundle-public.html
+++ b/templates/patchwork/bundle-public.html
@@ -1,4 +1,4 @@
-{% extends "patchwork/base.html" %}
+{% extends "base.html" %}
 
 {% load person %}
 
diff --git a/templates/patchwork/bundle.html b/templates/patchwork/bundle.html
index 8fa694a..68bf570 100644
--- a/templates/patchwork/bundle.html
+++ b/templates/patchwork/bundle.html
@@ -1,4 +1,4 @@
-{% extends "patchwork/base.html" %}
+{% extends "base.html" %}
 
 {% load person %}
 
diff --git a/templates/patchwork/list.html b/templates/patchwork/list.html
index 755c047..8054063 100644
--- a/templates/patchwork/list.html
+++ b/templates/patchwork/list.html
@@ -1,4 +1,4 @@
-{% extends "patchwork/base.html" %}
+{% extends "base.html" %}
 
 {% load person %}
 
diff --git a/templates/patchwork/patch.html b/templates/patchwork/patch.html
index b793f39..2382978 100644
--- a/templates/patchwork/patch.html
+++ b/templates/patchwork/patch.html
@@ -1,4 +1,4 @@
-{% extends "patchwork/base.html" %}
+{% extends "base.html" %}
 
 {% load syntax %}
 {% load person %}
diff --git a/templates/patchwork/profile.html b/templates/patchwork/profile.html
index 35f3d4f..81005a3 100644
--- a/templates/patchwork/profile.html
+++ b/templates/patchwork/profile.html
@@ -1,4 +1,4 @@
-{% extends "patchwork/base.html" %}
+{% extends "base.html" %}
 
 {% block title %}User Profile: {{ user.username }}{% endblock %}
 {% block heading %}User Profile: {{ user.username }}{% endblock %}
diff --git a/templates/patchwork/project.html b/templates/patchwork/project.html
index 4ea1009..f29540c 100644
--- a/templates/patchwork/project.html
+++ b/templates/patchwork/project.html
@@ -1,4 +1,4 @@
-{% extends "patchwork/base.html" %}
+{% extends "base.html" %}
 
 {% block title %}{{ project.name }}{% endblock %}
 {% block heading %}{{ project.name }}{% endblock %}
diff --git a/templates/patchwork/projects.html b/templates/patchwork/projects.html
index 349f314..aa6df82 100644
--- a/templates/patchwork/projects.html
+++ b/templates/patchwork/projects.html
@@ -1,4 +1,4 @@
-{% extends "patchwork/base.html" %}
+{% extends "base.html" %}
 
 {% block title %}Project List{% endblock %}
 {% block heading %}Project List{% endblock %}
diff --git a/templates/patchwork/register.mail b/templates/patchwork/register.mail
index 86dcd14..9bb5232 100644
--- a/templates/patchwork/register.mail
+++ b/templates/patchwork/register.mail
@@ -3,7 +3,7 @@ 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.user.register_confirm key=request.key %}
+ http://{{site.domain}}{% url registration_activateactivation_key=request.key %}
 
 If you didn't request a user account on patchwork, then you can ignore
 this mail.
diff --git a/templates/patchwork/todo-list.html b/templates/patchwork/todo-list.html
index 8a5ab7a..b301901 100644
--- a/templates/patchwork/todo-list.html
+++ b/templates/patchwork/todo-list.html
@@ -1,4 +1,4 @@
-{% extends "patchwork/base.html" %}
+{% extends "base.html" %}
 
 {% load person %}
 
diff --git a/templates/patchwork/todo-lists.html b/templates/patchwork/todo-lists.html
index 8eb10cc..47dbf03 100644
--- a/templates/patchwork/todo-lists.html
+++ b/templates/patchwork/todo-lists.html
@@ -1,4 +1,4 @@
-{% extends "patchwork/base.html" %}
+{% extends "base.html" %}
 
 {% block title %}{{ user }}'s todo lists{% endblock %}
 {% block heading %}{{ user }}'s todo lists{% endblock %}
diff --git a/templates/patchwork/user-link-confirm.html b/templates/patchwork/user-link-confirm.html
index 61979cf..3e7b6ed 100644
--- a/templates/patchwork/user-link-confirm.html
+++ b/templates/patchwork/user-link-confirm.html
@@ -1,4 +1,4 @@
-{% extends "patchwork/base.html" %}
+{% extends "base.html" %}
 
 {% block title %}{{ user.username }}{% endblock %}
 {% block heading %}link accounts for {{ user.username }}{% endblock %}
diff --git a/templates/patchwork/user-link.html b/templates/patchwork/user-link.html
index dfad341..2ed193e 100644
--- a/templates/patchwork/user-link.html
+++ b/templates/patchwork/user-link.html
@@ -1,4 +1,4 @@
-{% extends "patchwork/base.html" %}
+{% extends "base.html" %}
 
 {% block title %}{{ user.username }}{% endblock %}
 {% block heading %}link accounts for {{ user.username }}{% endblock %}
diff --git a/templates/patchwork/register-confirm.html b/templates/registration/activate.html
index 2af5744..f0cc39f 100644
--- a/templates/patchwork/register-confirm.html
+++ b/templates/registration/activate.html
@@ -1,4 +1,4 @@
-{% extends "patchwork/base.html" %}
+{% extends "base.html" %}
 
 {% block title %}Registration{% endblock %}
 {% block heading %}Registration{% endblock %}
diff --git a/templates/registration/activation_email.txt b/templates/registration/activation_email.txt
new file mode 100644
index 0000000..6b1477d
--- /dev/null
+++ b/templates/registration/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 registration_activate activation_key=activation_key %}
+
+If you didn't request a user account on patchwork, then you can ignore
+this mail.
+
+Happy patchworking.
diff --git a/templates/registration/activation_email_subject.txt b/templates/registration/activation_email_subject.txt
new file mode 100644
index 0000000..c409f38
--- /dev/null
+++ b/templates/registration/activation_email_subject.txt
@@ -0,0 +1 @@
+Patchwork account confirmation
diff --git a/templates/patchwork/login.html b/templates/registration/login.html
index 4706dda..d01d055 100644
--- a/templates/patchwork/login.html
+++ b/templates/registration/login.html
@@ -1,4 +1,4 @@
-{% extends "patchwork/base.html" %}
+{% extends "base.html" %}
 
 {% block title %}Patchwork Login{% endblock %}
 {% block heading %}Patchwork Login{% endblock %}
diff --git a/templates/patchwork/logout.html b/templates/registration/logout.html
index 737f1ce..3128d97 100644
--- a/templates/patchwork/logout.html
+++ b/templates/registration/logout.html
@@ -1,4 +1,4 @@
-{% extends "patchwork/base.html" %}
+{% extends "base.html" %}
 
 {% block title %}Patchwork{% endblock %}
 {% block heading %}Patchwork{% endblock %}
diff --git a/templates/registration/registration_complete.html b/templates/registration/registration_complete.html
new file mode 100644
index 0000000..47ee3f2
--- /dev/null
+++ b/templates/registration/registration_complete.html
@@ -0,0 +1,13 @@
+{% extends "base.html" %}
+
+{% block title %}Patchwork Registration{% endblock %}
+{% block heading %}Patchwork Registration{% endblock %}
+
+{% block body %}
+
+ <p>Registration successful!</p>
+ <p>A confirmation email has been sent to your email address. You'll
+ need to visit the link provided in that email to actiavate your
+ patchwork account.</p>
+
+{% endblock %}
diff --git a/templates/patchwork/register.html b/templates/registration/registration_form.html
index 4790fac..c8ce116 100644
--- a/templates/patchwork/register.html
+++ b/templates/registration/registration_form.html
@@ -1,4 +1,4 @@
-{% extends "patchwork/base.html" %}
+{% extends "base.html" %}
 
 {% block title %}Patchwork Registration{% endblock %}
 {% block heading %}Patchwork Registration{% endblock %}
@@ -108,8 +108,8 @@
 {% endif %}
    </td>
   </tr>
-   
- <tr>
+
+   <tr>
   <td colspan="2" class="submitrow">
    <input type="submit" value="Register"/>
   </td>