Merge local and server changes

handbook/rope_history.html

@@ -19,5 +19,23 @@
 <td class="droptest">To be tested 2018</td>
 <td class="retiretment">Post expo 2020</td>
 </tr>
+<tr>
+<td class="year">2014</td>
+<td class="manafacturer">Corde Courante</td>
+<td class="type">10mm</td>
+<td class="docs">None</td>
+<td class="desc">black green</td>
+<td class="droptest">Section with heavy glazing to be tested 2015</td>
+<td class="retiretment">Post expo 2020</td>
+</tr>
+<tr>
+<td class="year">2014</td>
+<td class="manafacturer">Corde Courante</td>
+<td class="type">9mm</td>
+<td class="docs">None</td>
+<td class="desc">black green black</td>
+<td class="droptest">Section with mild glazing to be tested 2015</td>
+<td class="retiretment">Post expo 2020</td>
+</tr>
 </tbody>
 </table></body></html>

infodx.htm

@@ -39,11 +39,7 @@
   </li>
   <li>Coming year: <a href="years/2016/">2016</a></li>
 </ul>
-<h2>Survey information</h2>
+
-<ul>
-<li><a href="expofiles/surveyscans/">Survey scans</a>
-</li>
-</ul>
 <h2>Area Description</h2>
 <ul>
   <li><a href="noinfo/all.3d">Current data</a> for display with aven</li>
@@ -102,6 +98,19 @@
   <li><a href="update.htm">What's new</a> in the archive</li>
 </ul>
 
+<h2>Useful files external to website</h2>
+<p>These files are not version-controlled (take care updating), and will not be available if you are looking at an offline copy of the website.</p>
+<ul>
+<li><a href="expofiles">General file bucket</a></li>
+<li><a href="expofiles/surveyscans/">Survey scans</a></li>
+<li><a href="expofiles/presentations/">External Presentations(Hidden Earth, etc)</a></li>
+<li><a href="expofiles/surveys">Full-size surveys</a></li>
+<li><a href="expofiles/rigging_topos">Rigging topos</a></li>
+<li><a href="expofiles/terrain">Terrain models</a></li>
+<li><a href="expofiles/tunnelwiki/www.freesteel.co.uk/wiki/index.php/Tunnel.html">Tunnel Wiki (documentation)</a></li>
+
+</ul>
+
 <h2>Picture Gallery</h2>
 Each page has a group of thumbnails
 <ul>

map/index.html

@@ -8,8 +8,7 @@
 <meta http-equiv="content-language" content="en" />
 
 <script src="/javascript/openlayers/OpenLayers.js"></script>
-<script src="/javascript/openstreetmap/OpenStreetMap.js"></script>
+<script src="/javascript/openlayers/OpenStreetMap.js"></script>
-<!-- script src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js"></script -->
 <script src="util.js"></script>
  
 <script type="text/javascript">
@@ -18,12 +17,12 @@
 // Position and Zoomlevel of the map
 var lon = 13.8081;
 var lat = 47.6776;
-var zoom = 12; 
+var zoom = 14; 
 
 var map;
 
 var showPopupOnHover = true;
-text = new Array("Show instructions","Hide instructions");
+text = new Array("Show map information","Hide map information");
 
 function drawmap() {
     OpenLayers.Lang.setCode('en');
@@ -44,12 +43,31 @@ function drawmap() {
         displayProjection: new OpenLayers.Projection("EPSG:4326")
     } );
 
+// Display the control elements
+//map.addControl(new OpenLayers.Control.PanZoomBar());
+//map.addControl(new OpenLayers.Control.Permalink('permalink'));
+//map.addControl(new OpenLayers.Control.ScaleLine());
+//map.addControl(new OpenLayers.Control.LayerSwitcher());
+
+//checkForPermalink();
 
 icons = new Array();
-icons[0] = new Array('/javascript/openlayers/img/marker.png','21','25','0.5','1');
+icons[0] = new Array('http://openlayers.org/api/img/marker.png','21','25','0.5','1');
 
 // Display layers
 
+layer_markers = new OpenLayers.Layer.Markers("Marker", { projection: new OpenLayers.Projection("EPSG:4326"),visibility: true, displayInLayerSwitcher: false });
+//layer_vectors = new OpenLayers.Layer.Vector("Zeichnungen", { displayInLayerSwitcher: true } );
+//map.addLayer(layer_vectors);
+map.addLayer(layer_markers)
+//layers = new Array();
+//layer_layerMapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik");
+//map.addLayer(layer_layerMapnik);
+//layers.push(new Array(layer_layerMapnik,'layer_layerMapnik'));
+//layer_layerCyclemap = new OpenLayers.Layer.OSM.CycleMap("Cyclemap");
+//map.addLayer(layer_layerCyclemap);
+//layers.push(new Array(layer_layerCyclemap,'layer_layerCyclemap'));
+
 layerMapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik");
 map.addLayer(layerMapnik);
 
@@ -61,7 +79,7 @@ layers.push(new Array(layerMapnik,'layerMapnik'));
 layers.push(new Array(layerCycleMap,'layerCycleMap'));
 
 //this isn't right yet - GPX points are not appearing
-/*map.addLayer(
+map.addLayer(
 	new OpenLayers.Layer.Markers("Entrances","ents.gpx",
 		{format: OpenLayers.Format.GPX({extractWaypoints: true}),
 	         styleMap: new OpenLayers.StyleMap(
@@ -70,28 +88,29 @@ layers.push(new Array(layerCycleMap,'layerCycleMap'));
 		 projection: new OpenLayers.Projection("EPSG:4326")
 		}
 	)
-);*/
+);
 
 var gpxStyles = new OpenLayers.StyleMap({
                 "default": new OpenLayers.Style({
                     pointRadius: "5", // sized according to type attribute
                     graphicName: "star",
-                    label: "${name}",        
+					label: "${name}",        
                     labelAlign: "rb",
                   
-                    //labelAlign: "${align}",
+				    //labelAlign: "${align}",
                     //labelXOffset: "${xOffset}",
                     //labelYOffset: "${yOffset}",
                     labelOutlineColor: "white",
                     labelOutlineWidth: 3,
 
-                    fontSize: 12,
+					fontSize: 12,
                     fontFamily: "Arial",
                     fontColor: "brown",
                     labelYOffset: 10,
                     fillColor: "black",
-
+                    
-                    strokeColor: "red",
+					
+					strokeColor: "red",
                     strokeWidth: 3, 
                     strokeOpacity: 0.8
                 }),
@@ -118,7 +137,7 @@ var layerGPX = new OpenLayers.Layer.Vector("Entrances", {
 map.addLayer(layerGPX);
 layers.push(new Array(layerGPX,'layerGPX'));
 			
-// fit map to bounds of window and add start, finish pins (finish not working)
+				// fit map to bounds of window and add start, finish pins (finish not working)
 layerGPX.events.register("loadend", layerGPX, function() {
 	this.map.zoomToExtent(this.getDataExtent());
 	//var startPoint = this.features[0].geometry.components[0];				
@@ -138,8 +157,15 @@ layers.push(new Array(layerMarkers,'layerMarkers'));
 
 setLayer(1);
 
+// Jump to the right location
+jumpTo(lon,lat,zoom);
 
-
+// Display marker icons
+//icons = new Array();
+//icons[0] = new Array('http://openlayers.org/api/img/marker.png','21','25','0.5','1');
+//icons[4] = new Array('http://osmtools.de/easymap/images/pin_red.png','16','28','0','1');
+//icons[6] = new Array('http://osmtools.de/easymap/images/pin_green.png','16','28','0','1');
+//icons[10] = new Array('http://osmtools.de/easymap/images/haus_red.png','20','24','0.5','0.5');
 
 // Display markers
 addMarker(layerMarkers,13.8248,47.6884,"<b>Stone Bridge</b><p />Not the real stone bridge: this is a demo",false,0);
@@ -147,7 +173,6 @@ addMarker(layerMarkers,13.8248,47.6884,"<b>Stone Bridge</b><p />Not the real sto
 geometries = new Array();
 
 // Nochmal was..
-map.setCenter(0, zoom, 1, 1);
 jumpTo(lon, lat, zoom);
 toggleInfo();
 checkUtilVersion(4);
@@ -177,7 +202,7 @@ body {
 -->
 </style></head>
 <body onload="drawmap();">
-	<div id="descriptionToggle" onclick="toggleInfo()">Show instructions</div>
+	<div id="descriptionToggle" onclick="toggleInfo()">Show map information</div>
 	<div id="description" class="hide">Expo prototype slippy map<br >Please mouseover<br >the pin markers.<br ></div>
 	<div id="map"></div>
 	<div class="hide"><p><p>If you see this text, you opened the map HTML-File without the necessary files.</p></div>

noinfo/cave_data/1623-258.html

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <!-- Only put one cave in this file -->
-<!-- If you edit this file, make sure you update the website database -->
+<!-- If you edit this file, make sure you update the websites database -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
@@ -13,7 +13,7 @@
 <area>1623</area>
 <area>2d</area>
 <kataster_code>2/S/E x</kataster_code>
-<kataster_number>258</kataster_number>
+<kataster_number>258</kataster_number> 
 <unofficial_number>258</unofficial_number>
 
 <entrance>
@@ -26,11 +26,18 @@
   <letter>b</letter>
 </entrance>
 
-<explorers>CUCC 2006-15</explorers>
+<explorers>CUCC 2006-2015</explorers>
-<underground_description>See <a href="/1623/258/desc.html">underground description</a> page</underground_description>
+<underground_description>Tunnocks is a major part of the Schwarzmooskogelhoehlensystem, comprising much of the northern section. 
+
+The cave description is currently (2016) undergoing a major update. <a href="/1623/258/desc.html">Start here for now underground description</a>.</underground_description>
 <equipment>See underground description</equipment>
 <references></references>
-<survey></p><ul><li><a href="surveys/plan2007BW.png">Plan, post-2007 Expo</a>[784KB; 2021x3449 pixels, greyscale]</li>  <li><a href="surveys/plan2007BWhires.png">Plan, post-2007 Expo</a>[3218KB; 9454x17164 pixels, greyscale]</li></ul><p></survey>
+<survey></p><ul>
+<li><a href="../../expofiles/surveys/tunnocks/tunnocksposter2011.png">2011 survey</a>
+(5MB, png)</li>
+<li><a href="../../expofiles/surveys/tunnocks/tunnocksposter2010.png">2010 survey</a>
+(5MB, png)</li>
+<li><a href="../../expofiles/surveys/plan2007BW.png">Plan, post-2007 Expo</a>[784KB; 2021x3449 pixels, greyscale]</li>  <li><a href="../../expofiles/surveys/plan2007BWhires.png">Plan, post-2007 Expo</a>[3218KB; 9454x17164 pixels, greyscale]</li></ul><p></survey>
 <kataster_status></kataster_status>
 <underground_centre_line>In dataset</underground_centre_line>
 <notes></notes>
@@ -38,7 +45,7 @@
 <depth></depth>
 <extent></extent>
 <survex_file>caves/258/258.svx</survex_file>
-<description_file>1623/258/258.html</description_file>
+<description_file>1623/258/desc.html</description_file>
 <url>1623/258/258.html</url>
 </cave>
 </body>

noinfo/cave_data/1623-264.html

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <!-- Only put one cave in this file -->
-<!-- If you edit this file, make sure you update the website database -->
+<!-- If you edit this file, make sure you update the websites database -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
@@ -13,7 +13,7 @@
 <area>1623</area>
 <area>2d</area>
 <kataster_code>1/S =</kataster_code>
-<kataster_number>264</kataster_number>
+<kataster_number>264</kataster_number> 
 <unofficial_number>2005-05</unofficial_number>
 
 <entrance>
@@ -22,13 +22,14 @@
 </entrance>
 
 <explorers>Entrance noted CUCC 2002 (Duncan). Refound + partially explored CUCC 2005 (Peter + Phil). Explored to ~3km in 2014.</explorers>
-<underground_description><a href="../../1623/264/ent.html">ent</a>
+<underground_description><a href="../../1623/264/ent.html">ent</a>
-
+
 </underground_description>
 <equipment>5m handline and ~120m for entrance shaft</equipment>
 <references>Brief description and sketch in 2002#31; <a href="../../years/2005/logbook.html#t2005-08-10A">2005 log book</a>.</references>
-<survey> <a href="/expofiles/surveys/264/2015/area-plan-elv.png">Survey 2015</a>
+<survey><a href="/expofiles/surveys/264/2015/area-plan-elv.png">Survey 2015</a>
-</survey>
+
+<a href="http://expo/expofiles/surveys/264/balconyhohle.png>Balcony survey</a>(2MB)</survey>
 <kataster_status></kataster_status>
 <underground_centre_line></underground_centre_line>
 <notes>The original ID 2005-05 was also used (briefly) for another entrance, which was found the next day to connect to 204, and designated as 204G. The number was reused due to an acute tag shortage.</notes>

noinfo/cave_data/1623-B4.html

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <!-- Only put one cave in this file -->
-<!-- If you edit this file, make sure you update the website database -->
+<!-- If you edit this file, make sure you update the websites database -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
@@ -13,7 +13,7 @@
 <area>1623</area>
 <area>4</area>
 <kataster_code>1/S +</kataster_code>
-<kataster_number></kataster_number>
+<kataster_number></kataster_number> 
 <unofficial_number>B4</unofficial_number>
 
 <entrance>
@@ -25,7 +25,9 @@
 <underground_description>Descent of 45&deg; snow slope reaches a choked rift. Above and ahead water enters via small aven but no sign of a way on.</underground_description>
 <equipment></equipment>
 <references></references>
-<survey>CUCC sketch 1996</survey>
+<survey><p>CUCC sketch 1996</p>
+<p>Surveyed 2005, Olly Betts, Jenny Black</p>
+<p>Photoed 2015, Wookey</p></survey>
 <kataster_status></kataster_status>
 <underground_centre_line></underground_centre_line>
 <notes></notes>