more fine tuning

3 files changed, 35 insertions, 29 deletions

diff --git a/core/views/signup.py b/core/views/signup.py
index 537f7fe..177b2b7 100644
--- a/core/views/signup.py
+++ b/core/views/signup.py
@@ -38,7 +38,6 @@ def signup(request):
             "signup.html",      
             {"form": pageform, 
             "year": "2025", "dates": "30th June - 3rd August",
-            "name": f"{who}",
             }
         )
     else:
@@ -85,9 +84,9 @@ class ExpoSignupForm(forms.Form):
     veggie = forms.ChoiceField(choices=VEGGIE_CHOICES, widget=forms.RadioSelect(attrs={'tabindex': 10}))
     student = forms.ChoiceField(choices=STUDENT_CHOICES, widget=forms.RadioSelect(attrs={'tabindex': 11}))
 
-    transport_ok = forms.ChoiceField(choices=[('yes', 'Yes, I have arranged transport'), ('no', 'No, I need transport')],
+    transport_ok = forms.ChoiceField(choices=[('yes', 'Yes, I have arranged transport and it is shown on that page'), ('no', 'No, I need to arrange or confirm transport')],
                                      widget=forms.RadioSelect(attrs={'tabindex': 12}), initial='no')
-    transport_info = forms.CharField(widget=forms.Textarea(attrs={'rows': 6, 'cols': 80, 'tabindex': 13, "placeholder":"I am a numpty and have no clue how I will get there (or back)."}),
+    transport_info = forms.CharField(widget=forms.Textarea(attrs={'rows': 3, 'cols': 80, 'tabindex': 13, "placeholder":"I am a numpty and have no clue how I will get there (or back)."}),
                                      required=False)
 
     bivvy = forms.BooleanField(required=False, widget=forms.CheckboxInput(attrs={'tabindex': 14, }))
@@ -98,10 +97,10 @@ class ExpoSignupForm(forms.Form):
 
     allergies = forms.CharField(widget=forms.Textarea(attrs={'rows': 2, 'cols': 80, 'tabindex': 19}), required=False)
     medication = forms.CharField(widget=forms.Textarea(attrs={'rows': 2, 'cols': 80, 'tabindex': 20}), required=False)
-    medic_info = forms.CharField(widget=forms.Textarea(attrs={'rows': 5, 'cols': 80, 'tabindex': 21}), required=False)
+    medic_info = forms.CharField(widget=forms.Textarea(attrs={'rows': 2, 'cols': 80, 'tabindex': 21}), required=False)
 
-    extra_info = forms.CharField(widget=forms.Textarea(attrs={'rows': 5, 'cols': 80, 'tabindex': 22, 
+    extra_info = forms.CharField(widget=forms.Textarea(attrs={'rows': 3, 'cols': 80, 'tabindex': 22, 
     'placeholder': 'Estuary english (fluent),\nCan use the potato hut bread machine (level 3 certificate)'}), required=False)
 
-    aims = forms.CharField(widget=forms.Textarea(attrs={'rows': 5, 'cols': 80, 'tabindex': 23, 'placeholder': 'Strolling over the plateau, sunning myself and taking in the views.'}), required=False)
+    aims = forms.CharField(widget=forms.Textarea(attrs={'rows': 3, 'cols': 80, 'tabindex': 23, 'placeholder': 'Strolling over the plateau, sunning myself and taking in the views.'}), required=False)
     
diff --git a/media/css/trog3.css b/media/css/trog3.css
index 26ec894..3d7ab48 100644
--- a/media/css/trog3.css
+++ b/media/css/trog3.css
@@ -144,7 +144,7 @@ div#content h2
 {

     text-align:center;

     font-size:200%;

-    Dpadding-bottom:30px;

+    padding-bottom:30px;

 }

 

 table.prevnextexpeditions

diff --git a/templates/signup.html b/templates/signup.html
index 7eec178..6bfae72 100644
--- a/templates/signup.html
+++ b/templates/signup.html
@@ -17,20 +17,17 @@ Loser Expo 2025 SIGN-UP Form
 {% load static %}
 
     <style type="text/css">
-    body { margin-left: 8%; margin-right: 8%; margin-top: 4%; margin-bottom: 4% }
+    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 { color: #009900 }
-    h2.blocktext { color: #009900; margin-left: 48pt }
-    h3 { color: #2c105e }
-    h3.blocktext { color: #2c105e; margin-left: 48pt }
-    h4 { color: #0d664c }
-    a:link { text-decoration: none }
-    a:visited { text-decoration: none }
+    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 }
@@ -53,18 +50,29 @@ Loser Expo 2025 SIGN-UP Form
     <h1>Expo {{year}} Signup Form {{dates}}</h1>
     
     <p>This is the official signup form for Expo {{year}}</p>
-    <p>This form is not secure and by submitting this form you consent to its contents being used for Expo purposes and being included in the Bier Book on Expo.</p>
-    <p>You also give permission for any information you collect on expo (survey data, photos, trip writeups, etc.) to be used in perpetuity for expo-related purposes.</p> 
-	<p>BEFORE you fill out this form, you MUST sign up  to the expo mailing list.
-	If you have not signed up to the mailing list, this form will FAIL and you will need to do it all again.
+    <p>This form is <em>not</em> secure and should not be used for confidential 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">
+<li> all expo organisational purposes
+<li> being <em>public</em> in the printed Bier Book on Expo.</ul></p>
+    <p>You are now also giving permission that all information you collect on expo 
+	 <ul 	style="list-style: disc">
+	<li>survey data, GPS tracks
+	<li>photos, videos
+	<li>trip writeups
+    <li>rough notes
+	<li>all other records or recordings you make
+</ul>
+    may be used without charge  <em>in perpetuity</em> for expo-related purposes.</p> 
+	<p>Submitting this form will subscribe you to the expo mailing list
+	if you are not already subscribed. 
     
     <hr>
     <form action="{% url 'signup' %}" method="post">
         {% csrf_token %}
     
-    <h2>Section A: Personal information</h2>
-    
-    <h3>General</h3>
+    <h3>Personal information</h3>
     
     <table border="0">
       <tr>
@@ -124,18 +132,17 @@ Loser Expo 2025 SIGN-UP Form
     <p>{{ form.transport_info }}</p>
     </table>
     <table border="0">   
-
     <h3>Tents</h3>
     <p>There will be two high camps in {{year}}:</p>
     <ul 	style="list-style: disc">
       <li>the Stone Bridge site;</li>
       <li>the Garlic Cave site</li>
     </ul>
-    <p>There is space for three people in a Club tent at Base Camp. At the stone bridge, a bivvy bag is not essential but useful if you have one.</p>
-    <p>Will you be taking any of the following (please tick/complete as appropriate):</p>
-    <p>{{ form.bivvy }} Yes I have my own bivvy bag which I will use up the mountain.</p>
-    <p>{{ form.tent }} Yes, I have a {{ form.top_tent_cap }} person tent for the Top Camp site.</p>
-    <p>{{ form.btent }} Yes, I have a {{ form.base_tent_cap }} person tent for Base Camp.</p>
+    <p>As well as space for your own tent, there is space for three people in a Club tent at Base camp. At the stone bridge, a breathable and waterproof bivvy bag is not essential but useful if you have one. At Garlic Cave a bivvy bag is very strongly recommended.</p>
+    <p>Will you be bringing any of the following to expo (please tick/complete as appropriate):</p>
+    <p>{{ form.bivvy }} Yes I will have my own bivvy bag which I will use up the mountain.</p>
+    <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>Medical</h3>
@@ -152,7 +159,7 @@ Loser Expo 2025 SIGN-UP Form
     <p>Any other information, including any skills e.g. first aid, languages, etc. that you have:</p>
     <p>{{ form.extra_info }}</p>
     
-    <h2>Section B - Caving/surface work projects</h2>
+    <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>