From 9d3dab1aaf7a04dc46049e7d4fe657025ac70152 Mon Sep 17 00:00:00 2001 From: expouser Date: Wed, 26 Jun 2013 17:20:27 +1200 Subject: [PATCH 1/6] More logbook update. Jenny --- years/2012/logbook.html | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/years/2012/logbook.html b/years/2012/logbook.html index e33109d2c..a96b3708e 100644 --- a/years/2012/logbook.html +++ b/years/2012/logbook.html @@ -210,7 +210,36 @@ Derigged back to entrance chamber and began to survey out. Checked the bottom of Surveyed back to entrance chamber, and left the cave.

T/U: Jenny 7hrs, Olly 6:50
- + +
2012-08-12
+
OllyB, Jenny
+
83 - Under a Rock, Down Under
+

+Went back into Under a Rock and dropped the pitch. The bottom was a tall rift, up didn't go far, the way the water flows rapidly got too narrow. We followed the 3rd way on, up a short climb and down the other side (via a bolt). We scrambled further down and down some more to find ourselves back at the bottom of the p32. Olly was amused at where we were, I was annoyed. But at least our loop closure was good! +

+Went back to entrance chamber to survey out. Olly spotted a hole thru' some rocks. It drafted so we pulled some rocks out. We couldn't easily make the gap big enough, so tried a meter or so higher up. I managed to get through, and amazingly got under and through a window into another passage underneath Down Under, removed more rocks so Olly could follow me through. Followed the passage past a squeeze and a climb down. Found ourselves above a reasonable sized passage ~5m above. Didn't look climbable down, but I could traverse over. Did this to another 6m drop into the same passage, but excitingly could see a snow plug. We wondered if this was 107. Surveyed out and up to the tag bolt. +

+Scrambled in 107 on the way back and saw a similar looking snow plug. Down the hill the survey data confirms we connected! Not as impressive as The Connection, but we have made 107 ~9m deeper (by the CUCC way) and ~500m longer. +

+
TU: 7:40hrs Jenny, 7:30hrs Olly
+ +
2012-08-15
+
OllyB, Jenny
+
83 - derig and survey
+

+Went back to 83 for the actual final trip. I retrieved the rigging gear while Olly sketched the entrance chamber. I derigged and swung across to look at side tubes. One near the top generated another ~15m of passage. +

+Finished de-rigging. [rigging diagram in original] +

+
2.5hrs + +
2012-08-15
+
OllyB, Jenny
+
148 rig
+

+Went to 148 and rigged in the first 4 pitches (i.e. to just before deep space). I'd forgotten how cold and drafty 148 is. +

+
2.5hrs
From 24d9ffd209bae7fc86dd1bcbbe2b28b88560ed7e Mon Sep 17 00:00:00 2001 From: expouser Date: Wed, 26 Jun 2013 17:24:42 +1200 Subject: [PATCH 2/6] fix logbook error. jenny --- years/2012/logbook.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/years/2012/logbook.html b/years/2012/logbook.html index a96b3708e..9d099b2af 100644 --- a/years/2012/logbook.html +++ b/years/2012/logbook.html @@ -231,7 +231,7 @@ Went back to 83 for the actual final trip. I retrieved the rigging gear while Ol

Finished de-rigging. [rigging diagram in original]

-
2.5hrs +
2.5hrs
2012-08-15
OllyB, Jenny
From 0eb3c0d96d929af105a7b6b22dd63ad0c5af3963 Mon Sep 17 00:00:00 2001 From: expouser Date: Wed, 26 Jun 2013 17:35:38 +1200 Subject: [PATCH 3/6] Another log book entry. Jenny --- years/2012/logbook.html | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/years/2012/logbook.html b/years/2012/logbook.html index 9d099b2af..9b48bd22a 100644 --- a/years/2012/logbook.html +++ b/years/2012/logbook.html @@ -231,7 +231,7 @@ Went back to 83 for the actual final trip. I retrieved the rigging gear while Ol

Finished de-rigging. [rigging diagram in original]

-
2.5hrs
+
T/U: 2.5hrs
2012-08-15
OllyB, Jenny
@@ -239,7 +239,17 @@ Finished de-rigging. [rigging diagram in original]

Went to 148 and rigged in the first 4 pitches (i.e. to just before deep space). I'd forgotten how cold and drafty 148 is.

-
2.5hrs
+
T/U: 2.5hrs
+ +
2012-08-17
+
OllyB, Jenny
+
148 rigging
+

+Went to 148 with 100+m of rope, hangers and a drill. Tweaked the rigging on the way in to add a bolt on pitch 2 -> clowns are a poor hanger choice for free hanging rebelays! Also changed natural backups and things. Olly rigged down deep space (and hated using a stop more than hating using a rack) After much swinging about with too much gear he gave up looking for the deviation and came back up. I had a go and managed to find it eventually - a sling on a nose of rick behind you. Must be more than 5 years since I last rigged but I mostly remembered what to do. Except I was slow and failed to find the next few bolts. Safely got to the asteroid belt and found more bolts. Olly came down too and we rigged on to the pushing front. Olly found the missing bolts on the way out. +

+The pitch heads are nasty and tight, but things look better deeper down. Got out surprisingly fast (1hr 40) despite bimbling. +

+
T/U: 6.5hrs
From 6a2cf01fe4968d9a7067389b2f59e647d7d5ad32 Mon Sep 17 00:00:00 2001 From: expouser Date: Thu, 27 Jun 2013 12:38:17 +1200 Subject: [PATCH 4/6] Fix my log book entries form overwriting Wookeys. Jenny --- years/2012/logbook.html | 42 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/years/2012/logbook.html b/years/2012/logbook.html index 9b48bd22a..ba6d54b44 100644 --- a/years/2012/logbook.html +++ b/years/2012/logbook.html @@ -210,6 +210,48 @@ Derigged back to entrance chamber and began to survey out. Checked the bottom of Surveyed back to entrance chamber, and left the cave.

T/U: Jenny 7hrs, Olly 6:50
+ +
2012-08-10
+
Wookey, Rob
+
204/161 Connection traverse re-rigging + push +in 161
+
T/U: 17hrs
+ +

Went down to the connection to turn the 'exploratory' rigging into +something suitable for mere mortals. Took drill + 3batteries + hand +bolting kit & leftover nasty red ropes. Spent some hours re-doing the +1st traverse to go higher along line of shelf. Rob did all the +bolting & seemed to enjoy himself. Added 3 or 4 there, another on +up-bit to remove rub & Y-hang the end. Only possible by replacing +27m white rope with red as we went. Then put rope on climb and 2 more +bolts in 2nd traverse. Went to the bad step which was already bolted +& put in climb line & traverse line over bridge + step. All +this took quite some time so it was getting late & our enthusiasm +somewhat dimmed, but we should at least take a look-see having got +here. Headed on down March of the ents, noting that most of the wind +came in from the 50m pitch QM - Interesting spot. Carried on to +rivendell & the stables and rigged little climb round the corner +on a couple of dodgy naturals. Didn't have enough rope to do it +properly (or the enthusiasm).

+ +

Wandered along a bit and took a look down QM [fill in] which had a +fine breeze at the top. Very silly sloping 'pitch'. Our 27m rope got +us down past one traverse level to overlook more rift, but still at +least 6m tothe flor & not shinnable. So surveyed out, teaching Rob +distoX usage. Seemed to be no draught at the bottom, so the wind +presumably comes from across the top somewhere. We called it soilathon.

+ +

Took a look further down l[blank-for-name] shinning round various +things and poking one hole (goes to a pitch). Eventually got to a +dead-end at Mad Dogs and marvelled at the very hard-looking C5 into +the roof which the survey claimed was the way on. As it was after +midnight & we were knackered (especially Rob) we were glad of +excuse to go home & slowly came out, regretting hoiking 3 batts +down here, and taking about 5hrs to exit @5am. (It is quite a +long way). Curry felt well-deserved.

+ +

Traverse Rig
FAR FROM SUPPORT - 2 TRAVERSES: +[2 diagrams, annotated 'left rigged']

2012-08-12
OllyB, Jenny
From 893ba38f7f9cd5415b7ffef674efa806697c1bd8 Mon Sep 17 00:00:00 2001 From: expouser Date: Mon, 1 Jul 2013 13:24:25 +1200 Subject: [PATCH 5/6] More logbook write ups. Jenny --- years/2012/logbook.html | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/years/2012/logbook.html b/years/2012/logbook.html index ba6d54b44..4d414c817 100644 --- a/years/2012/logbook.html +++ b/years/2012/logbook.html @@ -293,5 +293,25 @@ The pitch heads are nasty and tight, but things look better deeper down. Got out

T/U: 6.5hrs
+
2012-08-20
+
OllyB, Jenny
+
148 Deep Space pushing trip
+

+Finally, after a five year wait it was time to go beyond the Asteroid Belt in Deep Space (148). Got down to the pushing front fairly quickly, and Olly proceeded to rig our 200m of rope down. First pitch was long (as we knew from dropping rocks) ~60m, most rocks had also gone down the next short pitch too. The pitch after that one was also short, and just round the corner. Basically cave is a very high rift with a little trickle of water down the back. Next pitch was longer + spray lashed at base. Next very short pitch wetter still. Then there was a little bit of horizontal to the following (dry) short pitch, and the same again to the next. Olly got to the bottom of that with 4m rope left, 4 hangers and 4 hiltis, and the cave changed to being horizontal. How is that for careful planning and frugal rigging! +

+Walked/bridged along the rift passage until we hit a boulder choke. I hypothesised that this was the altitude that 107, 97, 82 end at, but actually we were ~40m higher. Olly spotted that the water went under the choke in a little trench. I took off my SRT kit and Olly moved some rocks out. With some effort I managed to wriggle through with the water, under the boulders. Inside the choke I could stand up and cautiously climb up and out the other side! Short passage off to right into another choke (upstream). Downstream to left continued some way, so I went back to get Olly. Olly managed to get through too, and we headed off to explore. Followed downstream, down a climb and to a pitch. Surveyed out from here. Looked at a climb up on the right (going out) which goes up into an aven with black space above - so might be possible to go over the boulder choke. Surveyed back to above the final pitch, then began the long route out. Got out safely and before dawn, what more can you ask for? +

+
T/U: 15.25hrs
+ +
2012-08-21
+
OllyB, Jenny
+
107 entrance
+

+Got up late after yesterdays trip, but needed an early ngiht ready for goign to Eishohle the next day, so planned a short trip into 107. Olly placed a bolt backup and then a hang bolt - managed to get a free hang just. Didn't spot the 1978 spit until a later trip - it is a bit higher than ours, but woudl rub. Entrance shaft bells out, and has several possible leads high up. Landed near the snow plug we could see from 83 (Down Under). +

+Had an explore, realsied the 1978 survey has teh wrong angle for the side passages, and that teh projected elevation has teh plan lengths and vica versa. Area is a little mreo complex with various tubes goign off - all the ones we looked at either ended or conenctted with the pitch below. We planned to survey but got cold as it was realyl drafty. +

+
T/U: 2hrs 10
+ From 3c207a91d0e29fdb6f448081526bee523bc7bc8d Mon Sep 17 00:00:00 2001 From: aiora Date: Tue, 16 Jul 2013 20:50:14 +0100 Subject: [PATCH 6/6] css enhancements, fixes in updata html code --- css/main2.css | 17 +++++++++++++++-- handbook/update.htm | 17 ++++++++--------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/css/main2.css b/css/main2.css index 99f8cd406..ca60bfd16 100644 --- a/css/main2.css +++ b/css/main2.css @@ -8,7 +8,7 @@ body { background: #fff url(../images/style/bg-cambridge-caving-expedition.png) repeat-x 0 0; color: #000; - font-family: 'Palatino Linotype','Book Antiqua',Palatino,serif; + font-family: 'Palatino Linotype','Book Antiqua', Palatino, Garamond, serif; font-size: 12pt; margin-left: 275px; margin-right: 100px; @@ -17,8 +17,9 @@ body { } body#homepage { background: #008787 url(../images/style/homebackground.jpg) no-repeat 0 0; + background-size: 140% auto; color: #fff; - font-family: Tahoma,'Trebuchet MS','Lucida Grande',Verdana,Arial,Sans-Serif; + font-family: Tahoma,'Trebuchet MS','Lucida Grande',Verdana, Arial, Helvetica, Sans-Serif; margin: 80px; text-align: left; } @@ -61,6 +62,12 @@ dd { div.clear { clear: both; } +tt, code { /*code bits*/ + background: #ccc; + font-size: 0.8em; + padding: 10px 20px; + display: block; + } /*HEADINGS*/ h1, h2, h3, h4 { font-family: Tahoma,'Trebuchet MS','Lucida Grande',Verdana,Arial,Sans-Serif; @@ -289,6 +296,12 @@ table#cavepage th#status { text-align: right; width: 25%; } text-align: right; font-weight: bold; margin-bottom: 10px;} +/*html editor*/ +textarea#id_html { + width: 100%; + height: 60%; + } + /*RULES OVERRIDING JQUERY CSS FOR CAVES DESCRIPTION*/ /*This method is faster but less efficient. These would better be directly written in the jquery css file currently in http://expo.survex.com/site_media/css/redmond/jquery-ui-1.8.14.custom.css*/ diff --git a/handbook/update.htm b/handbook/update.htm index e36a41cac..6a21deb31 100644 --- a/handbook/update.htm +++ b/handbook/update.htm @@ -224,18 +224,17 @@ onwards you can just install mercurial and tortoisehg from synaptic, then restar

The site was moved to Julian Todd's seagrass server, but the change from 32-bit to 64-bit machines broke the website autogeneration code, which was only fixed in early 2011, allowing the move to complete. The data has been split into 3 separate repositories: the website, troggle, the survey data, the tunnel data.

-

Automation on cucc.survex.com/expo

+

Automation on cucc.survex.com/expo

The way things normally work, python or perl scripts turn CSV input into HTML for the website. Note that:

- - The CSV files are actually tab-separated, not comma-separated despite the extension. - The scripts can be very picky and editing the CSVs with microsoft excel has broken them in the past- not sure if this is still the case. - -Overview of the automagical scripts on the expo website Script location Input file Output file Purpose +

The CSV files are actually tab-separated, not comma-separated despite the extension.

+

The scripts can be very picky and editing the CSVs with microsoft excel has broken them in the past- not sure if this is still the case.

+

Overview of the automagical scripts on the expo website

+Script location Input file Output file Purpose /svn/trunk/expoweb/noinfo/make-indxal4.pl /svn/trunk/expoweb/noinfo/CAVETAB2.CSV many produces all cave description pages -/svn/trunk/expoweb/noinfo/make-folklist.py /svn/trunk/expoweb/noinfo/folk.csv http://cucc.survex.com/expo/folk/index.htm Table of all expo members +
/svn/trunk/expoweb/noinfo/make-folklist.py /svn/trunk/expoweb/noinfo/folk.csv http://cucc.survex.com/expo/folk/index.htm Table of all expo members -/svn/trunk/surveys/tablize-csv.pl /svn/trunk/surveys/tablizebyname-csv.pl +
/svn/trunk/surveys/tablize-csv.pl /svn/trunk/surveys/tablizebyname-csv.pl /svn/trunk/surveys/Surveys.csv http://cucc.survex.com/expo/surveys/surveytable.html http://cucc.survex.com/expo/surveys/surtabnam.html @@ -257,7 +256,7 @@ http://cucc.survex.com/expo/surveys/surveytable.html http://cucc.survex.com/expo

InstallTortoise Hg. In windows explorer right click, select Tortoise Hg .. and click Clone repository.
Set the source path to RepositoryURL
Set the destination to somewhere on your local harddisk.
Press clone.

RSync

Linux

-

rsync -av expoimages expo@seagrass.goatchurch.org.uk:

+ rsync -av expoimages expo@seagrass.goatchurch.org.uk:

Windows

Not sure yet

The website conventions bit