cleaner template pages

This commit is contained in:
Philip Sargent 2022-07-06 13:44:40 +03:00
parent 848043f7f4
commit ee4237b14c
2 changed files with 27 additions and 16 deletions

View File

@ -7,16 +7,17 @@
<p>Note that QMs loaded for 1623-161, 1623-204 and 1623-234 are imported from CSV files .
<ul>
<li><a href="/cave/qms/1623-161">1623-161 QMs</a>
<li><a href="/cave/qms/1623-204">1623-204 QMs</a>
<li><a href="/cave/qms/1623-234">1623-234 QMs</a>
<li><a href="{% url 'caveQMs' '1623-161' %}">1623-161 QMs</a>
<li><a href="{% url 'caveQMs' '1623-204' %}">1623-204 QMs</a>
<li><a href="{% url 'caveQMs' '1623-234' %}">1623-234 QMs</a>
</ul>
<p>QMs are also loaded directly from the survex files (possibly buggy, July 2022), e.g. see
<ul>
<li><a href="/cave/qms/1623-264">1623-264 QMs</a>
<li><a href="/cave/qms/1623-290">1623-290 QMs</a>
</ul>
<li><a href="{% url 'caveQMs' '1623-264' %}">1623-264 QMs</a>
<li><a href="{% url 'caveQMs' '1623-258' %}">1623-258 QMs</a>
<li><a href="{% url 'caveQMs' '1623-290' %}">1623-290 QMs</a>
</ul>
<p>For full explanation of the current status of the QM system(s), see <a href="/handbook/troggle/scriptsqms.html">scriptsqms page</a>.
{% endblock %}
{% block content %}

View File

@ -4,14 +4,15 @@
{% block contentheader %}
<h3>QMs available for these caves from CSV import</h3>
<ul>
<li><a href="/cave/qms/1623-161">1623-161 QMs</a>
<li><a href="/cave/qms/1623-204">1623-204 QMs</a>
<li><a href="/cave/qms/1623-234">1623-234 QMs</a>
<li><a href="{% url 'caveQMs' '1623-161' %}">1623-161 QMs</a>
<li><a href="{% url 'caveQMs' '1623-204' %}">1623-204 QMs</a>
<li><a href="{% url 'caveQMs' '1623-234' %}">1623-234 QMs</a>
</ul>
<p>QMs are also loaded directly from the survex files (possibly buggy, July 2022), e.g. see
<ul>
<li><a href="/cave/qms/1623-264">1623-264 QMs</a>
<li><a href="/cave/qms/1623-290">1623-290 QMs</a>
<li><a href="{% url 'caveQMs' '1623-264' %}">1623-264 QMs</a>
<li><a href="{% url 'caveQMs' '1623-258' %}">1623-258 QMs</a>
<li><a href="{% url 'caveQMs' '1623-290' %}">1623-290 QMs</a>
</ul>
<p>For full explanation of the current status of the QM system(s), see <a href="/handbook/troggle/scriptsqms.html">scriptsqms page</a>.
@ -26,15 +27,24 @@
{% endblock %}
{% block related %}
{% endblock %}
<h2>Related items</h2>
Parent cave: {{qm.found_by.cave|link}}
{% block content %}
<h3>Cave</h3>
{% if qm.cave %}
<a href="{% url 'caveQMs' qm.cave|safe %}">{{ qm.cave|safe }} QMs</a> <br>
{% else %}
{% if qm.found_by.cave %}
<a href="{% url 'caveQMs' qm.found_by.cave|safe %}">{{ qm.found_by.cave|safe }} QMs</a> <br>
{% endif %}
{% endif %}
<a href="/{{ qm.cave.url }}">{{ qm.cave|safe }} cave description</a>
<h3>Location</h3>
{{qm.location_description}}
<br>
{{qm.blockname}}
<h3>Grade</h3>
{{qm.grade}}