9 files changed, 4 insertions, 22 deletions
diff --git a/templates/base.html b/templates/base.html
index e14470e..9e80dca 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -30,7 +30,7 @@
 {% else %}
      <a href="{% url auth_login %}">login</a>
      <br/>
-     <a href="{% url registration_register %}">register</a>
+     <a href="{% url patchwork.views.user.register %}">register</a>
 {% endif %}
    </div>
    <div style="clear: both;"></div>
diff --git a/templates/registration/activation_email.txt b/templates/patchwork/activation_email.txt
index 6b1477d..e918e5f 100644
--- a/templates/registration/activation_email.txt
+++ b/templates/patchwork/activation_email.txt
@@ -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 registration_activate activation_key=activation_key %}
+ 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.
diff --git a/templates/registration/activation_email_subject.txt b/templates/patchwork/activation_email_subject.txt
index c409f38..c409f38 100644
--- a/templates/registration/activation_email_subject.txt
+++ b/templates/patchwork/activation_email_subject.txt
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/registration/login.html b/templates/patchwork/login.html
index 2dfc2a7..2dfc2a7 100644
--- a/templates/registration/login.html
+++ b/templates/patchwork/login.html
diff --git a/templates/registration/logout.html b/templates/patchwork/logout.html
index f030aee..f030aee 100644
--- a/templates/registration/logout.html
+++ b/templates/patchwork/logout.html
diff --git a/templates/registration/activate.html b/templates/patchwork/registration-confirm.html
index f0cc39f..f0cc39f 100644
--- a/templates/registration/activate.html
+++ b/templates/patchwork/registration-confirm.html
diff --git a/templates/registration/registration_form.html b/templates/patchwork/registration_form.html
index e2b17c1..3a314b8 100644
--- a/templates/registration/registration_form.html
+++ b/templates/patchwork/registration_form.html
@@ -6,12 +6,11 @@
 
 {% block body %}
 
-{% if request and not error %}
+{% if confirmation and not error %}
  <p>Registration successful!</p>
- <p>A confirmation email has been sent to {{ request.email }}. You'll
+ <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>
- <pre>{{email}}</pre>
 </p>
 {% else %}
 <p>By creating a patchwork account, you can:<p>
diff --git a/templates/registration/registration_complete.html b/templates/registration/registration_complete.html
deleted file mode 100644
index a89c116..0000000
--- a/templates/registration/registration_complete.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}Registration{% endblock %}
-{% block heading %}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 activate your
- patchwork account.</p>
-
-{% endblock %}