From dc26f5f1be839e7d2d32ee6c6d748a83a15721a1 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Fri, 5 Feb 2021 13:07:47 +0000 Subject: [PATCH] Preparing for 2021 Expo, deleting 2020 expo --- handbook/computing/newyear.html | 33 +++++--- years/2020/index.html | 102 +---------------------- years/2021/index.html | 118 +++++++++++++++++++++++++++ years/{2020 => 2021}/logbook.html | 4 +- years/{2020 => 2021}/mission.html | 9 +- years/{2020 => 2021}/whoandwhen.html | 9 +- 6 files changed, 156 insertions(+), 119 deletions(-) create mode 100644 years/2021/index.html rename years/{2020 => 2021}/logbook.html (88%) rename years/{2020 => 2021}/mission.html (89%) rename years/{2020 => 2021}/whoandwhen.html (96%) diff --git a/handbook/computing/newyear.html b/handbook/computing/newyear.html index 92f689e10..9aa76d2bb 100644 --- a/handbook/computing/newyear.html +++ b/handbook/computing/newyear.html @@ -19,24 +19,37 @@

Adding a new year in the Expo online systems

There is no script to do this (yet). In the list below everything in expofiles is done by directly overwriting what is on the server. Changes to expoweb and troggle must be done using the version control system as these are repositories. +

Well before Expo as these pages are used in planning

+ +

Whenever you like before Expo

+ + +

A week or so before Expo

+

Edit folk/folk.csv according to the instructions in the Folk Update process

diff --git a/years/2020/index.html b/years/2020/index.html index e0bd9616b..4a0383f9f 100644 --- a/years/2020/index.html +++ b/years/2020/index.html @@ -7,107 +7,7 @@

Expo 2020

-

Expo 2020: Organisation

-

-Link to last year: 2019
-Back to Expo Planning Guide. - - - - -

Pre-Expo Planning

- - -PDF docs: - - -On expo website: - - -

Expo reports

- - - -

During Expo - mostly data entry

- - -

Last day of expo

- - -

Post-Expo Completion

- - - - - -

2020 Mission statement

- - -

Criteria for a successful expo

-

To discuss.. (not just x miles of newly surveyed cave) -

Organisational targets

- - - -

Training targets

- -

Every Expo - ongoing jobs

- +

COVID - No expedition this year

Back to Expo Planning Guide. diff --git a/years/2021/index.html b/years/2021/index.html new file mode 100644 index 000000000..14dea70db --- /dev/null +++ b/years/2021/index.html @@ -0,0 +1,118 @@ + + + + +Expo 2021: Organisation and mission statement + + + +

Expo 2021

+

Expo 2021: Organisation

+

+Link to last expedition: 2019
+Back to Expo Planning Guide. + + + + +

Pre-Expo Planning

+ + +PDF docs created for planning the 2020 Expo: + + +On expo website: + + +

Expo reports

+ + + +

During Expo - mostly data entry

+ + +

Last day of expo

+ + +

Post-Expo Completion

+ + + + + +

2021 Mission statement

+ + +

Criteria for a successful expo

+

To discuss.. (not just x miles of newly surveyed cave) +

Organisational targets

+ + + +

Training targets

+ +

Every Expo - ongoing jobs

+ +
+

+Back to Expo Planning Guide. + + diff --git a/years/2020/logbook.html b/years/2021/logbook.html similarity index 88% rename from years/2020/logbook.html rename to years/2021/logbook.html index 0ee9ac70b..f74293438 100644 --- a/years/2020/logbook.html +++ b/years/2021/logbook.html @@ -6,7 +6,7 @@ -

CUCC Expo Logbook 2020

+

CUCC Expo Logbook 2021

frontispiece

@@ -15,7 +15,7 @@
-
2020-07-07
+
2021-07-07
author, lis, of, comma, separated, people
LOCATION - The rest of the title
diff --git a/years/2020/mission.html b/years/2021/mission.html similarity index 89% rename from years/2020/mission.html rename to years/2021/mission.html index fa9bb4943..66ffa5ba8 100644 --- a/years/2020/mission.html +++ b/years/2021/mission.html @@ -4,10 +4,11 @@ -

Expo 2020

-

2020 Mission Statement

-

Caving targets

-

This year’s aims are to continue pushing leads from Balkonhoehle, and possibly Fischgesicht and Keinewassermelon.
+

Expo 2021

+

2021 Mission Statement

+

Caving targets - placeholder pending discussion

+

This year’s aims are to continue pushing leads from Balkonhoehle, and possibly Fischgesicht +and Keinewassermelon.


Map of caves, categorised by date of discovery - credit K. Bender

diff --git a/years/2020/whoandwhen.html b/years/2021/whoandwhen.html similarity index 96% rename from years/2020/whoandwhen.html rename to years/2021/whoandwhen.html index bdb639c76..79d0a5280 100644 --- a/years/2020/whoandwhen.html +++ b/years/2021/whoandwhen.html @@ -1,6 +1,6 @@ -Expo 2020: Who and When +Expo 2021: Who and When