Hg: branch 'expoweb'
This commit is contained in:
expo 2012-08-01 11:28:15 +02:00
commit 2470026fea
7 changed files with 1171 additions and 33 deletions

@ -15,17 +15,17 @@ svxtrace_cmd = ./svxtrace.py
###########
#everything: autogen_pages folklist 3dfiles tarfiles surveytable qmlists prospecting_guide
everything: autogen_pages folklist 3dfiles tarfiles qmlists prospecting_guide
everything: autogen_pages folklist 3dfiles tarfiles qmlists
###########
autogen_pages: indxal.htm
autogen_pages: noinfo/lengths.dat noinfo/all.pos noinfo/cavestats
# cavestats should be BUILT AUTOMATICALLY rather than having to be
# built manually in a survex build tree.
indxal.htm: noinfo/CAVETAB2.CSV noinfo/all.pos noinfo/make-indxal4.pl noinfo/areapage_skeletons/*.html noinfo/lengths.dat
python noinfo/make-areaindices.py noinfo/cavestats
cd noinfo; perl ./make-indxal4.pl -q CAVETAB2.CSV
#indxal.htm: noinfo/CAVETAB2.CSV noinfo/all.pos noinfo/make-indxal4.pl noinfo/areapage_skeletons/*.html noinfo/lengths.dat
# python noinfo/make-areaindices.py noinfo/cavestats
# cd noinfo; perl ./make-indxal4.pl -q CAVETAB2.CSV
noinfo/lengths.dat:
python noinfo/create_dplong_table.py

@ -46,6 +46,8 @@
<td><a href="years/2010/">2010</a></td>
<td>|</td>
<td><a href="years/2011/">2011</a></td>
<td>|</td>
<td><a href="years/2011/">2012</a></td>
</tr>
</table>
</li>
@ -205,6 +207,10 @@ browsing from disc-->
</tr>
<tr>
<td><a href="years/2010/">2010</a></td>
<td>|</td>
<td><a href="years/2011/">2011</a></td>
<td>|</td>
<td><a href="years/2012/">2012</a></td>
</tr>
</table>
</li>

@ -1,26 +0,0 @@
<html>
<head>
<title>Stuff left at base camp</title>
</head>
<body>
<h1>Stuff left at base camp</h1>
<h2>Food</h2>
<ul>
<li>item1</li>
</ul>
<h2>Rigging</h2>
<ul>
<li>item1</li>
</ul>
<h2>Surveying</h2>
<ul>
<li>item1</li>
</ul>
<h2>First Aid</h2>
<ul>
<li>item1</li>
</ul>
</body>
</html>

@ -0,0 +1,91 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
<meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8">
<title>Stuff left at base camp</title>
<meta name="CREATED" content="20110825;20190000">
</head>
<body lang="en-GB" dir="LTR">
<h1>Stuff left at base camp</h1>
<h2>Food</h2>
<ul>
<li>½ tub nasty cheese sauce</li>
<li>½ tub curry sauce mix</li>
<li>5 tins of white beans</li>
<li>7 cartons of tomato pasata</li>
<li>3 tins of peas</li>
<li>1 tin chick peas</li>
<li>1 tin tomatoes</li>
<li>1 tin kidney beans</li>
<li>1 tin sweetcorn</li>
<li>~1kg maggie mushroom soup in tub</li>
<li>500ml oil</li>
<li>8 500g mornflake oats tins</li>
<li>1 large 680g bag of dried onions</li>
<li>17 individual portions of top camp meal sauce</li>
<li>3 40g boxes dried country veg</li>
<li>1 40g box dried onions</li>
<li>2 40g boxes dried peppers</li>
<li>1 40g box dried sliced mushrooms</li>
<li>1 300g box mushroom soup powder</li>
<li>1 300g box chicken soup powder</li>
<li>3.5kg instant custard from 2007</li>
<li>39 plain oatsos</li>
<li>1kg spaghetti</li>
<li>3.5kg pasta</li>
<li>4kg rice</li>
<li>18 250g packs of medium egg noodles</li>
<li>1 pack instant noodles</li>
<li>4 200g tubs bisto cheese sauce</li>
<li>1 200g tub bisto parsley sauce</li>
<li>2 700ml bottles hot chilli sauce</li>
<li>1kg pack of fruit musli</li>
<li>4 250g packs of instant mash</li>
</ul>
<h2>Stuff</h2>
<ul>
<li>1 ML5100 Printer Catridge (unused)</li>
<li>1 parafin</li>
<li>1 Jar of Nik wax</li>
<li>1 tub all purpose grease</li>
<li>1 box tent pegs and big nails</li>
<li>1 CUCC brew kit (no. 1)</li>
<li>2 half reels of blue string</li>
<li>roll mats</li>
<li>1 pair of walking poles</li>
<li>1 small tub of tea lights</li>
<li>The book box</li>
<li>1 tub with 28 nail varnishes</li>
<li>½ box washing powder</li>
<li>1 white board</li>
<li>1 ropewasher</li>
<li>1 therma rest</li>
<li>1 bier tent</li>
<li>2 boxes of pans</li>
<li>1 box plastic A4 wallets</li>
<li>1 box general crap??</li>
<li>1 makita box</li>
<li>1 box survey notebooks/instrument spares</li>
<li>2x hammer, 1x setter in drum</li>
<li>lamination pouches</li>
<li>envolope of laminated surveys (204)</li>
<li>1 string with spanner, knife and whistle</li>
<li>cable for solar pannels</li>
<li>2x underground first aid kits</li>
<li>2x camp first aid kits</li>
<li>1 box petzl permenant hangers</li>
<li>1 ammo box with a few mailons/ hangers</li>
<li>1 empty ammo box</li>
<li>1 large roll black visqueen?</li>
<li>1 “wynnster strike+” tent</li>
<li>1 box hilti HKDs</li>
<li>1 computer monitor</li>
<li>1 scanner, 1 keyboard, 1 printer and cables for these</li>
<li>2 dry bags</li>
<li>3 karrimatt drill protectors</li>
<li>1 bread maker (or 2?)</li>
</ul>
</body>
</html>

@ -14,8 +14,8 @@
<div>
<ul>
<li><a href="logbook.html">Logbook</a></li>
<li><a href="topcamplist-2011.html">Stuff left at top camp</a></li>
<li><a href="basecamplist-2011.html">Stuff left at base camp</a></li>
<li><a href="topcamplist.html">Stuff left at top camp</a></li>
<li><a href="basecamplist.html">Stuff left at base camp</a></li>
<li><a href="gpf_report.pdf">GPF feedback report</a></li>
</ul>
</div>

File diff suppressed because one or more lines are too long