formatting and defaults done

1 files changed, 26 insertions, 18 deletions

diff --git a/templates/signup.html b/templates/signup.html
index e667a4e..138d95c 100644
--- a/templates/signup.html
+++ b/templates/signup.html
@@ -17,10 +17,11 @@ Loser Expo 2025 SIGN-UP Form
 {% load static %}
 
     <style type="text/css">
-    body { font-family: sans-serif; margin-left: 8%; margin-right: 8%; margin-top: 4%; margin-bottom: 4% }
+    body { margin-left: 8%; margin-right: 8%; margin-top: 4%; 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 }
+	ul {list-style: disc}
     ol.blocktext { margin-left: 48pt; margin-right: 48pt }
     h1 { font-size: 24pt; line-height: 100% }
     h2 { color: #009900 }
@@ -101,8 +102,8 @@ Loser Expo 2025 SIGN-UP Form
         <td>{{ form.relation }}</td>
       </tr>
     </table>
-    
-    <table width="100%">
+		&nbsp;<br />
+    <table border="0">   
       <tr>
         <td><b>Are you a vegetarian?</b></td>
         <td><b>Are you a student/unwaged?</b></td>
@@ -112,28 +113,31 @@ Loser Expo 2025 SIGN-UP Form
         <td>{{ form.student }}</td>
       </tr>
 
+    </table>
 
-    
+    <table border="0">   
     <h3>Transport</h3>
-    <p>Please look now at the <a target="_blank" href="http://expo.survex.com/years/2024/travel.html">transport arrangements page</a> (will open in a new window). Then select one of the following:</p>
+    <p>Please look now at the <a target="_blank" href="/years/{{year}}/travel.html">transport arrangements page</a> (will open in a new window). Then select one of the following:</p>
     
     <p>{{ form.transport_ok }}</p>
     
-    <p>If your arrangements are shown incorrectly, then please state the corrected version in the box below. This will automatically be emailed to the transport co-ordinator.</p>
+    <p>If your arrangements are shown incorrectly, then please state the corrected version in the box below. </p>
     <p>{{ form.transport_info }}</p>
+    </table>
+    <table border="0">   
 
     <h3>Tents</h3>
-    <p>There will be two high camps in 2025:</p>
+    <p>There will be two high camps in {{year}}:</p>
     <ul>
-      <li>the stone bridge bivvy site;</li>
-      <li>Garlic Cave.</li>
+      <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 }}</p>
-    <p>{{ form.tent }} A {{ form.top_tent_cap }} person tent for the Top Camp site.</p>
-    <p>{{ form.btent }} A {{ form.base_tent_cap }} person tent for Base Camp.</p>
-    <p>Leave the boxes unchecked if you require Club tent space at a particular site.</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>Leave the tick-boxes unchecked if you require Club tent space at a particular site.</p>
     
     <h3>Medical</h3>
     <p>The medical information entered here will appear in the Bier Book. Extra medical information may be communicated to
@@ -152,15 +156,19 @@ Loser Expo 2025 SIGN-UP Form
     <h2>Section B - Caving/surface work projects</h2>
     <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>
     
     <h2>All done?</h2>
-    <p>Click the <b>Preview</b> button below to review your submission.</p>
-    <input type="submit" value="Preview form submission">
+    <!-- <p>Click the <b>Preview</b> button below to review your submission.</p> -->
+	<div style="text-align: center">
+    <input type="submit" value="Preview / Submit">
+	</div>
   </form>
-  
+
+    
+  &nbsp;<br />
   <hr>
-  <p>Please report any problems with this form to the <a href="mailto:wookey-expo@wookware.org">webmaster</a>.</p>
+  <p>Please report any problems with this form to a  <a href="mailto:philip.sargent@klebos.eu">troggle nerd</a>.</p>
 {% endblock %}
 		
\ No newline at end of file