Merge server-side changes

noinfo/make-folklist.py

@@ -148,13 +148,13 @@ print "%s (%d expos)," % (recordholders[0][1],recordholders[0][0])
 for r in recordholders[1:k]:
 	print "%s (%d)," % (r[1],r[0]),
 
-print """and %s (%d). Mark Shinwell holds the record for consecutive
-expo attendance (10), but didn't actually go caving on all those, so
-this record arguably falls to Julian Haines and Brian Outram (9 each).
-A more obscure record was set by Wadders in 2015: longest interval 
-between expos (17 years), except that he didn't actually go underground, 
-so it may be shared by Mark Dougherty, Juliet Morse and Chris Densham, 
-who have all returned after gaps of 13 years</p>""" % (recordholders[k][1],recordholders[k][0])
+print """and %s (%d). Julian Todd holds the record for consecutive
+expo attendance (10), (along with Mark Shinwell, but he didn't actually
+go caving on all of those visits).  A more obscure record was set by Wadders
+in 2015: longest interval between expos (17 years), except that he
+didn't actually go underground, so it may be shared by Mark Dougherty,
+Juliet Morse and Chris Densham, who have all returned after gaps of 13
+years</p>""" % (recordholders[k][1],recordholders[k][0])
 
 
 print """<p>Outside-expo caving has started, with Becka Lawson, Neil Pacey, Julian Todd and Wookey

years/2016/logbook.html

@@ -190,7 +190,7 @@ from the right & a squeeze over a 4m drop at the bottom but we had no rope l
 <div class="callout">22:00</div>
 
 <div class="tripdate" id="t2016-06-28a">2016-06-28</div>
-<div class="trippeople">Olly, <u>Jenny<</u>/div>
+<div class="trippeople">Olly, <u>Jenny</u></div>
 <div class="triptitle">2007-71, 15-02B</div>
 
 <p>Olly rigged down 15-02B. Sadly it ended about where the final disto leg of 2015
@@ -208,7 +208,7 @@ off it, but not really an actual cave.</p>
 <div class="timeug">T/U: 2.5 hours</div>
 
 <div class="tripdate" id="t2016-06-28b">2016-06-28</div>
-<div class="trippeople">Olly, <u>Jenny<</u>/div>
+<div class="trippeople">Olly, <u>Jenny</u></div>
 <div class="triptitle">76 rigging</div>
 
 <p>Took the first rope in to 76 to make a start on the rigging. I've barely rigged in years, and
@@ -292,10 +292,13 @@ only up to 50m (the one we used the day before was 100m) so we de-rigged and cam
 <div class="callout">08:00 +1</div>
 
 <div class="tripdate" id="t2016-07-01c">2016-07-01</div>
-<div class="trippeople">Olly, Jenny</div>
+<div class="trippeople">Olly, <u>Jenny</u></div>
 <div class="triptitle">76 - Rigging</div>
+<p>Back into 76 to continue rigging. Olly continued where I left off starting the 65m rope at The Ledge. This year we rigged along the ledge side, with a deviation on the Test Tubes side. This was a good success - it uses fewer hangers, is easier and quicker to pass and hangs better. Olly rigged tightly - the Y-hang at The Ledge Below The Ledge was temporarioly a single hang with a deviation. I was about to complain about the tightness of the rigging when Olly shouts up from Yesterday's Terminus that he has got to the end of the rope and could I feed 2m of slack through! I wasn't convinced there was 2m of slack rope in the whole cave let alone at this pitch. Anyway I converted the comfortable Y-hang to a single hanger with deviation, then the rope just reaches. We realised this wasn't very workable, but also a knot pass isn't good in a trade route rig. So we headed out to rethink.
+</p>
 <p>Callout book entry</p>
 <div class="callout">20:00</div>
+<div class="timeug">3.5 hrs</div>
 
 <div class="tripdate" id="t2016-07-02a">2016-07-02</div>
 <div class="trippeople">David, Roshni</div>
@@ -325,6 +328,12 @@ Nat 2 hours<br>
 Haydon 2 hours (extra reinforcement at the surface) 
 </div>
 
+<div class="tripdate" id="t2016-07-02c">2016-07-02</div>
+<div class="trippeople"><u>Jenny</u></div>
+<div class="triptitle">76 - Plugged Shaft ropework</div>
+<p>We came up with a plan of starting with our one remaining thick rope (29m) and shift everything else down accordingly. Olly needed a day to rest his knees, so I spent the day untying and re-tying knots in Plugged Shaft. On the second go I got the 29m to reach the second of the twin rebelays (31m would be better). Then the 65m reached Yesterday's Terminus (again a few m more would have been better). Then the 48m comfortably reached the bottom of Saved Shaft. I tweaked some of the lengths on my way out. Today the weather Gods smiled on me, and I got my gear dry before theheavy rain started.</p>
+<div class="timeug">T/U:4.5 hrs</div>
+
 <div class="tripdate" id="t2016-07-03a">2016-07-03</div>
 <div class="trippeople">Andrew, Becka, Luke</div>
 <div class="triptitle">Tunnocks - Champagne on Ice</div>
@@ -349,6 +358,13 @@ Haydon 2 hours (extra reinforcement at the surface)
 <p>Callout book entry</p>
 <div class="callout">22:00</div>
 
+<div class="tripdate" id="t2016-07-03e">2016-07-03</div>
+<div class="trippeople">Olly, <u>Jenny</u></div>
+<div class="triptitle">76 - Keg Series</div>
+<p>Much wetter in Plugged Shaft today, but totally passable. Got to Boulder Chamber and Olly started to rig Keg Series. We were last here in 2004, despite me remembering which rope we rigged it on then, I had no idea on the actual rigging details. Olly started from the Follow Thru' Shaft end. I had a go and concluded that was wrong. I also concluded that the original rig needed bolts adding, was loose and looked pretty drippy. So we decided to change plan and rig down Follow Through Shaft, then go down the Adventures in Time and Space route to the bottom of Keg Series (last visited by us and Dave Loeffler in 2005). Again we were hazy on the rig.</p>
+<p>I was happy that the traverse had been left rigged at the top and was only a bit drippy. Olly rigged down for a bit then I took over, eventually finding a suitable deviation for the final bit. Last 10m or so was drippy (but less bad with the deviation in). I had a quick look in Razor Advance while Olly came down. Keg Series was very wet and drippy, but Razor Advance was dry, so we left the drill and survey kit there and headed out. When tired and unfit it took just over 2 hrs out.
+<div class="timeug">T/U:8.25 hrs</div>
+
 <div class="tripdate" id="t2016-07-04a">2016-07-04</div>
 <div class="trippeople">7 people in Balcony (Frank + everyone)</div>
 <div class="triptitle">Balcony - Tour + trip</div>
@@ -437,10 +453,33 @@ next party. We met the team in question at the camp whilst eating our pre exit d
 <p>Many thanks to all the EXPO members who organised a very efficient rescue!</p>
 <div class="timeug">T/U: T/U 77 hours</div>
 
+<div class="tripdate" id="t2016-07-07c">2016-07-07</div>
+<div class="trippeople"><u>Jenny</u>, Olly</div>
+<div class="triptitle">76 - Keg Series</div>
+<p>Headed into Razor Advance with drill, rope and survey kit to see what happened next. On the way in we had switched the rope in Adventures in Time and Space for the 72m - a few m longer would be better. We also added a bolt to protect the traverse across to the rope up to Razor Advance (but there was insufficient rope to add a backup).</p>
+<p>Followed the rift on, and it quickly became apparent that the rope was needed. Olly put in a few bolts and we got further along the rift to a nice spot to descend, a Y-hang gave a lovely hang - this is an inlet into a much larger cross rift. Water comes out on the right part way down - it seems likely that this is the Keg Series water from the size and position. Pitch is slightly drippy but not too bad in dry weather - who knows in wet weather. At the bottom is a huge block that has fallen from the roof. Way on is down stream in a canyon. We followed at stream level round some corners, past a narrower bit and a couple of climbs to a short drop that didn't look climbable. Went back to a higher level that had a phreatic roof and was sometimes a separate passage. Got slightly further, but again to a not free-climbable drop. Attempted to survey out, but after a couple of legs realised the disto wasn't properly calibrated (we discovered this quickly thanks to Andrew's advice to take three readings of a leg in different directions every so often). Gave up and exited.</p>
+<div class="timeug">T/U: 10.5 hours</div>
+
+<div class="tripdate" id="t2016-07-08a">2016-07-08</div>
+<div class="trippeople"><u>Jenny</u>, Olly</div>
+<div class="triptitle">171 survey</div>
+<p>I'd noticed that 171 was a moderately sized cave on the plateau that was unsurveyed, so decided it was a nice job for a rest day. To make life easier just took helmets, clothing and survey kit. We'd spent the morning successfully recalibrating the distox2 inside the bivi cave. Started at 171a and surveyed to 171b - a nice phreatic passage with multiple skylights. A low bit in the middle. Continued a bit beyond the "b" entrances, but decided to return to finish with oversuits.</p>
+<div class="timeug">T/U: 2.5 hours</div>
+
+<div class="tripdate" id="t2016-07-09a">2016-07-09</div>
+<div class="trippeople"><u>Jenny</u>, Olly</div>
+<div class="triptitle">16-JB-01 Hohle der guten Hoffnung</div>
+<p>Intended to go back and finish surveying 171, so took ovesuits, kneepads as well as helmets and survey kit. Olly wanted to try a different route to walk there so headed past 2006-70 and up from there. I saw a few shafts and had to have a peer down each one. Near the local high point was an especially interesting hole. I climbed down the 3m climb into the snowfilled shakehole, at the S end a key hole passage led off. I followed the top of it, in lovely solid clean white rock, down a couple of climbs and with a draft. Very exciting! </p>
+<p>I went out to get my oversuit, kneepads, survey kit and Olly. We returned and descended a couple more climbs. This reached a harder climb down to a ledge overlooking a larger chossy chamber. Olly traversed round to get a better look and realised this was also free climbable.</p>
+</p>The chamber was drippy and full of loose rocks. Down a climb to the bottom end led to a squeeze overlooking a dirty snow plug. Back at the climb a pitch goes back underneath - this is undescended. Surveyed out. Cave drops a surprising 40m (over 80m of survey) all descended without gear.</p>
+<div class="timeug">T/U: 3 hours</div>
 
 <div class="tripdate" id="t2016-07-10a">2016-07-10</div>
-<div class="trippeople">Olly, Jenny</div>
+<div class="trippeople">Olly, <u>Jenny</u></div>
 <div class="triptitle">171, near old top camp - surveying</div>
+<p>Headed to 171 with oversuits and kneepads to finish the survey. On phoning basecamp discovered that the camping team were overdue, but that things were in hand, and there was nothing we could do in the short term. Took the phone with us to get updates.</p>
+<p>Started at 171a and surveyed down to the final daylight entrance. Heard the rescue helicopter, which worried us, but no message from basecamp, so we continued. Went down the wide but low and breakdwon-y side passage. This continued to pop out 2/3 of the way down a day light shaft. Headed out after surveying this, and failed to identify the daylight entrance from the surface - it must be a narrow gryke by the surface.</p>
+<p>Headed to 171b and surveyed north along a slightly drafty passage - there is a parallel rift on the rift with a snow patch and another daylight aven. There is a small passage doubling back here that we didn't thoroughly explore, because we assumed it would trivially reconnect. The main passage finally ends at a low drafting (out) choke. Looking at the survey shows this is very close to the end of [gap in logbook, probably meant 250]. Got a text message reporting from basecamp the camping team were safe which was a relief. Olly cancelled our callout (by phone) which unfortunately didn't make the call out book. So team rescue very efficiently came down to our camp to check we were safe - thank you!</p>
 <p>Callout book entry. Have rope + spare drill battery on surface if needed</p>
 <div class="callout">20:00</div>
 
@@ -474,6 +513,15 @@ next party. We met the team in question at the camp whilst eating our pre exit d
 <p>Callout book entry.</p>
 <div class="callout">22:00</div>
 
+<div class="tripdate" id="t2016-07-11f">2016-07-11</div>
+<div class="trippeople"><u>Jenny</u></div>
+<div class="triptitle">76 - Atomic</div>
+<p>Olly's knees were recovered enough to cope with prussicking, so we returned to Keg Series with the now happily calibrated distox2. Started surveying in to get the pitch done, in case it rained later, or it took a while. Happily got it first time and in 1 leg. From the bottom followed the stream to the drop, and Olly rigged down. *IMPORTANT: this hilti is not properly set*. I've marked a nil polish slash across it. If anyone goes there again, please set it first, or else rig from higher (probably better).</p>
+<p>The rift continues beyond this, at stream level it is tight, but higher is much wider. Shortly the roof drops down to the wide level, and it becomes the phreatic roof tube of a very tall keyhole passage. I stopped following this when it reached some loose looking perched rocks above a climb. I retreated and wriggled along at stream level, down a drop and through some bits narrower than my helmet. Reached the base of the climb I'd looked down on, and ascertained that it was climbable and the rocks were well wedged Climbed up to get the survey kit and Olly. Again followed ledges above the stream until the roof dropped down, and we reached another drop. This was wider but not freeclimbable.</p>
+<p>Surveyed out. I derigged to Keg Series and left the rope bag at the Tap Room. Took the drill bag all the way home.</p>
+<p>As we were ascending Follow Through Shaft, we heard a low rumbling noise, it sounded like people coming - I wondered if we had a callout mix up, and people were coming to rescue us. Then the rumbling got louder, and louder and it became apparent it was raining. Fortunately we were past the Tap Room and Keg Series, so had an uneventful exit.</p>
+<div class="timeug">T/U: 12 hours</div>
+
 <div class="tripdate" id="t2016-07-12a">2016-07-12</div>
 <div class="trippeople">Nat, Becka, George</div>
 <div class="triptitle">Tunnocks - Champagne on Ice</div>

years/2017/whoandwhen.html

@@ -2,13 +2,30 @@
 <head>
 <title>Expo 2017: Who and When</title>
 <link rel="stylesheet" type="text/css" href="../../css/main2.css" />
+<style type="text/css">
+<!--
+table.fancy	{ border-collapse: collapse; border: 2px solid black } 
+table.fancy td	{ border: 1px solid black; padding: 2pt }
+table.fancy td.nonempty { background: #eee }
+-->
+</style>
 </head>
 
 <body>
 <h1>Expo 2017: Who and When</h1>
 
-<p>This page says who is coming, when and how. Fill yourself in in the top who/dates table. Use the 'Edit page' button to the left. Hopefully the formatting is fairly obvious</p>
-<table style="width:100%">
+<p>This page says who is coming, when and how.</p>
+
+<p>Fill yourself in in the top who/dates table. Hopefully the formatting is fairly obvious.</p>
+
+<h3>Howto</h3>
+
+<p>Use the 'Edit this page' button to the left. You will need to log in to do that. Clicking will show a login page if you are not yet logged in. Log in as 'expo' with the normal expo 'cavey:beery' password (ask someone in person or by phone call, or other secure means (not uncrypted email or SMS) if you don't know it - it's important that it's never put in plain-text email, because if it is this site/machine will get hacked).</p>
+
+<p>You can also edit this page like any other on the website using mercurial or tortoise hg if you have that set up (see Expo Handbook for details)</p>
+
+<h2>People</h2>
+<table class="fancy">
   <tr>
     <th>Name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
     <th>Duration&nbsp;&nbsp;&nbsp;&nbsp;</th>
@@ -36,6 +53,18 @@
   <tr>
     <td>Some One</td>
     <td>2 weeks</td>
+    <td>maybe</td>
+    <td>yes</td>
+    <td>maybe</td>
+    <td>no</td>
+    <td>no</td>
+    <td>no</td>
+    <td></td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Some One Else</td>
+    <td>2 weeks</td>
     <td>no</td>
     <td>no</td>
     <td>no</td>
@@ -47,5 +76,48 @@
   </tr>
 </table>
 
+
+<h2>Transport</h2>
+
+<p>Fill in modes and dates if known</p>
+
+<h3>List of vehicles</h3>
+<ul>
+<li><b>Car 1</b>: Elaine's Car/Van</li>
+<li><b>Car 2</b>: Eliott's Van</li>
+</ul>
+
+<table class="fancy">
+  <tr>
+    <th rowspan="2">Who&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
+    <th colspan="2">Out</th>
+    <th colspan="2">Back</th>
+    <th rowspan="2">Comments</th>
+  </tr>
+  <tr>
+    <th>Mode</th>
+    <th>Date</th>
+    <th>Mode</th>
+    <th>Date</th>
+  </tr>
+  <tr>
+    <td>Elaine Oliver</td>
+    <td>Jul 8</td>
+    <td>Car 1</td>
+    <td>Aug 12</td>
+    <td>Car 1</td>
+    <td>Out and back in Elaine's Car/van</td>
+  </tr>
+  <tr>
+    <td>Some One</td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td></td>
+  </tr>
+
+</table>
+
 </body>
 </html>