From 0f76422d851cb7b1f7185c4c6c86e5004df748d7 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Wed, 5 Apr 2023 23:33:01 +0100 Subject: [PATCH] format change --- templates/cave_open_qms.html | 23 ++++++++++++----------- 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 %}

Open Leads for {{cave.kataster_number}} {% if cave.official_name %}- {{cave.official_name|safe}}{% endif %}{% if cave.unofficial_number %} - ({{cave.unofficial_number|safe}}){% endif %}

@@ -29,10 +29,11 @@ li { {% ifchanged QM.block %}

{{QM.block}}.svx

{% endifchanged %}
  • {{QM.grade}} {{QM}} - {% if QM.nearest_station_name %}§{{QM.nearest_station_name|safe}}§{% endif %}
    + {% if QM.nearest_station_name %}§{{QM.nearest_station_name|safe}}§{% endif %} + {% if QM.block %}   {{QM.block.date|date:'Y-m-d'}} {% endif %}
    {{QM.location_description|safe}}
    - {% if QM.block %}{{QM.block.date|date:'Y-m-d'}} {% endif %} + {% if QM.comment %} {{QM.comment}}{% endif %}

    {% empty %} @@ -45,17 +46,17 @@ li {

    Note that QMs loaded for 1623-161, 1623-204 and 1623-234 are imported from CSV files .

    QMs are also loaded directly from the survex files, e.g. see

    For how to set up your own QMs, see Adding QMs . 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: {{qm.blockname}}
    {% endif %} QM Nearest station: '{{qm.nearest_station_name}}' {{nearest_station_description}}
    -QM Page reference: '{{qm.page_ref|safe}}'
    +{% if qm.page_ref %}QM Page reference: '{{qm.page_ref|safe}}'
    {% endif %}

    QM original description

    -
    {{qm.location_description|safe}}
    +
    {{qm.location_description|safe}}
    {% if qm.found_by %}

    Creation

    @@ -65,6 +65,7 @@ Found by {{qm.found_by}} on {{qm. {% if qm.cave %}

    Cave: {{qm.cave|safe }}

    {{ qm.cave|safe }} - all QMs for this cave
    +{{ qm.cave|safe }} - open QMs checklist for this cave
    {{ qm.cave|safe }} - cave description
    {{ qm.cave|safe }} - all survexfiles for this cave
    {{ qm.cave|safe }} - primary survexfile for this cave