diff options
Diffstat (limited to 'templates/personwallets.html')
| -rw-r--r-- | templates/personwallets.html | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/templates/personwallets.html b/templates/personwallets.html index 526e142..00534b2 100644 --- a/templates/personwallets.html +++ b/templates/personwallets.html @@ -13,6 +13,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c <p>See also wallets <ul> +<li>per person, e.g. <a href="/wallets/person/wookey">Wookey</a>, <a href="/wallets/person/chris-densham">Chris Densham</a>, <a href="/wallets/person/martin-green">Martin Green</a>, <a href="/wallets/person/andrew-atkinson">Andrew Atkinson</a>, <a href="/wallets/person/julian-todd">Julian Todd</a>, <a href="/wallets/person/frank-tully">FrankTully</a>, <a href="/wallets/person/dave-loeffler">Dave Loeffler</a>, <a href="/wallets/person/becka-lawson">Becka</a> <li>per cave, e.g. <a href="/cave/scans/1623-161">1623-161</a>, <a href="/cave/scans/1626-359">1626-359</a>, <a href="/cave/scans/1623-290">1623-290</a>, <a href="/cave/scans/1623-291">1623-291</a>, <a href="/cave/scans/1623-264">1623-264</a> <li>per year: {% for otherexpedition in expeditions %} @@ -22,7 +23,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c {% include 'wallet_table.html' %} <p>Note that names in italics are copied from the related survex file block name. <br /> -<p>Total underground survey length: {{length_ug|floatformat:"1g"}} m +<p>Total underground survey length: {{length_ug|floatformat:"1g"}} m - but this includes all the surveys associated with the wallet, including those where <em>{{person.fullname|safe}}</em> did not participate. <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(s)</th><th>Scans</th><th>Survex blocks</th><th>Drawings using these scans</th></tr> @@ -32,18 +33,24 @@ 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 %} + + <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> + {% endif %} + {%for p in wallet.peeps%} + <a href="/person/{{p.slug}}">{{p.fullname}}</a>{%if not forloop.last %}, {% endif %} + {% endfor %} + </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"> |