summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/caveindex.html4
-rw-r--r--templates/dataformat/cave.xml2
-rw-r--r--templates/prospecting.html2
3 files changed, 3 insertions, 5 deletions
diff --git a/templates/caveindex.html b/templates/caveindex.html
index bb69585..a86c18a 100644
--- a/templates/caveindex.html
+++ b/templates/caveindex.html
@@ -49,7 +49,7 @@
</p>
<h3>1626</h3>
-<div style="column-count: 2;">
+<div style="column-count: 3;">
<table class="searchable">
{% for cave in caves1626 %}
<tr><td><a href="{{ cave.url }}">{% if cave.kataster_number %}{{ cave.kataster_number }} {{cave.official_name|safe}}</a> {% if cave.unofficial_number %}({{cave.unofficial_number }}){% endif %}{% else %}{{cave.unofficial_number }} {{cave.official_name|safe}}</a> {% endif %} </td></tr>
@@ -64,7 +64,7 @@
</p>
<h3>1627</h3>
-<div style="column-count: 2;">
+<div style="column-count: 3;">
<table class="searchable">
{% for cave in caves1627 %}
<tr><td><a href="{{ cave.url }}">{% if cave.kataster_number %}{{ cave.kataster_number }} {{cave.official_name|safe}}</a> {% if cave.unofficial_number %}({{cave.unofficial_number }}){% endif %}{% else %}{{cave.unofficial_number }} {{cave.official_name|safe}}</a> {% endif %} </td></tr>
diff --git a/templates/dataformat/cave.xml b/templates/dataformat/cave.xml
index 236a2fe..e7f12e6 100644
--- a/templates/dataformat/cave.xml
+++ b/templates/dataformat/cave.xml
@@ -19,7 +19,7 @@ the form documented at
<non_public>{{ cave.non_public }}</non_public>{% for slug in cave.caveslug_set.all %}<!-- '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>{{ slug.slug|default_if_none:"1623-000"|safe }}</caveslug>{% endfor %}<!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195' -->
<official_name>{{ cave.official_name|default_if_none:""|safe }}</official_name><!-- Name of the cave (normally in German) Use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
-{% for area in cave.area.all %}<area>{{ area.short_name|default_if_none:""|safe }}</area>{% endfor %}<!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
+<area>{{cave.areacode |safe }}</area><!-- e.g. "1623" -->
<kataster_code>{{ cave.kataster_code|default_if_none:""|safe }}</kataster_code><!-- 'length-or-depth/type exploration'
code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
diff --git a/templates/prospecting.html b/templates/prospecting.html
index fea256f..90626f3 100644
--- a/templates/prospecting.html
+++ b/templates/prospecting.html
@@ -40,8 +40,6 @@
<td><a href="/{{ cave.url }}">{{ cave }}</a></td>
<td>{{ cave.official_name|safe }}</td>
<td>{{ cave.kataster_code }}</td>
- <td>{{ cave.hassurveydata }}</td>
- <td>{{ cave.hassurvey }}</td>
<td>{{ cave.caveandentrance_set.all.0.entrance.marking_val }}</td>
<td>{{ cave.caveandentrance_set.all.0.entrance.has_photo }} </td>
<td>{{ cave.caveandentrance_set.all.0.entrance.find_location }}</td>