Merge

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,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,

handbook/logbooks.html

@@ -120,14 +120,22 @@ idea to type up <i>just your trip(s)</i> in a separate file, e.g. "logbook-mynew
 
 <p>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':</p>
 <code><pre>
+&lt;hr /&gt;
 &lt;div class="tripdate" id="t2007-07-12B"&gt;2007-07-12&lt;/div&gt;
 &lt;div class="trippeople"&gt;&lt;u&gt;Jenny Black&lt;/u&gt;, Olly Betts&lt;/div&gt;
 &lt;div class="triptitle"&gt;Top Camp - Setting up 76 bivi&lt;/div&gt;
 &lt;div class="timeug"&gt;T/U 10 mins&lt;/div&gt;</pre></code>
-<p>Note that the ID's must be unique, so are generated from 't' plus the trip date plus a,b,c etc. 
+<p>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.</p>
-<p>T/U stands for "Time Underground" in hours (6 minutes would be "0.1 hours").
+<p>Note: T/U stands for "Time Underground" in hours (6 minutes would be "0.1 hours").
+<p>Note: the &lt;hr /&gt; is significant and used in parsing, it is not just prettiness.
 
+<p>[ Yes this format needs to be re-done using a proper structure:<br>
+<code><pre>
+&lt;div class="logentry"&gt;<br>
+<span style="text-decoration: line-through wavy red;">&nbsp;&nbsp;&nbsp;&nbsp;</span>
+&lt;/div"&gt;</pre></code>
+it's on the to-do list...]
 <hr />
 <h3 id="history">Historical logbooks</h3>
 <p>Older logbooks (prior to 2007) were stored as logbook.txt with just a bit of consistent markup to allow troggle parsing.</p>

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.</p>
 
-<p>Although few take such statistics seriously, the most dedicated expoers are """ % (headcount, pics)
+<p>Although few take  <a href="/people">such statistics</a> seriously, the most dedicated expoers are """ % (headcount, pics)
 
 recordholders.sort()
 recordholders.reverse()

years/2012/logbook.html

@@ -962,7 +962,7 @@ Had an explore, realised the 1978 survey has the wrong angle for the side passag
 <div class="trippeople">OllyB, <u>Jenny</u>, Stuart B</div>
 <div class="triptitle">Eish&ouml;hle Tourist Trip</div>
 
-<p>[Accompanied by non-expo  Terry & Annette.]
+<p>[Accompanied by non-expo  Terry Betts (Olly's father) & Annette.]
 <p>Walked down from our bivi to meet the others at the Stogerweg junction. Walked (slowly) to Eish&ouml;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.</p>
 
 <p>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 &Oslash; - fortunately we had helmets on!</p>

years/2014/logbook.html

@@ -536,7 +536,6 @@ Route finding through Knossos/Star Wars/Tower Blocks proved to be a bit more tri
 <div class="trippeople"><u>Holly</u> &amp; Callum, Joe</div>
 <div class="triptitle">107 - Land of Confusion</div>
 
-<p>[Logbook clearly says "Callum" but there is no one of that name registered. ]
 <p>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 &amp; find a new way in, in the Land of Confusion. We headed over the big pitch &amp; 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.</p>
 <p><u>Note:</u> 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 &amp; 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:</p>
 <p><img src="./logbkimg14.png" alt="Rigging sketch for rift somewhere between 'Coldest Place on Earth' and 'Restless'"></p>

years/2015/logbook.html

@@ -568,10 +568,10 @@ entrance, and ~25m above the level of the Razordance sump, which helps explain w
 quite tired.</p>
 
 <div class="timeug">T/U: 14 hrs</div>
-<hr>
+
   <p><img src="logbkimg14.jpeg" alt="Rigging topo for below Procrastination"></p>
   <p><img src="logbkimg15.jpeg" alt="Rigging topo from Inferno down"></p>
-<hr/>
+
 
 <hr />
 <div class="tripdate" id="t2015-07-26a">2015-07-26</div>

years/2018/logbook.html

@@ -581,7 +581,6 @@ and Snail Trail Traverse (20m after Snail Trail climb)<br>
 <p>[See <a href="#t2018-07-26h">continuing Mongol Rally rigging guide</a>]</p>
 <div class="timeug">T/U: 11.5 hours</div>
 
-<hr />
 <hr />
 <div class="tripdate" id="t2018-07-20a">2018-07-20</div>
 <div class="trippeople"><u>Nadia</u>, Adam A</div>
@@ -1066,6 +1065,7 @@ constriction. No noticeable draft after the constriction.
 to find we weren't the first ones there.
 
 <div class="timeug">T/U: 3 hours</div>
+
 <hr />
 <div class="tripdate" id="t2018-07-28b">2018-07-28</div>
 <div class="trippeople"><u>Max</u>,Nadia, Luke, Olly</div>
@@ -2031,7 +2031,6 @@ This has been transcsribed into <a href="ugcamplist.html">ugcamplist.html</a><br
 <p>Arrived at Pitstop to find George who was in the group in front to have finished bolting the traverse around to the other side. Passage was large walking passage with nice mud formations in floor. Passage ends at a pitch  with a dodgy bridge. Half way-ish between the traverse and pitch was a flatout crawl on right. Crawl was unpleasant and sharp (I forgot kneepads!!) and was sloped upwards. Passage (including crawl unitil become too tight) was surveyed. <p>Pitch wasn't dropped. <p>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.</p>
 <div class="timeug">T/U ? mins</div>
 
-<hr />
 <hr />
 <div class="tripdate" id="t2018-08-13a">2018-08-13</div>
 <div class="trippeople"><u>Philip Sargent</u></div>
@@ -2097,7 +2096,7 @@ me a lift to the potato hut and I showed him the posters and aven. (He also has
 <div class="triptitle">"Receipt for expo members of VfHO for 2018"</div>
 
 <img src="vfho-receipt.jpg" width=400px><br><br><br> from Robert Seebacher
-<hr />
+
 <hr />
 <div class="tripdate" id="t2018-08-15">2018-08-15</div>
 <div class="trippeople"><u>Chris Holt</u>, Radost, Luke, Max</div>