From d602e8a7c0f68c26ca4d657a4833f6316c83696e Mon Sep 17 00:00:00 2001
From: Matthew Scroggs
Date: Tue, 28 May 2024 15:37:16 +0100
Subject: [PATCH 1/3] add under 16 info to workshops about page
---
templates/schedule/event_tickets_about.html | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/templates/schedule/event_tickets_about.html b/templates/schedule/event_tickets_about.html
index 06973b529..424612478 100644
--- a/templates/schedule/event_tickets_about.html
+++ b/templates/schedule/event_tickets_about.html
@@ -23,13 +23,17 @@ Workshop sign-up
marked with 🎟
Click on each workshop title and select how many tickets you would like.
You can choose a maximum of 2 places for workshops, or a maximum of 5
- children's places for youth workshops; you don't need to include accompanying
- adults in this number.
+ children's places for youth workshops.
After you've selected all the workshops you would like to enter the lottery
for, go to the workshop tickets page
and arrange them in your order of preference.
+All under-16s attending workshops must be accompanied by an adult. For youth
+ workshops, adults accompanying under-16s do not need their own ticket for the workshop.
+ For workshops running outside the youth workshop tent, adults accompanying children
+ will need their own ticket for as well.
+
On Wednesday 29th May lottery places will be allocated. The lottery will be
closed from this point onwards.
@@ -49,5 +53,4 @@ Workshop sign-up
attend these workshops will be decided by each individual village. The best
idea is to visit the village early and ask them.
-
{% endblock %}
From 9449fff7ac3750287c2a31a6d6b0ab1ae2d93431 Mon Sep 17 00:00:00 2001
From: Matthew Scroggs
Date: Tue, 28 May 2024 15:42:45 +0100
Subject: [PATCH 2/3] Revert "add under 16 info to workshops about page"
This reverts commit d602e8a7c0f68c26ca4d657a4833f6316c83696e.
---
templates/schedule/event_tickets_about.html | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/templates/schedule/event_tickets_about.html b/templates/schedule/event_tickets_about.html
index 424612478..06973b529 100644
--- a/templates/schedule/event_tickets_about.html
+++ b/templates/schedule/event_tickets_about.html
@@ -23,17 +23,13 @@ Workshop sign-up
marked with 🎟
Click on each workshop title and select how many tickets you would like.
You can choose a maximum of 2 places for workshops, or a maximum of 5
- children's places for youth workshops.
+ children's places for youth workshops; you don't need to include accompanying
+ adults in this number.
After you've selected all the workshops you would like to enter the lottery
for, go to the workshop tickets page
and arrange them in your order of preference.
-All under-16s attending workshops must be accompanied by an adult. For youth
- workshops, adults accompanying under-16s do not need their own ticket for the workshop.
- For workshops running outside the youth workshop tent, adults accompanying children
- will need their own ticket for as well.
-
On Wednesday 29th May lottery places will be allocated. The lottery will be
closed from this point onwards.
@@ -53,4 +49,5 @@ Workshop sign-up
attend these workshops will be decided by each individual village. The best
idea is to visit the village early and ask them.
+
{% endblock %}
From e8ee4ad76341b24cfb7a7be16cd7ba37ddb59b36 Mon Sep 17 00:00:00 2001
From: Matthew Scroggs
Date: Tue, 28 May 2024 15:43:00 +0100
Subject: [PATCH 3/3] add link to workshoip ticket info to about side bar
---
templates/about/template.html | 1 +
1 file changed, 1 insertion(+)
diff --git a/templates/about/template.html b/templates/about/template.html
index b8fee3282..af982837b 100644
--- a/templates/about/template.html
+++ b/templates/about/template.html
@@ -18,6 +18,7 @@
{{page("Arrival Times", "arrival-times")}}
{{page("What to Bring", "what-to-bring")}}
{{page("Villages", "villages")}}
+ {{page("Workshop tickets", "base.schedule.tickets.about")}}
{{page("Health", "health")}}
{{page("Accessibility", "accessibility")}}
{{page("Childcare", "childcare")}}