xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

Fix URL to survex file in menus

Browse Source
This commit is contained in:
Philip Sargent 2023-03-11 00:47:13 +00:00
parent 7c923842ca
commit 4d66548920
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
templates/base.html
View File

@ -26,9 +26,9 @@
</div>
</div>
<div class="toolbarlinks">
<a href="{% url "survexcavessingle" "264" %}">264</a> |
<a href="{% url "survexcavessingle" "290" %}">290</a> |
<a href="{% url "survexcavessingle" "359" %}">359</a> |
<a href="/survexfile/caves-1623/264/264.svx">264</a> |
<a href="/survexfile/caves-1623/290/290.svx">290</a> |
<a href="/survexfile/caves-1626/359/359.svx">359</a> |
<a href="/survexfile/">Survex</a> |
<a href="{% url "survexcaveslist" %}">All Survex</a> |
<a href="{% url "allscans" %}">Scans</a> |

14
templates/cave.html
View File

@ -485,6 +485,13 @@ div#scene {
<h2>Explorers</h2>
{{ cave.explorers|safe }}
{% endif %}
{% if cave.survex_file %}
<h2>Survex File</h2>
<p>[<a href="https://aardgoose.github.io/CaveView.js/">CaveView</a> display of the .3d file is temporarily disabled while we fix things (Nov.2021).<br> See <a href="/handbook/computing/todo.rst">/handbook/computing/todo.rst</a>.]<br><br>
Primary <a href="/survexfile/{{cave.survex_file}}">Survex file</a> &nbsp;for this cave
<div id='scene'></div>
{% endif %}
{% if cave.underground_description %}
<h2>Underground Description</h2>
{{ cave.underground_description|safe }}
@ -515,14 +522,7 @@ div#scene {
<a href="{% url 'caveQMs' cave_id|safe %}">QM page for {{ cave_id|safe }}</a>
{% endif %}
{% if cave.survex_file %}
<h2>Survex File</h2>
<p><a href="https://aardgoose.github.io/CaveView.js/">CaveView</a> display of the .3d file is temporarily disabled while we fix things (Nov.2021). See <a href="/handbook/computing/todo.rst">/handbook/computing/todo.rst</a>.<br>
<a href="{% if cave.kataster_number %}{% url "cave3d" cave.kataster_number %} {% else %}{% url "cave3d" cave.unofficial_number %} {% endif %}">3d file download</a>&nbsp;for this cave<br>
<a href="{% if cave.kataster_number %}{% url "survexcavessingle" cave.kataster_number %}{% else %}{% url "survexcavessingle" cave.unofficial_number %}{% endif %}">survex file</a> &nbsp;for this cave
<div id='scene'></div>
{% endif %}
<h2>Scanned survey notes</h2>
<a href="{% url "cavewallets" cave_id %}">{{ cave_id|safe }}</a>

3
templates/dataformat/cave.xml
View File

@ -42,6 +42,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
</entrance>
{% endfor %}
<explorers>{{ cave.explorers|default_if_none:""|safe }}</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>{{ cave.survex_file|default_if_none:"caves-1623/000/000.svx"|safe }}</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 -->
<underground_description>{{ cave.underground_description|default_if_none:""|safe }}</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>{{ cave.equipment|default_if_none:""|safe }}</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>{{ cave.references|default_if_none:""|safe }}</references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
@ -52,7 +53,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
<length>{{ cave.length|default_if_none:""|safe }}</length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
<depth>{{ cave.depth|default_if_none:""|safe }}</depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
<extent>{{cave.extent|default_if_none:""|safe }}</extent>
<survex_file>{{ cave.survex_file|default_if_none:"caves-1623/000/000.svx"|safe }}</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>{{ cave.description_file|default_if_none:""|safe }}</description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
<url>{{ cave.url|default_if_none:"1623/000"|safe }}</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>