diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/cave.html | 9 | ||||
| -rw-r--r-- | templates/qm.html | 15 |
2 files changed, 14 insertions, 10 deletions
diff --git a/templates/cave.html b/templates/cave.html index a7faab2..65d43f5 100644 --- a/templates/cave.html +++ b/templates/cave.html @@ -480,17 +480,22 @@ div#scene { <div id="Description"> - +{% comment %} The 'cave' object has text field, not forign-key fields, so we cant dereference to get info on the survex file +{% endcomment %} <p>{% if cave.explorers %} <h2>Explorers</h2> {{ cave.explorers|safe }} {% endif %} <h2>Survex File(s)</h2> - All <a href="/survexfile/{{cave.kataster_number}}">survexfiles</a> for this cave<br /> + All <a href="/survexfile/{{cave.kataster_number}}">survexfiles</a> for this cave {<br /> {% if cave.survex_file %} Primary <a href="/survexfile/{{cave.survex_file}}">survex file</a> for this cave <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> + Download .3d file <a href="/cave/3d/{{cave}}">caves-{{ cave.area.all.0.kat_area }}/{{cave.kataster_number}}/{{svx3d}}.3d</a> +<br> +cave ID '{{cave.reference}}'<br> +cave survex path '{{ cave.area.all.0.kat_area }}/{{cave.kataster_number}}' <div id='scene'></div> {% endif %} {% if cave.underground_description %} diff --git a/templates/qm.html b/templates/qm.html index 0b6a633..c027918 100644 --- a/templates/qm.html +++ b/templates/qm.html @@ -48,14 +48,14 @@ Comment: '<span style="color:red;">{{qm.comment}}</span>'</a> <br /> <h4>QM original closest survey station</h4> {% if qm.block %} -Survex block: {{qm.blockname}} +Survex block: <span style="font-family: monospace">{{qm.blockname}}</span> <br> {% endif %} -QM Nearest station: '{{qm.nearest_station_name}}' {{nearest_station_description}}<br /> -QM page_ref: '{{qm.page_ref|safe}}'<br> +QM Nearest station: <span style="font-family: monospace">'{{qm.nearest_station_name}}' {{nearest_station_description}}</span><br /> +QM Page reference: <span style="font-family: monospace">'<a href="/{{qm.cave.url_parent}}/{{qm.page_ref}}">{{qm.page_ref|safe}}</a>'</span><br> <h4>QM original description</h4> -{{qm.location_description|safe}} +<div style="text-indent: 5%; font-family: monospace">{{qm.location_description|safe}}</div> {% if qm.found_by %} <h4>Creation</h4> @@ -64,11 +64,10 @@ Found by <a href="{{qm.found_by.get_absolute_url}}">{{qm.found_by}}</a> on {{qm. {% if qm.cave %} <h4>Cave: {{qm.cave|safe }}</h4> -{{ qm.cave|safe }} - <a href="{% url 'caveQMs' qm.cave|safe %}">All QMs </a> <br> +{{ qm.cave|safe }} - <a href="{% url 'caveQMs' qm.cave|safe %}">all QMs </a> for this cave <br> {{ qm.cave|safe }} - <a href="/{{ qm.cave.url }}"> cave description </a> <br /> -{{ qm.cave|safe }} - <a href="/survexfile/{{ qm.cave.kataster_number }}"> survexfiles </a> <br /> -{{ qm.cave|safe }} - all <a href="/survexfile/{{qm.cave.kataster_number}}">survexfiles</a><br /> -{{ qm.cave|safe }} - <a href="/survexfile/{{qm.cave.survex_file}}">primary survexfile</a> +{{ qm.cave|safe }} - all <a href="/survexfile/{{qm.cave.kataster_number}}">survexfiles</a> for this cave<br /> +{{ qm.cave|safe }} - <a href="/survexfile/{{qm.cave.survex_file}}">primary survexfile</a> for this cave<br /><br /> {% endif %} </div> |