new user registration

4 files changed, 36 insertions, 13 deletions

diff --git a/templates/login/readme.txt b/templates/login/readme.txt
new file mode 100644
index 0000000..57b766b
--- /dev/null
+++ b/templates/login/readme.txt
@@ -0,0 +1,5 @@
+We have both a templates/login and a templates/registration directory.

+

+The registration stuff is mostly in the /logins directory - oops.

+

+This all needs to be cleaned up.
\ No newline at end of file
diff --git a/templates/login/register.html b/templates/login/register.html
index 2fc8219..07ae34b 100644
--- a/templates/login/register.html
+++ b/templates/login/register.html
@@ -52,12 +52,12 @@ ALSO it behaves differently if a username is specified in the URL, when username
 <h3>Register your email address</h3>
 
 {% if newuser %}
-<p>You need to register before you can fill out the 'signup' form to request to attend Expo.
+<p>You need to register on the website before you can fill out the 'signup' form to request to attend Expo.
 {% else %}
 <p>For previous expoers, your username must be your 'troggle id' as listed on the <a href='/people_ids'>past expoers list</a>
 <p>For new people wanting to come to expo for the first time, please use the <a href="/accounts/newregister/">New User</a> registration form
 {%endif %}
-<p>This will eventually sign you up automatically to the 
+<p>This will also eventually sign you up automatically to the 
 <a href="https://lists.wookware.org/cgi-bin/mailman/roster/expo">expo email list</a>. 
 So type in the same email address that you use there if you have already signed up to that.
 <p>
@@ -68,12 +68,19 @@ So type in the same email address that you use there if you have already signed
 <div style='width: 700px; font-family: monospace; font-weight: bold; font-size: 150%; text-align: right; '>
     <form  method="post" accept-charset="utf-8">{% csrf_token %}
 <p>
+{% if newuser %}
+    <label for="id_username">Your name:</label>
+	   {{form.fullname}}
+{% else %}
 	{% if email_stored %}
     <label for="id_username">Username <span style="color:blue">(checked)</span>:</label>
 	{% else %}
     <label for="id_username">Username:</label>
 	{% endif %}
-    {{form.username}}
+	   {{form.username}}
+{%endif %}
+
+ 
 </p>
 <p>
 	{% if email_stored %}
@@ -83,17 +90,20 @@ So type in the same email address that you use there if you have already signed
 	{% endif %}
 	{{form.email}}
 </p>
-{% if logged_in  %}<!-- one we have initially logged in,
-all later password chnages are done ONLY via email token password re-set-->
+{% if newuser %}
 {% else %}
-<p>
-    <label for="id_password1">Troggle password:</label>
-    {{form.password1}}
-</p>
-<p>
-    <label for="id_password2">Re-type your troggle password:</label>
-    {{form.password2}}
-</p>
+	{% if logged_in  %}<!-- one we have initially logged in,
+	all later password chnages are done ONLY via email token password re-set-->
+	{% else %}
+	<p>
+		<label for="id_password1">Troggle password:</label>
+		{{form.password1}}
+	</p>
+	<p>
+		<label for="id_password2">Re-type your troggle password:</label>
+		{{form.password2}}
+	</p>
+	{%endif %}
 {%endif %}
 
 <div class='align-right'>
diff --git a/templates/login/register_text.html b/templates/login/register_text.html
index ac5c3ff..644303f 100644
--- a/templates/login/register_text.html
+++ b/templates/login/register_text.html
@@ -28,8 +28,11 @@ you can change it at the bottom of <a href="https://lists.wookware.org/cgi-bin/m
 {% if newuser %}

 <h3>What happens next</h3>

 <p>Clicking the big blue button will send you an email which will contain a login token.

+[but it will first take you to <em>another</em> form to <em>re-type</em> your email address.]

 Click on the link in the email and you will be able to set your own login password. 

 Use this to login to troggle and go to the Expo Signup form.

+<p>Why is this so complicated? Because we did something simpler on the CUCC website and this now 

+has 13,000+ bogus bot registrations which we now have to clean up.

 {% else %}

 {%endif %}

 

diff --git a/templates/registration/readme.txt b/templates/registration/readme.txt
new file mode 100644
index 0000000..57b766b
--- /dev/null
+++ b/templates/registration/readme.txt
@@ -0,0 +1,5 @@
+We have both a templates/login and a templates/registration directory.

+

+The registration stuff is mostly in the /logins directory - oops.

+

+This all needs to be cleaned up.
\ No newline at end of file