From ee4237b14cd831114f8a3a787fc908f62e72f4a4 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Wed, 6 Jul 2022 13:44:40 +0300 Subject: [PATCH] cleaner template pages --- templates/cave_qms.html | 15 ++++++++------- templates/qm.html | 28 +++++++++++++++++++--------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/templates/cave_qms.html b/templates/cave_qms.html index f108a8f..6d0f53e 100644 --- a/templates/cave_qms.html +++ b/templates/cave_qms.html @@ -7,16 +7,17 @@

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 (possibly buggy, July 2022), e.g. see

- +
  • 1623-264 QMs +
  • 1623-258 QMs +
  • 1623-290 QMs + +

    For full explanation of the current status of the QM system(s), see scriptsqms page. {% endblock %} {% block content %} diff --git a/templates/qm.html b/templates/qm.html index c640385..4bcc25d 100644 --- a/templates/qm.html +++ b/templates/qm.html @@ -4,14 +4,15 @@ {% block contentheader %}

    QMs available for these caves from CSV import

    QMs are also loaded directly from the survex files (possibly buggy, July 2022), e.g. see

    For full explanation of the current status of the QM system(s), see scriptsqms page. @@ -26,15 +27,24 @@ {% endblock %} {% block related %} - {% endblock %} -

    Related items

    - -Parent cave: {{qm.found_by.cave|link}} + {% block content %} +

    Cave

    +{% if qm.cave %} +{{ qm.cave|safe }} QMs
    +{% else %} + {% if qm.found_by.cave %} + {{ qm.found_by.cave|safe }} QMs
    + {% endif %} +{% endif %} +{{ qm.cave|safe }} cave description +

    Location

    {{qm.location_description}} +
    +{{qm.blockname}}

    Grade

    {{qm.grade}}