wording

2 files changed, 24 insertions, 41 deletions

diff --git a/templates/login/signup.html b/templates/login/signup.html
index 1101361..ee44fed 100644
--- a/templates/login/signup.html
+++ b/templates/login/signup.html
@@ -3,7 +3,7 @@
 
 {% block title %}
 
-Loser Expo 2025 SIGN-UP Form
+Loser Expo {{year}} SIGN-UP Form
 
 {% endblock %}
 
@@ -15,42 +15,19 @@ Loser Expo 2025 SIGN-UP Form
 {% block head %}
 {% endblock %}
 {% load static %}
-<!-- mostly autotranslated from PHP hence the garbage -->
+
     <style type="text/css">
     body { margin-left: 8%; margin-right: 8%;  margin-bottom: 4% }
-    p.blocktext { margin-left: 48pt; margin-right: 48pt }
-    div.blocktext { margin-left: 48pt; margin-right: 48pt }
-    ul.blocktext { margin-left: 48pt; margin-right: 48pt }
-    ol.blocktext { margin-left: 48pt; margin-right: 48pt }
     h1 { font-size: 24pt; line-height: 100% }
     h2 { text-align: left}
-    h2.blocktext { text-align: left; margin-left: 48pt }
-    h3.blocktext { margin-left: 48pt }
-    table.cal { width: 100% }
 	td { padding-left: 5px; padding-right: 10px }
-    tr.odd { background-color: #cccccc; height: 56pt }
-    tr.even { background-color: #eeeeee; height: 56pt }
-    tr.oddvac { background-color: #888888; height: 56pt }
-    tr.evenvac { background-color: #888888; height: 56pt }
-    tr.head { background-color: #999999; height: 36pt }
-    td.cellhead { width: 12%; text-align: center }
-    td.cell { width: 12%; font-size: 12pt }
-    td.cellvac { background-color: #888888; width: 12%; font-size: 12pt }
-    td.meet { background-color: #c6c699; width: 12%; font-size: 12pt; text-align: center }
-    td.other { background-color: #998db5; width: 12%; font-size: 12pt }
-    td.date { background-color: #999999; width: 12%; font-size: 12pt; text-align: right }
-    td.white { background-color: #ffffff; width: 12% }
-    div.right { float: right; margin-right: 48pt }
-    img.padleft { margin-left: 24pt }
-    span.l { background: #7f96e8 }
     </style>
 
     <title>Loser Expo {{year}} Sign-up Form</title>
-
-    <h1>Expo {{year}} Signup Form {{dates}}</h1>
-    
-    <p>This is the official signup form for Expo {{year}}</p>
-    <p>This form is <em>not</em> secure and should not be used for confidential information.<br>
+<br /><h1>Expo {{year}} ({{dates}})  Signup Form</h1>
+     
+    <p>This is the <strike>official</strike> experimental signup form for Expo {{year}}</p>
+    <p>This form is <em>not</em> secure<a href="#footnote">*</a> and should not be used for <em>seriously confidential</em> information.<br>
 	(However we take care not to <em>publish</em> your email address, phone numbers or residential addresses.)
 <p>By submitting this form you consent to its contents being used for
     <ul 	style="list-style: disc">
@@ -72,7 +49,7 @@ Loser Expo 2025 SIGN-UP Form
 	{% else %}
 	<button  class="fancybutton"  style="padding: 0.5em 25px; font-size: 100%;" onclick="window.location.href='/accounts/register/'" value = "Go to">
 		You need to register a personal login before you can signup to attend &rarr;
-	</button>	
+	</button>	<br /><br />
 	{% endif %}   
     <hr>
 <span style="color:red; font-family: monospace; font-weight: bold;">
@@ -154,25 +131,28 @@ Loser Expo 2025 SIGN-UP Form
     <p>{{ form.tent }} Yes, I will have a {{ form.top_tent_cap }} person tent for the Top Camp site.</p>
     <p>{{ form.btent }} Yes, I will have a {{ form.base_tent_cap }} person tent for Base Camp.</p>
     <p>Leave the tick-boxes unchecked if you require Club tent space at a particular site.</p>
+
+    <h3>Caving/surface work projects</h3>
+    <p>To assist organisation of gear, it would be helpful to know people's possible aims on Expo. Thus if you have a particular project in mind, please state it below:</p>
+    <p>{{ form.aims }}</p>
     
-    <h3>Medical</h3>
-    <p>The medical information entered here will appear in the Bier Book. 
+    <h3>Public medical information</h3>
+    <p>This is for anything medical you want everyone to be aware of. The medical information entered here will appear, on paper, in the Bier Book. 
 	More personal medical information relevant to your safe treatment on expo in case of need should be privately communicated to
-    <a href="mailto:medic@austria.expo">the medical officer</a>. This will be placed in sealed envelopes inside the large first aid kits for use in case of emergency. Please ensure that you communicate such information in good time.</p>
-    <p>Please list any allergies which you have:</p>
+    <a href="mailto:medic@austria.expo">the medical officer</a> [placeholder, inoperative email address] preferably only on paper. This will be placed in sealed envelopes inside the large first aid kits for use in case of emergency. Please ensure that you communicate such information in good time and <em>take it with you or destroy it yourself when you leave expo</em>.</p>
+    <p>Please list any allergies which you want people to know about:</p>
     <p>{{ form.allergies }}</p>
-    <p>Please list any medication which you may be taking in Austria:</p>
-    <p>{{ form.medication }}</p>
-    <p>Please list any other medical conditions you have that the expedition should be aware of:</p>
+    <!--<p>Please list any medication which you may be taking in Austria which need:</p>
+    <p>{{ form.medication }}</p>-->
+    <p>Please list any other medical conditions that everyone on the expedition should be aware of:</p>
     <p>{{ form.medic_info }}</p>
+	<p>If you have medication which must be kept in the fridge at basecamp, then please tell the medical officer and  bring <em>your own</em> small <b>robust</b> container which will not be damaged by moving beer bottles, with a label with your name indelibly written on it and the words "MEDICAL - personal" prominently displayed. There is limited space in the fridge.
     
     <h3>Other</h3>
     <p>Any other information, including any skills e.g. first aid, languages, etc. that you have:</p>
     <p>{{ form.extra_info }}</p>
     
-    <h3>Caving/surface work projects</h3>
-    <p>To assist organisation of gear, it would be helpful to know people's possible aims on Expo. Thus if you have a particular project in mind, please state it below:</p>
-    <p>{{ form.aims }}</p>
+
      </table>
     <hr>
     
@@ -191,6 +171,9 @@ Loser Expo 2025 SIGN-UP Form
 	</div>
   </form>
 
+<p>
+<h3 id ="footnote">How secure is this ?</h3>
+<p>It is rather more secure than most things you are likely to come across when interacting with a student club. We are writing up a threat analysis. Your password is very secure, as it is never stored, but the data you submit is stored (<a href="https://www.comparitech.com/blog/information-security/what-is-fernet/">encrypted</a>). This is open in principle to any of our programmers who could write code to decrypt it and export it; but our code base is under version control so unless the programmer is also a git expert it is unlikely that this would go unnoticed.
     
   &nbsp;<br />
   <hr>
diff --git a/templates/login/signupok.html b/templates/login/signupok.html
index b610fea..c5abea4 100644
--- a/templates/login/signupok.html
+++ b/templates/login/signupok.html
@@ -54,7 +54,7 @@ Cavers who have signed up to attend so far:
 <br /><span style="font-size: 70%; "><details><summary>
     JSON  <br> 
         </summary>
-		<a href="/encrypted/{{year}}/signups.json">{{year}/signups.json
+		<a href="/encrypted/{{year}}/signups.json">{{year}}/signups.json
 		</details>
 
 {% endblock content %}