mirror of
https://expo.survex.com/repositories/expoweb/.git/
synced 2024-11-22 07:11:55 +00:00
merge
This commit is contained in:
olly
commit
2e40991173
@ -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*/
|
||||
|
||||
@ -224,18 +224,17 @@ onwards you can just install mercurial and tortoisehg from synaptic, then restar
|
||||
|
||||
<p>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.</p>
|
||||
|
||||
<h3><a id="">Automation on cucc.survex.com/expo</h3>
|
||||
<h3 id="automation">Automation on cucc.survex.com/expo</h3>
|
||||
|
||||
<p>The way things normally work, python or perl scripts turn CSV input into HTML for the website. Note that:</p>
|
||||
|
||||
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
|
||||
<p>The CSV files are actually tab-separated, not comma-separated despite the extension.</p>
|
||||
<p>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.</p>
|
||||
<p>Overview of the automagical scripts on the expo website</p>
|
||||
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
|
||||
</br>/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
|
||||
</br>/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
|
||||
<p>Install<a href="http://bitbucket.org/tortoisehg/stable/wiki/Home">Tortoise Hg</a>. In windows explorer right click, select Tortoise Hg .. and click Clone repository. <br />Set the source path to RepositoryURL <br />Set the destination to somewhere on your local harddisk. <br />Press clone.</p>
|
||||
<h3>RSync</h3>
|
||||
<h4>Linux</h4>
|
||||
<p>rsync -av expoimages expo@seagrass.goatchurch.org.uk:</p>
|
||||
<tt>rsync -av expoimages expo@seagrass.goatchurch.org.uk:</tt>
|
||||
<h4>Windows</h4>
|
||||
<p>Not sure yet</p>
|
||||
<h2>The website conventions bit</h2>
|
||||
|
||||
@ -60,7 +60,7 @@
|
||||
<li><a href="fester.htm">Festering</a> - or alternative activities for jaded cavers</li>
|
||||
<li><a href="dclaim.htm">Independent visitors' info</a></li>
|
||||
<li><a href="others/index.htm">Other groups</a> who have worked in the area.</li>
|
||||
<li><a href="pubs.htm">Published Articles</a> in Cambridge Underground and elsewhere (bibliography with links)</li>
|
||||
<li><a href="pubs.htm">Published Articles and Presentations</a> in Journals and at conferences (bibliography with links)</li>
|
||||
</ul>
|
||||
|
||||
|
||||
|
||||
@ -249,4 +249,4 @@
|
||||
"Robert Winkler","Winkler",1,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,
|
||||
"Wookey (Wook)","Wookey",,1,"l/wookey.htm",,,,,,,,,,,,,1,1,1,1,1,1,,1,1,,1,1,1,,1,,,1,,1,,1,,1,1
|
||||
"Aiora Zabala","Zabala",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
|
||||
"Sarah ?","",1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,-1,-1
|
||||
"Sarah Livia Zerbes","",1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,-1,-1
|
||||
|
||||
|
Can't render this file because it has a wrong number of fields in line 42.
|
6
pubs.htm
6
pubs.htm
@ -516,10 +516,10 @@ actually submitted or published, it seems)</a>
|
||||
<hr />
|
||||
<h4>Pre-Expo statements and Post-Expo reports of CUCC <a id="pubs2012" href="years/2012/" name="pubs2012">Austria 2012</a></h4>
|
||||
<p><a href="years/2012/SpeleoAustria.html">Speleo Austria Proceedings Article</a><br>
|
||||
<a href="http://seagrass.goatchurch.org.uk/~expo/expofiles/presentations/SpeleoAustria/2012/AustrianConference2012.pdf">Speleo
|
||||
Austria Presentation (39MB PDF)</a> <a href="http://seagrass.goatchurch.org.uk/~expo/expofiles/presentations/SpeleoAustria/2012/AustrianConference2012.odp">(78MB
|
||||
<a href="expoimages/presentations/SpeleoAustria/2012/AustrianConference2012.pdf">Speleo
|
||||
Austria Presentation (39MB PDF)</a> <a href="expoimages/presentations/SpeleoAustria/2012/AustrianConference2012.odp">(78MB
|
||||
OpenDocumentPresentation)</a><br>
|
||||
<a href="http://seagrass.goatchurch.org.uk/~expo/expofiles/presentations/HiddenEarth/2012/HE2012.odp">Hidden Earth Presentation</a>
|
||||
<a href="expoimages/presentations/HiddenEarth/2012/HE2012.odp">Hidden Earth Presentation</a>
|
||||
</p>
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
|
||||
@ -253,6 +253,65 @@ long way). Curry felt well-deserved.</p>
|
||||
<p>Traverse Rig<br/>FAR FROM SUPPORT - 2 TRAVERSES:
|
||||
[2 diagrams, annotated 'left rigged']
|
||||
|
||||
<div class="tripdate" id="t2012-08-12c">2012-08-12</div>
|
||||
<div class="trippeople">OllyB, <u>Jenny</u></div>
|
||||
<div class="triptitle">83 - Under a Rock, Down Under</div>
|
||||
<p>
|
||||
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!
|
||||
</p><p>
|
||||
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 <u>Down Under</u>, 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.
|
||||
</p><p>
|
||||
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.
|
||||
</p>
|
||||
<div class="timeug">TU: 7:40hrs Jenny, 7:30hrs Olly</div>
|
||||
|
||||
<div class="tripdate" id="t2012-08-15d">2012-08-15</div>
|
||||
<div class="trippeople">OllyB, <u>Jenny</u></div>
|
||||
<div class="triptitle">83 - derig and survey</div>
|
||||
<p>
|
||||
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.
|
||||
</p><p>
|
||||
Finished de-rigging. [rigging diagram in original]
|
||||
</p>
|
||||
<div class="timeug">T/U: 2.5hrs</div>
|
||||
|
||||
<div class="tripdate" id="t2012-08-15e">2012-08-15</div>
|
||||
<div class="trippeople">OllyB, <u>Jenny</u></div>
|
||||
<div class="triptitle">148 rig</div>
|
||||
<p>
|
||||
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.
|
||||
</p>
|
||||
<div class="timeug">T/U: 2.5hrs</div>
|
||||
|
||||
<div class="tripdate" id="t2012-08-17b">2012-08-17</div>
|
||||
<div class="trippeople">OllyB, <u>Jenny</u></div>
|
||||
<div class="triptitle">148 rigging</div>
|
||||
<p>
|
||||
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.
|
||||
</p><p>
|
||||
The pitch heads are nasty and tight, but things look better deeper down. Got out surprisingly fast (1hr 40) despite bimbling.
|
||||
</p>
|
||||
<div class="timeug">T/U: 6.5hrs</div>
|
||||
|
||||
<div class="tripdate" id="t2012-08-20b">2012-08-20</div>
|
||||
<div class="trippeople">OllyB, <u>Jenny</u></div>
|
||||
<div class="triptitle">148 Deep Space pushing trip</div>
|
||||
<p>
|
||||
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!
|
||||
</p><p>
|
||||
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?
|
||||
</p>
|
||||
<div class="timeug">T/U: 15.25hrs</div>
|
||||
|
||||
<div class="tripdate" id="t2012-08-21c">2012-08-21</div>
|
||||
<div class="trippeople">OllyB, <u>Jenny</u></div>
|
||||
<div class="triptitle">107 entrance</div>
|
||||
<p>
|
||||
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).
|
||||
</p><p>
|
||||
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.
|
||||
</p>
|
||||
<div class="timeug">T/U: 2hrs 10</div>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user