diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/controlPanel.html | 2 | ||||
| -rw-r--r-- | templates/dataformat/cave.xml | 4 | ||||
| -rw-r--r-- | templates/menu.html | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/templates/controlPanel.html b/templates/controlPanel.html index b50821c..c840b35 100644 --- a/templates/controlPanel.html +++ b/templates/controlPanel.html @@ -24,7 +24,7 @@ <li><a href="/pathsreport">Folder paths used</a> -folders settings used by this troggle installation <li><a href="/aliases/2023">Expoer name aliases</a> -short names recognised by troggle <li><a href="/dataissues">Data Issues on Imports</a> - warnings and errors from the recent data import -<li><a href="/survexfilewild/2023">Wild survex files</a> - survex files contianing blocks with no related wallet +<li><a href="/survexfilewild/2023">Wild survex files</a> - survex files containing blocks with no related wallet <li><a href="/survexdir">Survex Directories</a> - Every Cave has an associated directory and a Primary survex file <li><a href="/surveximport">Survex import record</a> - indented *include and begin/end tree<br /><li><a href="/survexdebug">Survex debug report</a> - warnings and details<br /> <li><a href="/therionissues">Therion Import issues</a> - warnings from the recent data import<br /><br /> diff --git a/templates/dataformat/cave.xml b/templates/dataformat/cave.xml index 2a4e466..e8c6b5f 100644 --- a/templates/dataformat/cave.xml +++ b/templates/dataformat/cave.xml @@ -17,7 +17,7 @@ the form documented at <cave> <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' --> +<caveslug>{{ slug.slug|default_if_none:"1623-000"|safe }}</caveslug>{% endfor %}<!--No longer required, we use the filename instead e.g. 1623-315 for 1623-315.html --> <official_name>{{ cave.official_name|default_if_none:""|safe }}</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>{{cave.areacode |safe }}</area><!-- e.g. "1623" --> <kataster_code>{{ cave.kataster_code|default_if_none:"-"|safe }}</kataster_code><!-- 'length-or-depth/type exploration' @@ -40,7 +40,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast {% for ce in cave.entrances.all %} <entrance> <entranceslug>{{ ce.entrance.slug|default_if_none:""|safe }}</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 --> - <letter>{{ ce.entranceletter|default_if_none:""|safe }}</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>{{ ce.entranceletter|default_if_none:""|safe }}</letter><!--Leave blank for single-entrance cave. If there is more than one entrance then the letter needs to be given. Must match the entranceslug ID. --> </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. --> diff --git a/templates/menu.html b/templates/menu.html index 6728abe..654cd97 100644 --- a/templates/menu.html +++ b/templates/menu.html @@ -51,7 +51,8 @@ <input type=submit value="Search"></form></li> {% if editable %}<li><a href="{% if local %}https://expo.survex.com{% endif %}{% url "editexpopage" path %}" class="editlink"><strong>Edit this page</strong></a></li>{% endif %} {% if cave_editable %}<li><a href="{% if local %}https://expo.survex.com{% endif %}{% url "edit_cave" cave.url_parent cave.slug %}" class="editlink"><strong>Edit this cave</strong></a></li>{% endif %} -<li> {% if settings.DEVSERVER %}<b style="color:red">RUNNING ON LOCALSERVER</b>{% endif %} +<li> {% if settings.DEVSERVER %}<b style="color:red">RUNNING ON LOCALSERVER</b> <br>slug:{{ cave.slug }}<br>newslug:{{ cave.newslug }}<br>url:{{ cave.url }}{% endif %} </ul> </div> {% endif %} + |