diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/cavewallets.html | 4 | ||||
| -rw-r--r-- | templates/personwallets.html | 2 | ||||
| -rw-r--r-- | templates/wallet_table.html | 3 | ||||
| -rw-r--r-- | templates/yearwallets.html | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/templates/cavewallets.html b/templates/cavewallets.html index df3b009..1647c0c 100644 --- a/templates/cavewallets.html +++ b/templates/cavewallets.html @@ -27,8 +27,8 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c <td style="padding:2px"><a href="{{wallet.get_absolute_url}}">{{wallet.walletname}}</a></td> <td style="padding:2px">{% if wallet.date %}{{wallet.date}}{% else %} {% endif %}</td> - <td style="padding:2px">{% if wallet.name %}{{wallet.name}}{% else %} {% endif %}</td> - <td style="padding:2px">{{wallet.persons}}</td> + <td style="padding:2px">{% if wallet.name %}{{wallet.name}}{% 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">{{wallet.persons }} </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/personwallets.html b/templates/personwallets.html index 0ec4f63..0c52765 100644 --- a/templates/personwallets.html +++ b/templates/personwallets.html @@ -26,7 +26,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c <td style="padding:2px"><a href="{{wallet.get_absolute_url}}">{{wallet.walletname}}</a></td> <td style="padding:2px" >{% if wallet.date %}{{wallet.date}}{% else %} {% endif %}</td> - <td style="padding:2px">{% if wallet.name %}{{wallet.name}}{% else %} {% endif %}</td> + <td style="padding:2px">{% if wallet.name %}{{wallet.name}}{% 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">{{wallet.persons}}</td> <td style="padding:2px">{% if wallet.cave %}{{wallet.cave}}{% else %} {% endif %}</td> diff --git a/templates/wallet_table.html b/templates/wallet_table.html index bad144a..a7114d1 100644 --- a/templates/wallet_table.html +++ b/templates/wallet_table.html @@ -23,7 +23,7 @@ <td style="padding:2px">{% if wallet.date %}{{wallet.date}}{% else %} {% endif %}</td> <td style="padding:2px">{% if wallet.cave %}{{wallet.cave}}{% else %} {% endif %}</td> - <td style="padding:2px">{% if wallet.name %}{{wallet.name}}{% else %} {% endif %}</td> + <td style="padding:2px">{% if wallet.name %}{{wallet.name}}{% 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:1px; background-color:{{wallet.ticks.S}}"> </td> <td style="padding:1px; background-color:{{wallet.ticks.C}}"> </td> @@ -38,3 +38,4 @@ </tr> {% endfor %} </table> +<p>Note that names in italics are copied from the related survex file block name. diff --git a/templates/yearwallets.html b/templates/yearwallets.html index df6c7ac..231f0e9 100644 --- a/templates/yearwallets.html +++ b/templates/yearwallets.html @@ -26,7 +26,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c <td style="padding:2px"><a href="{{wallet.get_absolute_url}}">{{wallet.walletname}}</a></td> <td style="padding:2px">{% if wallet.date %}{{wallet.date}}{% else %} {% endif %}</td> - <td style="padding:2px">{% if wallet.name %}{{wallet.name}}{% else %} {% endif %}</td> + <td style="padding:2px">{% if wallet.name %}{{wallet.name}}{% 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">{{wallet.persons}}</td> <td style="padding:2px">{% if wallet.cave %}{{wallet.cave}}{% else %} {% endif %}</td> |