diff options
| -rw-r--r-- | templates/cave_open_qms.html | 23 | ||||
| -rw-r--r-- | templates/qm.html | 5 |
2 files changed, 15 insertions, 13 deletions
diff --git a/templates/cave_open_qms.html b/templates/cave_open_qms.html index b2f5029..aaf7f31 100644 --- a/templates/cave_open_qms.html +++ b/templates/cave_open_qms.html @@ -1,6 +1,6 @@ {% extends "base.html" %} {% load link %} -{% block title %} QM: {{qm|safe}} {% endblock %} +{% block title %} Open Leads - un-ticked QMs {{qm|safe}} {% endblock %} {% block contentheader %} <h2>Open Leads for <a href="/{{cave.url}}">{{cave.kataster_number}} {% if cave.official_name %}- {{cave.official_name|safe}}{% endif %}</a>{% if cave.unofficial_number %} - ({{cave.unofficial_number|safe}}){% endif %}</h2> @@ -29,10 +29,11 @@ li { {% ifchanged QM.block %} <div style="text-align:center"><hr /><a href="/survexfile/{{QM.block.survexfile.path}}.svx">{{QM.block}}.svx</a></div><br />{% endifchanged %} <li> <b>{{QM.grade}}</b> <a href="{{QM.get_absolute_url}}">{{QM}}</a> - {% if QM.nearest_station_name %}§<em><span style="font-family: monospace">{{QM.nearest_station_name|safe}}</span></em>§{% endif %}<br /> + {% if QM.nearest_station_name %}§<em><span style="font-family: monospace">{{QM.nearest_station_name|safe}}</span></em>§{% endif %} + {% if QM.block %} {{QM.block.date|date:'Y-m-d'}} {% endif %}<br /> {{QM.location_description|safe}}<br /> - {% if QM.block %}{{QM.block.date|date:'Y-m-d'}} {% endif %} + {% if QM.comment %} <span style="color:red;">{{QM.comment}}</span>{% endif %}<br /><br /> {% empty %} @@ -45,17 +46,17 @@ li { <p>Note that QMs loaded for 1623-161, 1623-204 and 1623-234 are imported from CSV files . <ul> - <li><a href="{% url 'caveQMs' '1623-161' %}">1623-161 QMs</a> Maybe OUT OF DATE. See <a href="/1623/161/qmdone.htm">the manually curated list <b>instead</b></a> - <li><a href="{% url 'caveQMs' '1623-204' %}">1623-204 QMs</a> Maybe OUT OF DATE. See <a href=" /1623/204/qm.html">the manually curated list <b>instead</b></a> - <li><a href="{% url 'caveQMs' '1623-234' %}">1623-234 QMs</a> + <li><a href="{% url 'cave_openQMs' '1623-161' %}">1623-161 QMs</a> Maybe OUT OF DATE. See <a href="/1623/161/qmdone.htm">the manually curated list <b>instead</b></a> + <li><a href="{% url 'cave_openQMs' '1623-204' %}">1623-204 QMs</a> Maybe OUT OF DATE. See <a href=" /1623/204/qm.html">the manually curated list <b>instead</b></a> + <li><a href="{% url 'cave_openQMs' '1623-234' %}">1623-234 QMs</a> </ul> <p>QMs are also loaded directly from the survex files, e.g. see <ul> - <li><a href="{% url 'caveQMs' '1623-264' %}">1623-264 QMs</a> Balkon - <li><a href="{% url 'caveQMs' '1623-258' %}">1623-258 QMs</a> Tunnocks - <li><a href="{% url 'caveQMs' '1623-290' %}">1623-290 QMs</a> Fischgesicht - <li><a href="{% url 'caveQMs' '1623-291' %}">1623-291 QMs</a> Happy Butterfly - <li><a href="{% url 'caveQMs' '1626-359' %}">1626-359 QMs</a> Homecoming + <li><a href="{% url 'cave_openQMs' '1623-264' %}">1623-264 QMs</a> Balkon + <li><a href="{% url 'cave_openQMs' '1623-258' %}">1623-258 QMs</a> Tunnocks + <li><a href="{% url 'cave_openQMs' '1623-290' %}">1623-290 QMs</a> Fischgesicht + <li><a href="{% url 'cave_openQMs' '1623-291' %}">1623-291 QMs</a> Happy Butterfly + <li><a href="{% url 'cave_openQMs' '1626-359' %}">1626-359 QMs</a> Homecoming </ul> <p>For how to set up your own QMs, see <a href="/handbook/survey/qmentry.html">Adding QMs </a>. diff --git a/templates/qm.html b/templates/qm.html index c027918..4c2ddd3 100644 --- a/templates/qm.html +++ b/templates/qm.html @@ -52,10 +52,10 @@ Survex block: <span style="font-family: monospace">{{qm.blockname}}</span> <br> {% endif %} 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> +{% if qm.page_ref %}QM Page reference: <span style="font-family: monospace">'<a href="/{{qm.cave.url_parent}}/{{qm.page_ref}}">{{qm.page_ref|safe}}</a>'</span><br />{% endif %} <h4>QM original description</h4> -<div style="text-indent: 5%; font-family: monospace">{{qm.location_description|safe}}</div> +<div style="text-indent: 5%; font-size: 150%; font-family: monospace">{{qm.location_description|safe}}</div> {% if qm.found_by %} <h4>Creation</h4> @@ -65,6 +65,7 @@ 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> for this cave <br> +{{ qm.cave|safe }} - <a href="{% url 'cave_openQMs' qm.cave|safe %}">open QMs checklist </a> for this cave <br> {{ qm.cave|safe }} - <a href="/{{ qm.cave.url }}"> cave description </a> <br /> {{ 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 /> |