diff --git a/folk/folk.csv b/folk/folk.csv index 16a35c19a..529282bac 100644 --- a/folk/folk.csv +++ b/folk/folk.csv @@ -31,6 +31,7 @@ Robert Bloodworth (Bob Bloodworthy),Bloodworth,1,,i/bobb.jpg,,,,,,,,,,,,,,,,,,,1 Ryan Boultbee,Boultbee,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,, John Bowers,Bowers,,,i/jab.jpg,,,1,1,1,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, Holly Bradley,Bradley,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,1,1,1,1,,,,,, +Callum Braithwaite,Braithwaite,1,,i/callum.jpg,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,, George Breley,Breley,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,1,, Michael Brigham,Brigham,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1, Dave Brindle,Brindle,,,l/daveb.htm,,,,,,1,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/folk/i/callum.jpg b/folk/i/callum.jpg new file mode 100644 index 000000000..2f99b87fc Binary files /dev/null and b/folk/i/callum.jpg differ diff --git a/handbook/logbooks.html b/handbook/logbooks.html index bd1fc86cc..43e7e3b5f 100644 --- a/handbook/logbooks.html +++ b/handbook/logbooks.html @@ -120,14 +120,22 @@ idea to type up just your trip(s) in a separate file, e.g. "logbook-mynew
Do whatever you like to try and represent the logbook in html. The only rigid structure is the markup to allow troggle to parse the files into 'trips':
+<hr />
<div class="tripdate" id="t2007-07-12B">2007-07-12</div>
<div class="trippeople"><u>Jenny Black</u>, Olly Betts</div>
<div class="triptitle">Top Camp - Setting up 76 bivi</div>
<div class="timeug">T/U 10 mins</div>
-Note that the ID's must be unique, so are generated from 't' plus the trip date plus a,b,c etc. +
Note: the ID's must be unique, so are generated from 't' plus the trip date plus a,b,c etc. when there is more than one trip on a day.
-T/U stands for "Time Underground" in hours (6 minutes would be "0.1 hours"). +
Note: T/U stands for "Time Underground" in hours (6 minutes would be "0.1 hours"). +
Note: the <hr /> is significant and used in parsing, it is not just prettiness. +
[ Yes this format needs to be re-done using a proper structure:
+
+it's on the to-do list...]
+<div class="logentry">
+
+</div">
Older logbooks (prior to 2007) were stored as logbook.txt with just a bit of consistent markup to allow troggle parsing.
diff --git a/photos/callum.jpg b/photos/callum.jpg new file mode 100644 index 000000000..2f99b87fc Binary files /dev/null and b/photos/callum.jpg differ diff --git a/scripts/make-folklist.py b/scripts/make-folklist.py index 3537c25ed..9496e7d56 100755 --- a/scripts/make-folklist.py +++ b/scripts/make-folklist.py @@ -153,7 +153,7 @@ print """ taken part in expo altogether (not counting non-combatants or vehicles(!)), of whom %d have their pictures on the site so far. -Although few take such statistics seriously, the most dedicated expoers are """ % (headcount, pics) +
Although few take such statistics seriously, the most dedicated expoers are """ % (headcount, pics) recordholders.sort() recordholders.reverse() diff --git a/years/2012/logbook.html b/years/2012/logbook.html index a549f390c..8e8fa45e1 100644 --- a/years/2012/logbook.html +++ b/years/2012/logbook.html @@ -962,7 +962,7 @@ Had an explore, realised the 1978 survey has the wrong angle for the side passag
[Accompanied by non-expo Terry & Annette.] +
[Accompanied by non-expo Terry Betts (Olly's father) & Annette.]
Walked down from our bivi to meet the others at the Stogerweg junction. Walked (slowly) to Eishöhle. It was very hot and took hours, eventually got to the Ice Tunnel entrance which had less ice than Olly remembered. The bolts were almost out of reach! All got down and admired the ice.
On the way back removed the deviation hangs from the old 40A bivi. It took a long time, and we got back to the car as it got dark. Stuart kindly took Terry + Annette back to basecamp, while we walked back to our bivi. Got caught in a big thunderstorm - hail stones nearly 1 cm Ø - fortunately we had helmets on!
diff --git a/years/2014/logbook.html b/years/2014/logbook.html index d10958f78..5e2fa842a 100644 --- a/years/2014/logbook.html +++ b/years/2014/logbook.html @@ -536,7 +536,6 @@ Route finding through Knossos/Star Wars/Tower Blocks proved to be a bit more tri[Logbook clearly says "Callum" but there is no one of that name registered. ]
The weather was rubbish - rain, rain, rain. It was understood that the large pitch into China would be too wet to descend, so we went in to try & find a new way in, in the Land of Confusion. We headed over the big pitch & into LoC. Here one drops a short pitch (~6m or so), then climbs up the same height to on-going passage on the other side.
Note: at the bottom of this pitch is another pitch - dry (13-LC-16A). Perfect for someone who wants bolting practice. On the main passage, Joe ran ahead to scope out the leads (pitches) that are understood to also lead to China. Joe found lead 13-LC-2C to be dry, so we attempted to rig here. Unfortunately all the rock was cheese. Eventually, after a lot of trying, we decided that it would be a project that needed more work & wouldn't be worth it. So we headed out, but rigged a traverse on the rift somewhere between 'Coldest Place on Earth' and 'Restless' as follows:



[See continuing Mongol Rally rigging guide]
Pitch wasn't dropped.
We then head back to Pitstop and then attempt to bolt a rift but then the floor fell beath and scared me and we decided to call it a day.
