diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/cave_qms.html | 20 | ||||
| -rw-r--r-- | templates/qm.html | 11 |
2 files changed, 18 insertions, 13 deletions
diff --git a/templates/cave_qms.html b/templates/cave_qms.html index 1839004..6c29fb8 100644 --- a/templates/cave_qms.html +++ b/templates/cave_qms.html @@ -28,8 +28,10 @@ <ul>{% for QM in cave.get_open_QMs %} <li><a href="{{QM.get_absolute_url}}">{{QM}}</a> {% if QM.nearest_station_name %}§<em>{{QM.nearest_station_name|safe}}</em>§{% endif %} -{{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> +{{QM.location_description|safe}} <b>{{QM.grade}}</b> + {% if QM.block %} <a href="/survexfile/{{QM.block.survexfile.path}}.svx">{{QM.block}}.svx</a> {{QM.block.date|date:'Y-m-d'}} {% endif %} + {% if QM.comment %} + <span style="color:red;">{{QM.comment}}</span>{% endif %} {% empty %} <li>No open leads. {% endfor %} @@ -43,14 +45,15 @@ {% if QM.nearest_station_name %}§<em>{{QM.nearest_station_name|safe}}</em>§{% endif %} {% if QM.resolution_station_name %}<b>☆<em>{{QM.resolution_station_name|safe}}</em>☆</b>{% endif %} {{QM.location_description|safe}} <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.block %} <a href="/survexfile/{{QM.block.survexfile.path}}.svx">{{QM.block}}.svx</a> {{QM.block.date|date:'Y-m-d'}} {% endif %} {% if QM.completion_description %} - Completion page: <a href="/{{QM.get_completion_url}}">{{QM.completion_description}}</a> + ⋮<em>{{QM.completion_description|safe}}</em>⋮ {% endif %} + {% if QM.page_ref %}☉<em><a href="/{{QM.cave.url_parent}}/{{QM.page_ref}}">{{QM.page_ref}}</a></em>☉{% endif %} {% if QM.comment %} - Comment: <a href="/{{QM.get_completion_url}}">{{QM.comment}}</a> - {% endif %} + <span style="color:red;">{{QM.comment}}</span>{% endif %} {% empty %} <li>No ticked leads. {% endfor %} @@ -58,4 +61,7 @@ </p> § QM.nearest_station_name<br /> ☆ QM.resolution_station_name - when ticked.<br /> +☉ QM.page_ref<br /> +⋮ QM.completion_description<br /> + <span style="color:red;">QM.comment</span><br /> {% endblock %}
\ No newline at end of file diff --git a/templates/qm.html b/templates/qm.html index d10e742..0679452 100644 --- a/templates/qm.html +++ b/templates/qm.html @@ -26,12 +26,11 @@ {% if qm.resolution_station_name %} The survey station which record the continuation of the cave past this QM is <b>{{qm.resolution_station_name}}</b>.<br /> {%endif %} -Tick off comment: '{{qm.comment}}'</a> <br /> -Tick off completion description: '{{qm.completion_description}}' </a> <br /> -Tick off url: <a href="/{{qm.get_completion_url}}">{{qm.get_completion_url}}</a> WRONG <br /> -Tick off date: '{{qm.completion_date}}' [For survex file ticks. not implemented yet]</a> <br /> +Tick off comment: '{{qm.comment|safe}}'</a> <br /> +Tick off completion description: '{{qm.completion_description|safe}}' </a> <br /> +Tick off date: '{{qm.completion_date|date:'Y-m-d'}}' [For survex file ticks. not implemented yet]</a> <br /> {% endif %} -QM page_ref: '{{qm.page_ref}}'<br> +QM page_ref: '{{qm.page_ref|safe}}'<br> {% if qm.cave %} <h3>Cave: {{qm.cave|safe }}</h3> @@ -50,7 +49,7 @@ Comment: '{{qm.comment}}'</a> <br /> {% if qm.block %} <h3>Survexfile</h3> -{{qm.block.date}} <a href="/survexfile/{{qm.block.survexfile.path}}.svx">{{qm.block}}.svx</a> +{{qm.block.date|date:'Y-m-d'}} <a href="/survexfile/{{qm.block.survexfile.path}}.svx">{{qm.block}}.svx</a> {% endif %} |