diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/cave_qms.html | 23 | ||||
| -rw-r--r-- | templates/qm.html | 19 |
2 files changed, 28 insertions, 14 deletions
diff --git a/templates/cave_qms.html b/templates/cave_qms.html index c5bde56..358d098 100644 --- a/templates/cave_qms.html +++ b/templates/cave_qms.html @@ -7,8 +7,8 @@ <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> - <li><a href="{% url 'caveQMs' '1623-204' %}">1623-204 QMs</a> + <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> </ul> <p>QMs are also loaded directly from the survex files, e.g. see @@ -24,20 +24,29 @@ {% block content %} <h3>Extant</h3> <p>{% if cave.get_QMs %} - <ul id="cavelist"> + <ul> {% for QM in cave.get_QMs %} - {% if QM.ticked_off_by %} + {% if QM.ticked %} {% else %} - <li><a href="{{QM.get_absolute_url}}">{{QM}}</a> :: {{QM.nearest_station_description}} {{QM.location_description}} <b>{{QM.grade}}</b></li> + <li><a href="{{QM.get_absolute_url}}">{{QM}}</a> :: {{QM.nearest_station_description}} {{QM.location_description}} <b>{{QM.grade}}</b> + {% if QM.block %} <a href="/survexfile/{{QM.block.survexfile.path}}.svx">{{QM.block}}.svx</a> {{QM.block.date}} {% endif %}</li> {% endif %} {% endfor %} </ul> <h3>Ticked off</h3> <ul> {% for QM in cave.get_QMs %} - {% if QM.ticked_off_by %} - <li><a href="{{QM.get_absolute_url}}">{{QM}}</a> :: {{QM.nearest_station_description}} {{QM.location_description}} <b>{{QM.grade}}</b></li> + {% if QM.ticked %} + <li><a href="{{QM.get_absolute_url}}">{{QM}}</a> :: {{QM.nearest_station_description}} {{QM.location_description}} <b>{{QM.grade}}</b> + {% if QM.block %} <a href="/survexfile/{{QM.block.survexfile.path}}.svx">{{QM.block}}.svx</a> {{QM.block.date}} {% endif %} + + {% if QM.completion_description %} + Completion page: <a href="/{{QM.get_completion_url}}">{{QM.completion_description}}</a> + {% endif %} {% endif %} + + + {% endfor %} </ul> {% endif %}</p> diff --git a/templates/qm.html b/templates/qm.html index 760f010..eb28174 100644 --- a/templates/qm.html +++ b/templates/qm.html @@ -4,8 +4,8 @@ {% block contentheader %} <h3>QMs available for these caves from CSV import</h3> <ul> - <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-161' %}">1623-161 QMs</a> Maybe OUT OF DATE. See <a href="/1623/161/qmdone.htm">the 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 curated list <b>instead</b></a> <li><a href="{% url 'caveQMs' '1623-234' %}">1623-234 QMs</a> </ul> <p>QMs are also loaded directly from the survex files, e.g. see @@ -42,6 +42,11 @@ <a href="/{{ qm.cave.url }}">{{ qm.cave|safe }} cave description</a> +{% if qm.block %} +<h3>Survexfile</h3> +{{qm.block.date}} <a href="/survexfile/{{qm.block.survexfile.path}}.svx">{{qm.block}}.svx</a> +{% endif %} + <h3>Location</h3> {{qm.location_description}} <br> @@ -56,12 +61,12 @@ Found by <a href="{{qm.found_by.get_absolute_url}}">{{qm.found_by}}</a> on {{qm. {% endif %} <h3>Completion</h3> -{% if ticked_off_by %} -{{qm.completion_description}} -Ticked off by: <a href="{{qm.ticked_off_by.get_absolute_url}}">{{qm.ticked_off_by}}</a><br /> -Description: {{qm.completion_description}} +{% if qm.ticked %} +Ticked off log entry: <a href="{{qm.ticked_off_by.get_absolute_url}}">{{qm.ticked_off_by}}</a><br /> +Ticked off Description Page: <a href="/{{qm.get_completion_url}}">{{qm.get_completion_url}}</a> {% else %} -None yet- STILL EXTANT. +No completion description yet- STILL EXTANT. + {% endif %} <h3>Comment</h3> |