expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2024-11-25 08:41:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

corecting mistakes in New Cave pages

Browse Source
This commit is contained in:
Philip Sargent 2021-04-14 01:47:41 +01:00
parent 71c86b7b98
commit a646dc3204
5 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cave_data/1623-101.html
View File

@ -1,6 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
<!-- Only put one cave in this file --> <!-- Only put one cave in this file -->
<!-- If you edit this file, make sure you update the websites database --> <!-- If you edit this file by hand, make sure you update the database by doing a full data import -->
<html lang="en"> <html lang="en">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
@ -37,7 +38,7 @@
<length></length> <length></length>
<depth>~12m</depth> <depth>~12m</depth>
<extent></extent> <extent></extent>
<survex_file></survex_file> <survex_file>caves-1623/101/101.svx</survex_file>
<description_file>1623/101/101.html</description_file> <description_file>1623/101/101.html</description_file>
<url>1623/101/101.html</url> <url>1623/101/101.html</url>
</cave> </cave>

37
cave_data/1623-291.html
View File

@ -1,45 +1,40 @@
<!DOCTYPE html><!-- THIS IS INFO FOR ONE CAVE--> <!DOCTYPE html>
<!-- Only put one cave in this file (it may have multiple entrances) --> <!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
<!-- If you edit this file, make sure it is uploaded (pushed) to the expoweb repository (cave folder) and that you have added one or more entrance files to the entrances folder--> <!-- Only put one cave in this file -->
<!-- If you edit this file by hand, make sure you update the database by doing a full data import -->
<html lang="en"> <html lang="en">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title></title> </head>
<link rel="stylesheet" type="text/css" href="/css/main2.css" /></head>
<body> <body>
<cave> <cave>
<non_public>False</non_public> <non_public>False</non_public>
<caveslug>1623-291</caveslug> <caveslug>1623-291</caveslug>
<official_name>Gl&uuml;ckliche Schmetterlingsh&ouml;hle</official_name><!-- Use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck--> <official_name>Gl&uuml;ckliche Schmetterlingsh&ouml;hle</official_name>
<area>1623</area> <area>1623</area>
<kataster_code></kataster_code> <kataster_code></kataster_code>
<kataster_number>291</kataster_number> <kataster_number>291</kataster_number>
<unofficial_number>2017_cucc_24</unofficial_number> <unofficial_number>2017_cucc_24</unofficial_number>
<!-- Add one entrance stanza for each entrance-->
<entrance> <entrance>
<entranceslug>1623-291</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 --> <entranceslug>1623-291</entranceslug>
<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. --> <letter></letter>
</entrance> </entrance>
<explorers><p>CUCC 2017 on</p></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. --> <explorers><p>CUCC 2017 on</p></explorers>
<underground_description></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. --> <underground_description></underground_description>
<equipment><p></p></equipment> <equipment><p></p></equipment>
<references><p></references></p><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. --> <references><p></references>
<survey><p></p></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. --> <survey><p></p></survey>
<kataster_status></kataster_status> <kataster_status></kataster_status>
<underground_centre_line></underground_centre_line> <underground_centre_line></underground_centre_line>
<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost --> <notes></notes>
<length></length> <length></length>
<depth></depth> <depth></depth>
<extent></extent> <extent></extent>
<survex_file>caves-1623/291/291.svx</survex_file> <!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves/cavenum/cavnum.svx". (e.g. caves/204/204.svx --> <survex_file>caves-1623/2017-cucc-24/2017-cucc-24.svx</survex_file>
<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. --> <description_file></description_file>
<url>1623/291/291.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.html, e.g ('1623/165.html')--> <url>1623/291/291</url>
</cave> </cave>
</body> </body>
</html> </html>

19
handbook/survey/newcavefile.html
View File

@ -12,8 +12,10 @@
<h1>Cave data file</h1> <h1>Cave data file</h1>
<p>These files live in <span style="font-family: monospace">:expoweb:/cave_data/</span> <p>These files live in <span style="font-family: monospace">:expoweb:/cave_data/</span>
<p>The example full format below is of a very simple cave with hardly any fields filled in. The most vital field is <p>The example full format below is of a very simple cave with hardly any fields filled in. The most vital field is
<code>&lt;url&gt;augstb/4.htm&lt;/url&gt; </code> <code>&lt;url&gt;1623/4&lt;/url&gt; </code>
at the bottom as this shows that this file is <code>:expoweb:/cave_data/augstb/4.htm</code> at the bottom as this shows that the cave descripition data is in <code>:expoweb:/cave_data/1623-2.html</code>
There will only be an additional description file for large and complex caves.
<!-- it would be nice to find something that colourises this in HTML --> <!-- it would be nice to find something that colourises this in HTML -->
<pre><code>&lt;!-- Only put one cave in this file --&gt; <pre><code>&lt;!-- Only put one cave in this file --&gt;
@ -50,8 +52,8 @@ at the bottom as this shows that this file is <code>:expoweb:/cave_data/augstb/4
&lt;depth&gt;1.07m&lt;/depth&gt; &lt;depth&gt;1.07m&lt;/depth&gt;
&lt;extent&gt;&lt;/extent&gt; &lt;extent&gt;&lt;/extent&gt;
&lt;survex_file&gt;&lt;/survex_file&gt; &lt;survex_file&gt;&lt;/survex_file&gt;
&lt;description_file&gt;augstb/4.htm&lt;/description_file&gt; &lt;description_file&gt;&lt;/description_file&gt;
&lt;url&gt;augstb/4.htm&lt;/url&gt; &lt;url&gt;1623/4&lt;/url&gt;
&lt;/cave&gt; &lt;/cave&gt;
&lt;/body&gt; &lt;/body&gt;
&lt;/html&gt; &lt;/html&gt;
@ -59,7 +61,7 @@ at the bottom as this shows that this file is <code>:expoweb:/cave_data/augstb/4
<!-- Yes we should not be using the <tt> "teletype" tag as it is deprecated. --> <!-- Yes we should not be using the <tt> "teletype" tag as it is deprecated. -->
<p>As you can see, this is an XML tag format similar to HTML but with tags defined to hold cave survey data. These files are processed by troggle in real-time to produce an HTML file on the fly which is sent to your browser so that it <p>As you can see, this is an XML tag format similar to HTML but with tags defined to hold cave survey data. These files are processed by troggle in real-time to produce an HTML file on the fly which is sent to your browser so that it
looks <a href="http://expo.survex.com/augstb/4.htm">like this</a> looks <a href="http://expo.survex.com/cave/1623-4">like this</a>
<p>An explanation of what the field names mean and how they are used is on <p>An explanation of what the field names mean and how they are used is on
the <a href="caveentryfields.html">cave entry fields</a> page. There is not an exact correspondance between the <a href="caveentryfields.html">cave entry fields</a> page. There is not an exact correspondance between
@ -81,11 +83,11 @@ the form and the file format however.
<h2>File layout</h2> <h2>File layout</h2>
<p>The caves in our site are stored as XML files in the directory <tt>:expoweb:/cave_data</tt> and in <p>The caves in our site are stored as XML files in the directory <tt>:expoweb:/cave_data</tt> and in
files named <tt>:expoweb:/cave_data/{area}-{cavenumber}</tt>. Entrances are correspondingly files named <tt>:expoweb:/cave_data/{area}-{cavenumber}.html</tt>. Entrances are correspondingly
in <tt>:expoweb:/entrance_data</tt> files, with the same naming convention, except that if in <tt>:expoweb:/entrance_data</tt> files, with the same naming convention, except that if
there is more than one entrance they have a,b,c suffixes, e.g. <tt>:expoweb:/<b>entrance</b>_data/{area}-{cavenumber}b</tt> there is more than one entrance they have a,b,c suffixes, e.g. <tt>:expoweb:/<b>entrance</b>_data/{area}-{cavenumber}b</tt>
<p></p>Any <em>associated files</em>, usually photos and surveys, are <p></p>Any <em>associated files</em>, usually photos and surveys, are
stored under the area names <tt>:expoweb:/1623/{cavenumber}</tt> or <tt>:expoweb:/1626/{cavenumber}</tt> stored under the area names <tt>:expoweb:/1623/{cavenumber}/ent_photo1.jpg</tt> or <tt>:expoweb:/1626/{cavenumber}/</tt>
Note that this is a different naming convention: caves and entrances have the {area} as <em> Note that this is a different naming convention: caves and entrances have the {area} as <em>
part of the file name part of the file name
</em> </em>
@ -93,7 +95,8 @@ the form and the file format however.
<p>An <p>An
understanding of this file layout is very important when filling in the forms or writing the tags so that images understanding of this file layout is very important when filling in the forms or writing the tags so that images
appear on the final published website. The URLs in the XML file <em>should be relative URLs</em> to the cave page, which <em>appears</em> appear on the final published website. The URLs in the XML file <em>should be relative URLs</em> to the cave page, which <em>appears</em>
as <tt>cave/{area}/{cavenumber}</tt> on the website even though <em>internally</em> they are <tt>cave_data/{area}-{cavenumber}</tt> </p> as <tt>cave/{area}/{cavenumber}</tt> on the website even though <em>internally</em> the data
is coming from <tt>cave_data/{area}-{cavenumber}.html and entrance_data/{area}-{cavenumber}.html</tt> </p>
<hr /> <hr />
<p>Back to the form-filling method <p>Back to the form-filling method
<a href="caveentry.html">the form-filling method</a> guide <a href="caveentry.html">the form-filling method</a> guide

5
templates/cave_data.html
View File

@ -1,6 +1,9 @@
<!DOCTYPE html> <!DOCTYPE html>
<!-- Only put one cave in this file --> <!-- Only put one cave in this file -->
<!-- If you edit this file, make sure you update the websites database --> <!-- If you edit this file, make sure you update the websites database -->
<!-- ALTERNATIVELY you can use the online troggle form. The template for this is
in troggle/templates/dataformat/cave.xml and the code in troggle/core/forms.py and
troggle/views/caves.py . Default values are in the troggle/templates/dataformat/*.xml file -->
<html lang="en"> <html lang="en">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
@ -52,7 +55,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
<depth></depth> <!--Cave depth. 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) -->
<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/cavenum/cavnum.svx". (e.g. caves/204/204.svx --> <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/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. --> <description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
<url></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.html, e.g ('1623/165.html')--> <url></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')-->
</cave> </cave>
</body> </body>
</html> </html>

3
templates/entrance_data.html
View File

@ -1,6 +1,9 @@
<!DOCTYPE html> <!DOCTYPE html>
<!-- Only put one entrance in this file --> <!-- Only put one entrance in this file -->
<!-- If you edit this file, make sure you update the websites database --> <!-- If you edit this file, make sure you update the websites database -->
<!-- ALTERNATIVELY you can use the online troggle form. The template for this is
in troggle/templates/dataformat/entrance.xml and the code in troggle/core/forms.py and
troggle/views/caves.py . Default values are in the troggle/templates/dataformat/*.xml file -->
<html lang="en"> <html lang="en">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>