only allows registration once, except for admins

4 files changed, 21 insertions, 10 deletions

diff --git a/templates/login/readme.txt b/templates/login/readme.txt
index 57b766b..a76a8e4 100644
--- a/templates/login/readme.txt
+++ b/templates/login/readme.txt
@@ -2,4 +2,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
+This all needs to be cleaned up.. BUT we are limited by Django-standard locations for some of this stuff,

+so it can't be moved around willy-nilly.
\ No newline at end of file
diff --git a/templates/login/register.html b/templates/login/register.html
index e025879..92273b8 100644
--- a/templates/login/register.html
+++ b/templates/login/register.html
@@ -49,24 +49,28 @@ User Registration - for a personal login to Troggle by a known caver
 ALSO it behaves differently if a username is specified in the URL, when username becomes readonly
 
 -->
-<span style="color:red; font-weight: bold;">
+<span style="color:blue; font-weight: bold;">
 {{ admin_notice }}
 </span>
 <h3>Register your email address</h3>
 
 {% if newuser %}
-<p>You need to register on the website 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 
+(not in 2025: this is for future Expos).
 {% else %}
 <p>For previous expoers, your username must be your 'troggle id' as listed on the <a href='/people_ids'>past expoers list</a>
+e.g. "<a href="/person/rover-richardson">rover-richardson</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 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>
+<span style="color:red; font-weight: bold;">
+{{ warning }} </span>
 <span style="color:red">
-{{ warning }} {{ form.errors }}
-</span>
+{{ form.errors }} </span>
+
 
 <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 %}
@@ -95,8 +99,8 @@ So type in the same email address that you use there if you have already signed
 </p>
 {% if newuser %}
 {% else %}
-	{% if logged_in  %}<!-- one we have initially logged in,
-	all later password chnages are done ONLY via email token password re-set-->
+	{% if logged_in  %}<!-- once we have initially logged in,
+	all later password changes are done ONLY via email token password re-set-->
 	{% else %}
 	<p>
 		<label for="id_password1">Troggle password:</label>
@@ -162,6 +166,8 @@ So type in the same email address that you use there if you have already signed
 </form>
 </div>
 <div style='width: 50em' align="left">
+<p>The "Register" button will take you to a form where you will have to <em>re-type in the email address</em> you enter above.
+
 {% include 'login/register_text.html' %}
 
 
diff --git a/templates/login/register_email.html b/templates/login/register_email.html
index 1768168..26960cd 100644
--- a/templates/login/register_email.html
+++ b/templates/login/register_email.html
@@ -29,7 +29,7 @@ The reason for separating this template from the other one (register.html) is th
 gets very confused. So despite the partial duplication, it is easier to debug and maintain by
 having two separate templates.
 -->
-<h3>Register your email address</h3>
+<h3>Re-register your email address, or change to a different one</h3>
 
 <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]
@@ -76,6 +76,7 @@ So type in the same email address that you use there if you have already signed
 </form>
 </div>
 <div style='width: 50em' align="left">
+<p>This will take you to a form where you will have to <em>re-type in the email address</em> you enter above.
 {% include 'login/register_text.html' %}
 
 
diff --git a/templates/login/register_text.html b/templates/login/register_text.html
index 644303f..a414c43 100644
--- a/templates/login/register_text.html
+++ b/templates/login/register_text.html
@@ -6,6 +6,7 @@ Yes, you can put in any 'de', 'van' or 'von' or whatever 'nobiliary particle' yo
 Nicknames and fun names are done later.

 {% else %}

 <p>For previous expoers, your username must be your 'troggle id' as listed on the <a href='/people_ids'>past expoers list</a>

+e.g. "<a href="/person/rover-richardson">rover-richardson</a>".

 {%endif %}

 <p>Unfortunately cavers tend to use weird and playful names when signing up for things, 

 so we can't automatically connect the troggle names and ids with the email addresses 

@@ -37,7 +38,8 @@ has 13,000+ bogus bot registrations which we now have to clean up.
 {%endif %}

 

 <h3>Security note</h3>

-We never store passwords at all, we only store a cryptographic hash. 

+We never store passwords at all, we only store a 

+<a href="https://en.wikipedia.org/wiki/Cryptographic_hash_function#/media/File:Cryptographic_Hash_Function.svg">cryptographic hash</a>. 

 We do store your email address but only 'in clear' inside the live database online

 where it is accessible only to the database administrators. There is no troggle report

 which publishes your email address. 

@@ -45,7 +47,8 @@ For permanent storage all email addresses are encrypted. Your real name and trog
 username is public however, and we do not have anonymous people attending expo.

 <p>

 The password we {% if newuser %}will be{% else %}are{%endif %} asking for is solely for logging into troggle. 

-The troggle login is used to track who is editing the current and past expo data, website content, and historic survey data, as well as for accessing the expo Kanban software. It is not the same as the password you use to access your email 

+The troggle login is used to track who is editing the current and past expo data, website content, and historic survey data, as well as for accessing the expo Kanban software (in future). 

+It is not the same as the password you use to access your email 

 with your email provider

 and it is not the same as the password you use to interact with the expo 

 <a href="https://lists.wookware.org/cgi-bin/mailman/roster/expo">email list</a>.
\ No newline at end of file