split signup forms working again

cookbook/forms.py

@@ -70,21 +70,6 @@ class UserPreferenceForm(forms.ModelForm):
         }
 
 
-class AllAuthSignupForm(forms.Form):
-    captcha = hCaptchaField()
-    terms = forms.BooleanField(label=_('Accept Terms and Privacy'))
-
-    def __init__(self, **kwargs):
-        super(AllAuthSignupForm, self).__init__(**kwargs)
-        if settings.PRIVACY_URL == '' and settings.TERMS_URL == '':
-            self.fields.pop('terms')
-        if settings.HCAPTCHA_SECRET == '':
-            self.fields.pop('captcha')
-
-    def signup(self, request, user):
-        pass
-
-
 class UserNameForm(forms.ModelForm):
     prefix = 'name'
 
@@ -464,6 +449,21 @@ class SpaceJoinForm(forms.Form):
     token = forms.CharField()
 
 
+class AllAuthSignupForm(forms.Form):
+    captcha = hCaptchaField()
+    terms = forms.BooleanField(label=_('Accept Terms and Privacy'))
+
+    def __init__(self, **kwargs):
+        super(AllAuthSignupForm, self).__init__(**kwargs)
+        if settings.PRIVACY_URL == '' and settings.TERMS_URL == '':
+            self.fields.pop('terms')
+        if settings.HCAPTCHA_SECRET == '':
+            self.fields.pop('captcha')
+
+    def signup(self, request, user):
+        pass
+
+
 class UserCreateForm(forms.Form):
     name = forms.CharField(label='Username')
     password = forms.CharField(