diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/personwallets.html | 16 | ||||
| -rw-r--r-- | templates/wallet_table.html | 16 | ||||
| -rw-r--r-- | templates/walletform.html | 15 | ||||
| -rw-r--r-- | templates/yearwallets.html | 17 |
4 files changed, 27 insertions, 37 deletions
diff --git a/templates/personwallets.html b/templates/personwallets.html index 55a0e0e..4f5a403 100644 --- a/templates/personwallets.html +++ b/templates/personwallets.html @@ -23,7 +23,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c <p>Note that names in italics are copied from the related survex file block name. <br /> <table width=95%> -<tr><th>Wallet</th><th width=13%>Wallet Date</th><th>Wallet Name</th><th width=28%>Team</th><th width=8%>>Cave</th><th>Scans</th><th>Survex blocks</th><th>Drawings using these scans</th></tr> +<tr><th>Wallet</th><th width=13%>Wallet Date</th><th>Wallet Name</th><th width=28%>Team</th><th width=8%>Cave(s)</th><th>Scans</th><th>Survex blocks</th><th>Drawings using these scans</th></tr> {% for wallet in manywallets|dictsort:"walletname" %} <tr> <td style="padding:2px"><a href="{{wallet.get_absolute_url}}">{{wallet.walletname}}</a></td> @@ -37,15 +37,11 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c {%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 %} - <a href="/cave/scans/{{wallet.caveobj.slug}}">{{wallet.cave}}</a> - {% else %} - {{wallet.cave}} - {% endif %} - {% else %} - {% endif %}</td> + <td style="padding:2px; font-family: monospace; font-size: 90%;"> + {% for c in wallet.caves.all %} + <a href="/cave/scans/{{c.slug}}">{{c}}</a> + {% 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"> diff --git a/templates/wallet_table.html b/templates/wallet_table.html index 7cf6f49..3f90152 100644 --- a/templates/wallet_table.html +++ b/templates/wallet_table.html @@ -1,6 +1,6 @@ <!-- this is an INCLUDED template wallet_table.html--> <table width=95%> -<tr><th>Wallet</th><th width=15%>Wallet Date</th><th>Cave</th><th>Wallet Name</th><th>Survex survey length</th> +<tr><th>Wallet</th><th width=15%>Wallet Date</th><th>Cave(s)</th><th>Wallet Name</th><th>Survex survey length</th> <!-- survex file--> <th style="font-family: monospace; font-size: 150%;" title="Survex file exists">S</th> @@ -22,15 +22,11 @@ <td style="padding:2px"><a href="{{wallet.get_absolute_url}}">{{wallet.walletname}}</a></td> <td style="padding:2px">{% if wallet.walletdate %}{{wallet.walletdate}}{% else %} {% endif %}</td> - <td style="padding:2px"> - {% if wallet.cave %} - {% if wallet.caveobj.slug %} - <a href="/cave/scans/{{wallet.caveobj.slug}}">{{wallet.cave}}</a> - {% else %} - {{wallet.cave}} - {% endif %} - {% else %} - {% endif %}</td> + <td style="padding:2px; font-family: monospace; font-size: 90%;"> + {% for c in wallet.caves.all %} + <a href="/cave/scans/{{c.slug}}">{{c}}</a> + {% endfor %} + </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" align=center> {% for survexblock in wallet.survexblock_set.all %} diff --git a/templates/walletform.html b/templates/walletform.html index 2b4cf8c..ef07665 100644 --- a/templates/walletform.html +++ b/templates/walletform.html @@ -149,12 +149,13 @@ and <em>also</em> the exported files in standard formats: svx, svg etc. See why <br> <span style="font-family: monospace; font-size: 150%; "> - {% if cave %}<u>Cave ID</u>: - {% if caveobject %}<b>{{cave}}</b></a> which implies "<a href="/{{caveobject.url|urlencode}}">{{caveobject}}</a>"<br> - {% else %} - <b>{{cave}}</b><br> - {% endif %} - {% endif %} + {% for wallet in manywallets %} + <u>Cave IDs</u>: + + {% for c in wallet.caves.all %} + <a href="/cave/scans/{{c.slug}}">{{c}}</a> + {% endfor %}<br /> + {% if psg %}<u>Survey area</u>: <b>{{psg}}</b><br>{% endif %} {% if svxfiles %}<u>Survex files</u>: {% for svx in svxfiles %} @@ -163,7 +164,7 @@ and <em>also</em> the exported files in standard formats: svx, svg etc. See why <br> {% endif %} - + {% endfor %} </span> <span style="font-family: monospace; font-size: 130%; "> diff --git a/templates/yearwallets.html b/templates/yearwallets.html index e89431d..7385cc4 100644 --- a/templates/yearwallets.html +++ b/templates/yearwallets.html @@ -32,7 +32,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c <p>Total underground survey length: {{length_ug|floatformat:"1g"}} m <br /> <table width=95%> -<tr><th>Wallet</th><th width=13%>Wallet Date</th><th>Wallet Name</th><th width=25%>People</th><th width=8%>Cave</th><th>Scans</th><th>Survex blocks</th><th>Drawings using these scans</th></tr> +<tr><th>Wallet</th><th width=13%>Wallet Date</th><th>Wallet Name</th><th width=25%>People</th><th width=8%>Cave(s)</th><th>Scans</th><th>Survex blocks</th><th>Drawings using these scans</th></tr> {% for wallet in manywallets|dictsort:"walletname" %} <tr> <td style="padding:2px"><a href="{{wallet.get_absolute_url}}">{{wallet.walletname}}</a></td> @@ -46,15 +46,12 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c {%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 %} - <a href="/cave/scans/{{wallet.caveobj.slug}}">{{wallet.cave}}</a> - {% else %} - {{wallet.cave}} - {% endif %} - {% else %} - {% endif %}</td> + + <td style="padding:2px; font-family: monospace; font-size: 90%;"> + {% for c in wallet.caves.all %} + <a href="/cave/scans/{{c.slug}}">{{c}}</a> + {% 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"> |