diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/caveindex.html | 2 | ||||
| -rw-r--r-- | templates/cavewallets.html | 11 | ||||
| -rw-r--r-- | templates/personwallets.html | 10 | ||||
| -rw-r--r-- | templates/yearwallets.html | 10 |
4 files changed, 25 insertions, 8 deletions
diff --git a/templates/caveindex.html b/templates/caveindex.html index e14490b..6828159 100644 --- a/templates/caveindex.html +++ b/templates/caveindex.html @@ -23,7 +23,7 @@ {% endfor %} </ul> -Red star <span style="color: red">*</span> against a name indicates that no survex file is explicitly associated with the cave. +Red star <span style="color: red">*</span> against a name indicates that no survex file is explicitly associated with the cave (but there might be a *fix somewhere) <h3>1623</h3> <div style="column-count: 3;"> diff --git a/templates/cavewallets.html b/templates/cavewallets.html index 3f88def..ffc4034 100644 --- a/templates/cavewallets.html +++ b/templates/cavewallets.html @@ -31,8 +31,13 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c <td style="padding:2px">{% if wallet.walletdate %}{{wallet.walletdate}}{% else %} {% endif %}</td> <td style="padding:2px">{% if wallet.name %}{{wallet.name|truncatechars:20}}{% else %}<em>{% if wallet.displaynames %} {% for dn in wallet.displaynames %}{{dn}}{%if not forloop.last %}, {% endif %} {% endfor %}{% else %} {% endif %}</em>{% endif %}</td> - <td style="padding:2px">{% if wallet.slugpeople %}<em>{%for p in wallet.slugpeople%}<a href="/person/{{p.slug}}">{{p.fullname}}</a>{%if not forloop.last %}, {% endif %}{% endfor %}</em>{% else %}{{wallet.persons }}{% endif %}</td> - <td align="center" style="padding:2px"><a href="{{wallet.get_absolute_url}}">{{wallet.singlescan_set.all|length}}</a></td> + <td style="padding:2px"> + {% if wallet.slugpeople %} + <em>{%for p in wallet.slugpeople%}<a href="/person/{{p.slug}}">{{p.fullname}}</a>{%if not forloop.last %}, {% endif %}{% endfor %}</em> + {% endif %} + {%for p in wallet.persons%} + <a href="/person/{{p.slug}}">{{p.fullname}}</a>{%if not forloop.last %}, {% endif %} + {% endfor %}</td> <td align="center" style="padding:2px"><a href="{{wallet.get_absolute_url}}">{{wallet.singlescan_set.all|length}}</a></td> <td style="padding:2px"> {% for survexblock in wallet.survexblock_set.all %} <a href="{% url "svx" survexblock.survexfile.path %}">{{survexblock}}</a> @@ -49,5 +54,5 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c </tr> {% endfor %} </table> - +<br />Names in italics are taken from the associated survex file blocks, names not in italics are listed explicitly on the wallet. {% endblock %}
\ No newline at end of file diff --git a/templates/personwallets.html b/templates/personwallets.html index 251ded6..55a0e0e 100644 --- a/templates/personwallets.html +++ b/templates/personwallets.html @@ -30,7 +30,13 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c <td style="padding:2px" >{% if wallet.walletdate %}{{wallet.walletdate}}{% else %} {% endif %}</td> <td style="padding:2px">{% if wallet.name %}{{wallet.name|truncatechars:20}}{% else %}<em>{% if wallet.displaynames %} {% for dn in wallet.displaynames %}{{dn}}{%if not forloop.last %}, {% endif %} {% endfor %}{% else %} {% endif %}</em>{% endif %}</td> - <td style="padding:2px">{% if wallet.slugpeople %}<em>{%for p in wallet.slugpeople%}<a href="/person/{{p.slug}}">{{p.fullname}}</a>{%if not forloop.last %}, {% endif %}{% endfor %}</em>{% else %}{{wallet.persons }}{% endif %}</td> + <td style="padding:2px"> + {% if wallet.slugpeople %} + <em>{%for p in wallet.slugpeople%}<a href="/person/{{p.slug}}">{{p.fullname}}</a>{%if not forloop.last %}, {% endif %}{% endfor %}</em> + {% endif %} + {%for p in wallet.persons%} + <a href="/person/{{p.slug}}">{{p.fullname}}</a>{%if not forloop.last %}, {% endif %} + {% endfor %}</td> <td style="padding:2px"> {% if wallet.cave %} {% if wallet.caveobj.slug %} @@ -58,6 +64,6 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c </tr> {% endfor %} </table> - +<br />Names in italics are taken from the associated survex file blocks, names not in italics are listed explicitly on the wallet. {% endblock %}
\ No newline at end of file diff --git a/templates/yearwallets.html b/templates/yearwallets.html index 61d5bf2..e89431d 100644 --- a/templates/yearwallets.html +++ b/templates/yearwallets.html @@ -39,7 +39,13 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c <td style="padding:2px">{% if wallet.walletdate %}{{wallet.walletdate}}{% else %} {% endif %}</td> <td style="padding:2px">{% if wallet.name %}{{wallet.name|truncatechars:20}}{% else %}<em>{% if wallet.displaynames %} {% for dn in wallet.displaynames %}{{dn}}{%if not forloop.last %}, {% endif %} {% endfor %}{% else %} {% endif %}</em>{% endif %}</td> - <td style="padding:2px">{% if wallet.slugpeople %}<em>{%for p in wallet.slugpeople%}<a href="/person/{{p.slug}}">{{p.fullname}}</a>{%if not forloop.last %}, {% endif %}{% endfor %}</em>{% else %}{{wallet.persons }}{% endif %}</td> + <td style="padding:2px"> + {% if wallet.slugpeople %} + <em>{%for p in wallet.slugpeople%}<a href="/person/{{p.slug}}">{{p.fullname}}</a>{%if not forloop.last %}, {% endif %}{% endfor %}</em> + {% endif %} + {%for p in wallet.persons%} + <a href="/person/{{p.slug}}">{{p.fullname}}</a>{%if not forloop.last %}, {% endif %} + {% endfor %}</td> <td style="padding:2px"> {% if wallet.cave %} {% if wallet.caveobj.slug %} @@ -67,5 +73,5 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c </tr> {% endfor %} </table> - +<br />Names in italics are taken from the associated survex file blocks, names not in italics are listed explicitly on the wallet. {% endblock %}
\ No newline at end of file |