diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/svxcaves.html | 17 | ||||
| -rw-r--r-- | templates/svxfile.html | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/templates/svxcaves.html b/templates/svxcaves.html index 2f3506d..1bea274 100644 --- a/templates/svxcaves.html +++ b/templates/svxcaves.html @@ -1,4 +1,4 @@ -<!-- svxcavesingle.html - this text visible because this template has been included --> +<!-- svxcaves.html - this text visible because this template has been included --> {% extends "base.html" %} {% block title %}List of survex files{% endblock %} {% block content %} @@ -13,8 +13,9 @@ <p>Wallets: <a href="/cave/scans/{{cave|safe}}">{{cave|safe}}</a> </p> <p> -{% for svxdir in cave.sds %} - <a href="#T_{{svxdir.primarysurvexfile.path}}">{{svxdir.path}}</a> +{% for svxprim in cave.sds %} + <a href="#T_{{svxprim}}">{{svxprim}}</a> + {% empty %} <p>If you were expecting to see a list of survex files here and a summary table of who did what and when, perhaps because you followed a link from <a href="/survexfile/caves/">the master caves' survex list</a> page which showed that such survex files clearly existed, and yet there is nothing here but a blank; then this will be because <br> @@ -39,11 +40,11 @@ to go to a form to correct the online data. Instructions for filling in this form are in this part <a href="/handbook/survey/caveentry.html"> of the survey handbook</a>. </p> -{% for svxdir in cave.sds %} - <h3 id="T_{{svxdir.primarysurvexfile.path}}">{{svxdir.path}}</h3> +{% for svxprim in cave.sds %} + <h3 id="T_{{svxprim.path}}">{{svxprim.path}}</h3> <table> <tr><th>Survex file</th><th>Block</th><th>Date</th><th>Explorers</th><th>length</th><th>Titles</th><th>Scans</th></tr> - {% for survexfile in svxdir.survexfile_set.all %} + {% for survexfile in svxprim.primarysurvex.all %} <tr> {% if survexfile.exists %} <td rowspan="{{survexfile.survexblock_set.all|length|add:"1"}}"> @@ -51,7 +52,7 @@ to go to a form to correct the online data. <td class="survexnewfile" rowspan="{{survexfile.survexblock_set.all|length|add:"1"}}"> {% endif %} - {% if survexfile == svxdir.primarysurvexfile %} + {% if survexfile == svxprim.primarysurvexfile %} <a href="{% url "svx" survexfile.path %}"><b>{% url "svx" survexfile.path %}</b></a> {% else %} <a href="{% url "svx" survexfile.path %}"><i><small>{% url "svx" survexfile.path %}</small></i></a><!-- would like to extract only the last bit. Some javascript useful ?--> @@ -98,6 +99,6 @@ to go to a form to correct the online data. {% endfor %} <!-- survexblock --> {% endfor %} <!-- survexfile --> </table> -{% endfor %} <!-- svxdir --> +{% endfor %} <!-- svxprim --> {% endfor %} <!-- caves --> {% endblock %} diff --git a/templates/svxfile.html b/templates/svxfile.html index db420cc..7d6dc14 100644 --- a/templates/svxfile.html +++ b/templates/svxfile.html @@ -82,7 +82,7 @@ LOGMESSAGES </div> underground survey length: {{svxlength|floatformat:2}} metres<br /> parent survex file <a href="/survexfile/{{ survexfile.cave.survex_file }}">{{survexfile.cave.survex_file}}</a> for this cave <br> -survex directory <a href="/survexfile/{{survexfile.survexdirectory.primarysurvexfile}}">{{survexfile.survexdirectory}}</a> <br /> +survex directory <a href="/survexfile/{{survexfile.primary}}.svx">{{survexfile.primary}}</a> <br /> {% for sb in svxblocks %} block <em>{{sb}}</em> has parent block <em>{{sb.parent}}</em><br /> {% empty %} |