From 096f74a3f35b53e2d479f6091c6acbc1000ae032 Mon Sep 17 00:00:00 2001
From: pjrharley <devnull@localhost>
Date: Sat, 30 May 2009 16:17:19 +0100
Subject: [PATCH] [svn] A few registration updates -display an error for
 nonmatching passwords -display an error for short passwords -dont direct
 people to http://http://sitename....

---
 registration/forms.py                         | 2 ++
 templates/registration/activation_email.html  | 2 +-
 templates/registration/registration_form.html | 5 ++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/registration/forms.py b/registration/forms.py
index f2298ac..2f591d4 100644
--- a/registration/forms.py
+++ b/registration/forms.py
@@ -65,6 +65,8 @@ class RegistrationForm(forms.Form):
         if 'password1' in self.cleaned_data and 'password2' in self.cleaned_data:
             if self.cleaned_data['password1'] != self.cleaned_data['password2']:
                 raise forms.ValidationError(_(u'You must type the same password each time'))
+            if len(self.cleaned_data['password1']) < 6:
+                raise forms.ValidationError(_(u'Your password must be at least 6 characters'))
         return self.cleaned_data
     
     def save(self):
diff --git a/templates/registration/activation_email.html b/templates/registration/activation_email.html
index fa205ef..e8f846b 100644
--- a/templates/registration/activation_email.html
+++ b/templates/registration/activation_email.html
@@ -2,7 +2,7 @@
 
 <P>Glad you're joining the CUCC EXPO team! Please go to</P>
 
-<P><a href="http://{{ site }}{% url registration_activate activation_key %}">{{ site }}{% url registration_activate activation_key %}</a></P>
+<P><a href="{{ site }}{% url registration_activate activation_key %}">{{ site }}{% url registration_activate activation_key %}</a></P>
 
 <P>to activate your account. Do this within {{ expiration_days }} days, or else you'll have to sign up again.</P>
 
diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html
index 17bebf2..5720a8b 100644
--- a/templates/registration/registration_form.html
+++ b/templates/registration/registration_form.html
@@ -10,6 +10,9 @@ registration_form.html | {{ block.super }}
 
 {% block content %}
 <form action="{% url registration_register %}" method="POST">
+        {% for error in form.non_field_errors %}
+        <span style="color:red">{{ error }}</span>
+        {% endfor %}
 <table>
 <tr>
     <td align="right" valign="top">Username:</td>
@@ -53,4 +56,4 @@ registration_form.html | {{ block.super }}
 </tr>
 </table>
 </form>
-{% endblock %}
\ No newline at end of file
+{% endblock %}