diff --git a/templates/cavewallets.html b/templates/cavewallets.html index 6909bb2..4f0c5af 100644 --- a/templates/cavewallets.html +++ b/templates/cavewallets.html @@ -23,13 +23,13 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c {% include 'wallet_table.html' %} <br /> <table width=95%> -<tr><th>Wallet</th><th width=8%>Wallet Date</th><th>Wallet Name</th><th>People</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>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> <td style="padding:2px">{% if wallet.walletdate %}{{wallet.walletdate}}{% 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">{% 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">{{wallet.persons }} </td> <td align="center" style="padding:2px"><a href="{{wallet.get_absolute_url}}">{{wallet.singlescan_set.all|length}}</a></td> diff --git a/templates/personwallets.html b/templates/personwallets.html index 5822634..aed23f6 100644 --- a/templates/personwallets.html +++ b/templates/personwallets.html @@ -22,13 +22,13 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c {% include 'wallet_table.html' %} <br /> <table width=95%> -<tr><th>Wallet</th><th width=8%>Wallet Date</th><th>Wallet Name</th><th width=15%>Team</th><th>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</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> <td style="padding:2px" >{% if wallet.walletdate %}{{wallet.walletdate}}{% 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">{% 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">{{wallet.persons}}</td> <td style="padding:2px"> {% if wallet.cave %} diff --git a/templates/wallet_table.html b/templates/wallet_table.html index 1d3e2fc..635ab39 100644 --- a/templates/wallet_table.html +++ b/templates/wallet_table.html @@ -1,6 +1,6 @@ <table width=95%> -<tr><th>Wallet</th><th width=8%>Wallet Date</th><th>Cave</th><th>Wallet Name</th><th>Survex</th> +<tr><th>Wallet</th><th width=15%>Wallet Date</th><th>Cave</th><th>Wallet Name</th><th>Survex</th> <!-- survex file--> <th style="font-family: monospace; font-size: 150%;" title="Survex data">S</th> @@ -31,7 +31,7 @@ {% endif %} {% 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">{% 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 %} <a href="{% url "svx" survexblock.survexfile.path %}">svx{{ forloop.counter }}</a> diff --git a/templates/yearwallets.html b/templates/yearwallets.html index 2b43fc8..658e890 100644 --- a/templates/yearwallets.html +++ b/templates/yearwallets.html @@ -30,13 +30,13 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c {% include 'wallet_table.html' %} <br /> <table width=95%> -<tr><th>Wallet</th><th width=8%>Wallet Date</th><th>Wallet Name</th><th>People</th><th>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</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> <td style="padding:2px">{% if wallet.walletdate %}{{wallet.walletdate}}{% 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">{% 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">{{wallet.persons}}</td> <td style="padding:2px"> {% if wallet.cave %} @@ -51,7 +51,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c <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> + <a href="{% url "svx" survexblock.survexfile.path %}">{{survexblock|truncatechars:20}}</a> {% endfor %} </td>