mirror of
https://expo.survex.com/repositories/expoweb/.git/
synced 2025-12-08 14:54:28 +00:00
wk12 fixes
This commit is contained in:
@@ -1,64 +1,47 @@
|
||||
<!DOCTYPE html>
|
||||
<!-- This file is generated by troggle on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
|
||||
<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
|
||||
<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
|
||||
<!-- Only put one cave in this file -->
|
||||
<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
|
||||
<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
|
||||
make sure you update the database by doing a full data import. If you edit it using the online form
|
||||
though, you do not need to do a data import as it happens automatically -->
|
||||
<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
||||
</head>
|
||||
<body>
|
||||
<b>This file is generated by troggle</b> on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at
|
||||
<b>This file is generated by troggle</b> using the form documented at
|
||||
the form documented at
|
||||
<a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
|
||||
<br>
|
||||
|
||||
<cave>
|
||||
<non_public>False</non_public><!-- 'False' or 'True'. True if the cave should only be visible to logged-in users. Caves are normally public, so enter 'False' unless you know otherwise. -->
|
||||
<caveslug>1623-1996WK12</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename'' -->
|
||||
<official_name></official_name><!-- Name of the cave (normally in German) Use ü for u+Umlaut and ö for o+umlaut eg Höhle for Hohle and Glück for Gluck-->
|
||||
<area>1623</area><!-- e.g. "1623" -->
|
||||
<kataster_code>1/S -</kataster_code><!-- 'length-or-depth/type exploration'
|
||||
code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
|
||||
<non_public>False</non_public>
|
||||
<unexplored>False</unexplored>
|
||||
|
||||
T Trockenhöhlen (Dry caves)
|
||||
W Wasserhöhlen (Caves with water)
|
||||
(W) Zeitweilig aktiv Wasserhöhlen (Caves with seasonal water)
|
||||
E Eishohlen (Caves with ice formations)
|
||||
S Schachthöhlen (Caves with pitches)
|
||||
H Halbhöhlen (Rock shelters ?)
|
||||
|
||||
- unerforscht (unexplored)
|
||||
= befahren (visited)
|
||||
× teilweise vermessen (partly surveyed)
|
||||
+ erforscht (exploration considered complete)
|
||||
-->
|
||||
<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated -->
|
||||
<unofficial_number>1996WK12</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
|
||||
<official_name></official_name>
|
||||
<area>1623</area>
|
||||
<kataster_code>1/S -</kataster_code>
|
||||
<kataster_number></kataster_number>
|
||||
<unofficial_number>1996WK12</unofficial_number>
|
||||
|
||||
<entrance>
|
||||
<entranceslug>1623-1996WK12</entranceslug><!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->
|
||||
<!-- DEBUG 1623-1996WK12+1623-1996WK12 'Z' == -->
|
||||
<letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID. -->
|
||||
<entranceslug>1623-1996WK12</entranceslug>
|
||||
<letter></letter>
|
||||
</entrance>
|
||||
|
||||
<explorers>CUCC 1996 (Wookey)</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
|
||||
<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
|
||||
<underground_description>Oval 3m deep hole. Way on in opposite corner from difficult climb down of 3m to bottom. To the SW is a small mossy hole to choked chamber about 2 x 3m. To the NE clamber 6m down rocky slope then 6m along narrowing rift. V. tight possible way on down, but easier way along can be followed for 10m to awkward boulder blockage. Passage continues at least 3m to corner. The boulder was not passed in shorts and goretex for fear of ripping!</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
|
||||
<equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
|
||||
<references>NotKH book p29-p30</references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
|
||||
<survey>? Plan, elevation (grade2)</survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
|
||||
<kataster_status></kataster_status>
|
||||
<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
|
||||
<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
|
||||
<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
|
||||
<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
|
||||
<explorers>CUCC 1996 (Wookey)</explorers>
|
||||
<survex_file></survex_file>
|
||||
<underground_description>Oval 3m deep hole. Way on in opposite corner from difficult climb down of 3m to bottom. To the SW is a small mossy hole to choked chamber about 2 x 3m. To the NE clamber 6m down rocky slope then 6m along narrowing rift. V. tight possible way on down, but easier way along can be followed for 10m to awkward boulder blockage. Passage continues at least 3m to corner. The boulder was not passed in shorts and goretex for fear of ripping!</underground_description>
|
||||
<equipment></equipment>
|
||||
<references>NotKH book p29-p30</references>
|
||||
<survey>? Plan, elevation (grade2)</survey>
|
||||
<notes></notes>
|
||||
<length></length>
|
||||
<depth></depth>
|
||||
<extent></extent>
|
||||
|
||||
<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
|
||||
<url>1623/1996WK12/1996WK12.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
|
||||
<description_file></description_file>
|
||||
</cave>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -20,12 +20,12 @@ though, you do not need to do a data import as it happens automatically -->
|
||||
<entrance>
|
||||
<non_public>False</non_public>
|
||||
<slug>1623-1996-05</slug> <!-- one entrance and one slug per entrance_data file -->
|
||||
<name></name>
|
||||
<name>1996-05</name>
|
||||
<entrance_description></entrance_description>
|
||||
<explorers></explorers>
|
||||
<location_description></location_description>
|
||||
<lastvisit></lastvisit>
|
||||
<approach>From <a href="/1623/164.htm">164</a>, follow recent (1996 vintage? - not of CUCC origin) fluorescent orange paint dots (these had faded almost completely by 1998, but there are some older red ones for the early part of the route), over a ridge passing the OAV ski marker pole, then leftish over a series of limestone steps to reach a descent into a large broken area (thought to be near <a href="/1623/173.htm">173</a>). Climb steeply left up boulders to a large cairn with a bright orange dot, then over a series of limestone shelves. Shortly up here is a shaft now known to be <a href="/1623/200.htm">Lost Rucksack Cave</a> (marked with temporary number CUCC 1993 01). The route continues remarkably easily over a series of bunde-free pavements - easily relocated in 1998. Eventually a large orange dot with an arrow points into a gap in the pines with many fresh (1996) cut branches (again, not CUCC's work). No more dots are to be found, and all ways close up in bunde beyond an obvious shaft in a N-S rift which is therefore clearly the ultimate destination of the marked path.</approach>
|
||||
<approach>From <a href="/1623/164.htm">164</a>, follow recent (1996 vintage? - not of CUCC origin) fluorescent orange paint dots (these had faded almost completely by 1998, but there are some older red ones for the early part of the route), over a ridge passing the OAV ski marker pole, then leftish over a series of limestone steps to reach a descent into a large broken area (thought to be near <a href="/1623/173.htm">173</a>). Climb steeply left up boulders to a large cairn with a bright orange dot, then over a series of limestone shelves. Shortly up here is a shaft now known to be <a href="/1623/200/200.html">Lost Rucksack Cave</a> (1623-200 was marked with temporary number CUCC 1993 01). The route continues remarkably easily over a series of bunde-free pavements - easily relocated in 1998. Eventually a large orange dot with an arrow points into a gap in the pines with many fresh (1996) cut branches (again, not CUCC's work). No more dots are to be found, and all ways close up in bunde beyond an obvious shaft in a N-S rift which is therefore clearly the ultimate destination of the marked path.</approach>
|
||||
<underground_description></underground_description>
|
||||
<photo></p><div class="centre"><a href="/1623/others/l/9605.htm"><img alt="Entrance photo (45k JPEG)" width="150" height="188" src="/1623/others/t/9605.jpg" /></a><p>Entrance rift, looking north.</p></div><p>A picture of the Bräuning wall and Loser from the vicinity of the entrance is <a href="/1623/piclinks/bw_pks.htm">here</a>.</photo>
|
||||
<!-- marking options: P = Paint,
|
||||
|
||||
@@ -1,23 +1,33 @@
|
||||
<!DOCTYPE html>
|
||||
<!-- Only put one entrance in this file -->
|
||||
<!-- If you edit this file, make sure you update the websites database -->
|
||||
<!-- This file is generated by troggle using the form documented at handbook/survey/ententry.html -->
|
||||
<!-- If you edit this file by hand, and manually upload it to the server using git,
|
||||
make sure you update the database by doing a full data import. If you edit it using the online form
|
||||
though, you do not need to do a data import as it happens automatically -->
|
||||
|
||||
<!-- See http://expo.survex.com/handbook/survey/caveentryfields.html for current details on filling in this form -->
|
||||
<!-- there is 1 required field: slug. The entrance will not appear without that. -->
|
||||
<!-- ALWAYS use ü for u+Umlaut and ö for o+umlaut eg Höhle for Hohle and Glück for Gluck-->
|
||||
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
||||
</head>
|
||||
<body>
|
||||
<b>This file is generated by troggle</b> using the form documented at
|
||||
<a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
|
||||
<br>
|
||||
<entrance>
|
||||
<non_public>False</non_public>
|
||||
|
||||
|
||||
<name></name>
|
||||
<slug>1623-1996WK12</slug> <!-- one entrance and one slug per entrance_data file -->
|
||||
<name>1996WK12</name>
|
||||
<entrance_description>Oval hole 4m x 3m at edge of pavement next to grassy area. Draughting - particularly on entrance slope.</entrance_description>
|
||||
<explorers></explorers>
|
||||
<map_description></map_description>
|
||||
<location_description>Surface survey passes over cave, but no station at cave.</location_description>
|
||||
<approach>About 12m or 30m SW of laser point 7 'LSR7_' on south side of Schwarzmoossattel (the one with incorrect position on original laser survey), 40m NE of 36. NW (upslope) from <a href="b4.htm">CUCC 1976 B4</a>.</approach>
|
||||
<lastvisit></lastvisit>
|
||||
<approach>About 12m or 30m SW of laser point 7 'LSR7_' on south side of Schwarzmoossattel (the one with incorrect position on original laser survey), 40m NE of 36. NW (upslope) from <a href="/1623/B4/B4.html">CUCC 1976 B4</a>.</approach>
|
||||
<underground_description></underground_description>
|
||||
<photo></p> <div class="centre"><a href="i/wk12.jpg"><img src="t/wk12.jpg" /></a></div><p>Photo © Dave Loeffler 2005</photo>
|
||||
<photo></p> <div class="centre"><a href="/guidebook/i/wk12.jpg"><img src="/guidebook/t/wk12.jpg" /></a></div><p>Photo © Dave Loeffler 2005</photo>
|
||||
<!-- marking options: P = Paint,
|
||||
P? = Paint (?),
|
||||
T = Tag,
|
||||
@@ -36,14 +46,12 @@
|
||||
<findability>S</findability>
|
||||
<findability_description></findability_description>
|
||||
<alt>c. 1684m</alt>
|
||||
<northing></northing>
|
||||
<easting></easting>
|
||||
<lat_wgs84></lat_wgs84>
|
||||
<long_wgs84></long_wgs84>
|
||||
<tag_station>1623.pwk12</tag_station>
|
||||
<exact_station></exact_station>
|
||||
<other_station></other_station>
|
||||
<other_description></other_description>
|
||||
<bearings></bearings>
|
||||
<url></url>
|
||||
<bearings></bearings> <!-- this is now read-only and not editable on the forms-->
|
||||
</entrance>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
<ul>
|
||||
<li><a href="trogregistr.html">Troggle Login and user registration</a> - proposal to remove registration (DONE)<br>
|
||||
<li><a href="lbredesign.html">Troggle Logbook Format Redesign</a> - revising the logbook HTML (DONE)<br>
|
||||
<li><a href="lbeeditproposal.html">Troggle Logbook Editing Issues</a> - changing how we edit logbook entries online<br>
|
||||
<li><a href="menudesign.html">Troggle Menu Design</a> - options for replacing the menuing system<br><br>
|
||||
<li><a href="namesredesign.html">Troggle people's names' redesign</a> (DONE)
|
||||
<li><a href="trogsimpler.html">Troggle - a kinder simpler troggle?</a> - Radost's proposals (critiqued)<br>
|
||||
|
||||
@@ -41,7 +41,7 @@ Troggle: a revised system for cave data management</a>")
|
||||
|
||||
<h2>Proposal #1</h2>
|
||||
<p>We edit troggle to create two ids when resetting: "expoadmin" (the django administrator) and "expo" (to have access to Austrian cave surveys and edit pages). These will both be created by the '<a href="https://docs.djangoproject.com/en/1.11/ref/contrib/auth/">django.contrib.auth</a>' system.
|
||||
Django gives us fine-grained access control settings for admin users so we can ensure that "expo" has the minimum necessary but has <a href=https://docs.djangoproject.com/en/1.11/ref/settings/#file-upload-permissions">file upload permissions</a>
|
||||
Django gives us fine-grained access control settings for admin users so we can ensure that "expo" has the minimum necessary but has <a href="https://docs.djangoproject.com/en/1.11/ref/settings/#file-upload-permissions">file upload permissions</a>
|
||||
|
||||
<p>We remove the 'django-registration' system entirely which reduces the <em>attack surface</em> of troggle - and the enforced deprecation/upgrade process certainly feels like an attack.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user