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' %}
- + {% for wallet in manywallets|dictsort:"walletname" %} - + 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' %}
WalletWallet DateWallet NamePeopleScansSurvex blocksDrawings using these scans
WalletWallet DateWallet Name>PeopleScansSurvex blocksDrawings using these scans
{{wallet.walletname}} {% if wallet.walletdate %}{{wallet.walletdate}}{% else %} {% endif %}{% if wallet.name %}{{wallet.name}}{% else %}{% if wallet.displaynames %} {% for dn in wallet.displaynames %}{{dn}}{%if not forloop.last %}, {% endif %} {% endfor %}{% else %} {% endif %}{% endif %}{% if wallet.name %}{{wallet.name|truncatechars:20}}{% else %}{% if wallet.displaynames %} {% for dn in wallet.displaynames %}{{dn}}{%if not forloop.last %}, {% endif %} {% endfor %}{% else %} {% endif %}{% endif %} {{wallet.persons }} {{wallet.singlescan_set.all|length}}
- + {% for wallet in manywallets|dictsort:"walletname" %} - +
WalletWallet DateWallet NameTeamCaveScansSurvex blocksDrawings using these scans
WalletWallet DateWallet NameTeam>CaveScansSurvex blocksDrawings using these scans
{{wallet.walletname}} {% if wallet.walletdate %}{{wallet.walletdate}}{% else %} {% endif %}{% if wallet.name %}{{wallet.name}}{% else %}{% if wallet.displaynames %} {% for dn in wallet.displaynames %}{{dn}}{%if not forloop.last %}, {% endif %} {% endfor %}{% else %} {% endif %}{% endif %}{% if wallet.name %}{{wallet.name|truncatechars:20}}{% else %}{% if wallet.displaynames %} {% for dn in wallet.displaynames %}{{dn}}{%if not forloop.last %}, {% endif %} {% endfor %}{% else %} {% endif %}{% endif %} {{wallet.persons}} {% 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 @@ - + @@ -31,7 +31,7 @@ {% endif %} {% else %} {% endif %} - +
WalletWallet DateCaveWallet NameSurvex
WalletWallet DateCaveWallet NameSurvex S{% if wallet.name %}{{wallet.name}}{% else %}{% if wallet.displaynames %} {% for dn in wallet.displaynames %}{{dn}}{%if not forloop.last %}, {% endif %} {% endfor %}{% else %} {% endif %}{% endif %}{% if wallet.name %}{{wallet.name|truncatechars:20}}{% else %}{% if wallet.displaynames %} {% for dn in wallet.displaynames %}{{dn}}{%if not forloop.last %}, {% endif %} {% endfor %}{% else %} {% endif %}{% endif %} {% for survexblock in wallet.survexblock_set.all %} svx{{ forloop.counter }} 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' %}
- + {% for wallet in manywallets|dictsort:"walletname" %} - +
WalletWallet DateWallet NamePeopleCaveScansSurvex blocksDrawings using these scans
WalletWallet DateWallet NamePeopleCaveScansSurvex blocksDrawings using these scans
{{wallet.walletname}} {% if wallet.walletdate %}{{wallet.walletdate}}{% else %} {% endif %}{% if wallet.name %}{{wallet.name}}{% else %}{% if wallet.displaynames %} {% for dn in wallet.displaynames %}{{dn}}{%if not forloop.last %}, {% endif %} {% endfor %}{% else %} {% endif %}{% endif %}{% if wallet.name %}{{wallet.name|truncatechars:20}}{% else %}{% if wallet.displaynames %} {% for dn in wallet.displaynames %}{{dn}}{%if not forloop.last %}, {% endif %} {% endfor %}{% else %} {% endif %}{% endif %} {{wallet.persons}} {% if wallet.cave %} @@ -51,7 +51,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c {{wallet.singlescan_set.all|length}} {% for survexblock in wallet.survexblock_set.all %} - {{survexblock}} + {{survexblock|truncatechars:20}} {% endfor %}