diff --git a/TODO b/TODO index fc1c1d8c5..48c72f172 100644 --- a/TODO +++ b/TODO @@ -1,14 +1,2 @@ -Add missing images to logbooks from -2000, 2008, 2009, 2011 -fix corrupted image in 2001 log - -2011 logbook: -type up via-ferrate & bolt-testing writeups (In paper book, not in scan or HTML) - -200 logbook: -Type up "list of GPS locations still to type" - -2019 -transcribe the rest of those blog entries into expoweb/years/2019/logbook.html -copy the photos from the UKCaving blog into expofiles/photos/2019// -- in fact many of those photos are already there -edit in the links to those photos in the right place in 2019/logbook.html \ No newline at end of file +everything here moved to handbook/computing/x-todo.html +Philip Sargent 2020/03/28 \ No newline at end of file diff --git a/folk/to-do/benvanmillingen-Jan1982.jpg b/folk/i/benvanmillingen-Jan1982.jpg similarity index 100% rename from folk/to-do/benvanmillingen-Jan1982.jpg rename to folk/i/benvanmillingen-Jan1982.jpg diff --git a/folk/l/benvm.htm b/folk/l/benvm.htm index 8776256db..f5a779973 100644 --- a/folk/l/benvm.htm +++ b/folk/l/benvm.htm @@ -1,13 +1,22 @@ - + - + CUCC Expo member: Ben van Millingen + +

CUCC Expedition Handbook

+ +

Ben van Millingen

+ +

+ + + Ben van Millingen, Queens' 1976-79 (Tacklemaster 1978-79).
Expedition 1978, 1979, 1980, 1983.
@@ -16,10 +25,15 @@ Explored Gemsehöhle (1623/107) in and worked in the Stellerwegsystem (1623/41) and 1623/87 in 1980. Wolfhöhle (1623/145) was the main -venue in 1983.
-Photo taken in Hall of the Greene King in Eislufthöhle.

+venue in 1983. +

+Photo (right) taken in Greenclose, New Year meet Jan. 1982.

+

+Photo (left) taken in Hall of the Greene King in Eislufthöhle.

-

Photo © Andy Waddington, 1979

+ + +

Photo (left) © Andy Waddington, 1979

diff --git a/handbook/computing/x-todo-styles.css b/handbook/computing/x-todo-styles.css index 0869fb535..56064fa1a 100644 --- a/handbook/computing/x-todo-styles.css +++ b/handbook/computing/x-todo-styles.css @@ -55,30 +55,36 @@ h2, h3, h4 { margin-bottom: 0; } -ul:not(#links) li ul, ul:not(#links) ul { +dd { font: 18px Calibri, sanserif; font-weight: normal; - list-style-type: disc; + color: 6083BF; + #list-style-type: disc; line-height: 1.3; } +dd:before { + content: "- "; +} + /* Default State */ -ul:not(#links) { +dt { font: 20px Calibri, sanserif; font-weight: bold; color: 6083BF; margin-top: 0.4em; - margin-left: -1.2em; + #margin-left: -1.2em; + margin-left: 0; margin-right: 5em; - list-style-type: none; - line-height: 1.4; + #list-style-type: none; + line-height: 1.4; } /* Toggled State */ -input[type=checkbox] ~ ul:not(#links) li ul { - display: none; - } - input[type=checkbox]:checked ~ ul:not(#links) li ul { +input[type=checkbox] ~ dl dd { display: block; } + input[type=checkbox]:checked ~ dl dd { + display: none; + } diff --git a/handbook/computing/x-todo.html b/handbook/computing/x-todo.html index 1c0ae13f8..6cafcff1b 100644 --- a/handbook/computing/x-todo.html +++ b/handbook/computing/x-todo.html @@ -1,120 +1,206 @@ + Expo Systems Exptl. To-Do List -

Expo Systems Exptl. To-Do List

- - + + + + + + +

Experimental

+

Click on a sub-heading to hide and reveal the individual to-do items. If a heading is in italics, then there are hidden items. +

Edit this page by clicking on the big blue button. It uses the same "Edit this page" function that you may have used before. But this is not working yet. Please do not try as that will currently delete all the Javascript that makes the hide/reveal functions work. +

Taken from file on ::expoweb::/TODO

+
+
Add missing images to logbooks
+
+ 2000, 2008, 2009, 2011
+
+ fix corrupted image in 2001 log
+ +
2011 logbook:
+
type up via-ferrate & bolt-testing writeups (In paper book, not in scan or HTML)
+ +
200? logbook:
+
+ Type up "list of GPS locations still to type"
+ +
2019 Logbook
+
+ transcribe the rest of those blog entries into expoweb/years/2019/logbook.html
+
+ copy the photos from the UKCaving blog into expofiles/photos/2019// -- in fact many of those photos are already there
+
edit in the links to those photos in the right place in 2019/logbook.html
+ +
+

Documentation

- +
+
Document this to-do list thing
+
explain how clicking works
+ +
Wallets and new-cave
+ +
Explain (in the wallets process) how to view the surveys + online so that
  (1) you can see an example of how to do your new one, + and
  (2) so that you can check that you have done it properly when you + have finished.
+
Explain how to link a new cave into the other caves in + troggle filesystem
+ + +
Troggle architecture
+ +
Handbook: explain how troggle works - much better and simpler. Fix + mistakes I wrote. For future system maintainers
+
Copy the .wiki material into the documentation somewhere
+ + +
Surveyscans
+ +
explain where the image files are referenced from: svx, tunnel/therion, and
+
why there are so many broken links
+ + +

Photos

- + capitalisation of their names. +
Fix such duplicates in the /photos/ folders where this + problem originates
+
Document this issue of duplicate photo filenames produced by + multiple cameras running similar software
+
somehow fix the photo filenames which use capital letters on + import or upload, or by a cron job
+ + +

Surveys data entry

- +
+
2019 surveyscans + +
edit all the content.json
+
try to autocomplete the content.json by parsing .svx files
+
Put personal names into canonical form
+ + +

Troggle

Expo Server

- + + + +

This to-do-list gadget itself

- + + +
+ Testing area.. -
Demonstation as initially read from disc
+
Demonstation as initially read from disc
+ + + + - + +
diff --git a/scripts/make-folklist.py b/scripts/make-folklist.py index c3f5effe4..b9370737b 100755 --- a/scripts/make-folklist.py +++ b/scripts/make-folklist.py @@ -16,6 +16,8 @@ output = "" lines = sys.stdin.readlines() headcounts_byyear = [0]*(len(lines[0].split(","))-5) + + for r in lines[1:]: r = r.replace("\n","") r = r.replace("\r", "") @@ -31,7 +33,21 @@ for r in lines[1:]: if mug: pics +=1 output += '' if expos_caving == 0: output += '' - output += name.replace('""', '"') + + # Middle names still not working: MorvenBeranek-Stanley , Sarah Livia Zerbes + # Need to manage names e.g. Leif Hornsved (Nickname) => LeifHornsved + namevis = name.replace('""', '"').strip('"') + # Need to manage e.g.Olaf Kähler + # Need to manage e.g. Bal%26aacute%3BzsIzapy + nameurl = namevis.replace(' ', '') + nameurl = nameurl.replace('&', '%26') + nameurl = nameurl.replace(';', '%3B') + nameurl = re.sub('<[^>]*>','',nameurl) + nameurl = re.sub('\([^\)]*\)','',nameurl) # mostly noit needed, but is for Wookey + namelink= "" + namevis + "" + output += namelink + #output += name.replace('""', '"') + if expos_caving == 0: output += '' output += '' if guest: output += '§'