tick lists now on 3 wallets reports

templates/base.html

@@ -56,7 +56,7 @@
     
 <div id="nav">
   {% block nav %} 
-  <!-- Use id="nav" for the left side menu -->
+  <!-- Not used any more? -->
   {% endblock %}
 </div>
  
@@ -65,16 +65,15 @@
   	{% block contentheader %}
     {% endblock %}
 
-<div id="related"> 
-{% block related %}
-
-{% endblock %}
-</div>
+    <div id="related"> 
+        {% block related %}
+        {% endblock %}
+    </div>
     {% block content %}
     REPLACE : The content
     {% endblock %}
-  </div>
-    <div class="footer">
-    </div>
+</div>
+<div class="footer">
+</div>
 </body>
 </html>

templates/cavewallets.html

@@ -14,8 +14,9 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c
 <ul>
 <li>per year, e.g. <a href="/wallets/year/2019">2019</a>
 <li>per person, e.g. <a href="/wallets/person/MichaelSargent">Michael Sargent</a>
-
 </ul>
+{% 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>
 {% for wallet in manywallets|dictsort:"walletname" %}
@@ -33,7 +34,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c
     {% endfor %}
     </td>
 
-    <td style="padding:2px">
+    <td style="padding:2px; font-size: 70%;">
     {% for drawing in wallet.drawingfile_set.all %}
       <a href="{% url "dwgfilesingle" drawing.dwgpath %}">{{drawing.dwgpath}}</a><br>
     {% empty %}

templates/personwallets.html

@@ -15,46 +15,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c
 <li>per cave, e.g. <a href="/cave/scans/1623-161">1623/161</a>
 </ul>
 
-
-<table width=95%>
-<tr><th>Wallet</th><th width=8%>Wallet Date</th><th>Cave</th><th>Wallet Name</th>
-
-<!-- survex file-->
-<th style="font-family: monospace; font-size: 150%;" title="Survex data">S</th>
-<th style="font-family: monospace; font-size: 150%;" title="Survex Cave Description">C</th>
-<th style="font-family: monospace; font-size: 150%;" title="Survex QMs">Q</th>
-
-
-<!-- scanned-->
-<th style="font-family: monospace; font-size: 150%;" title="Notes">N</th>
-<th style="font-family: monospace; font-size: 150%;" title="Plan">P</th>
-<th style="font-family: monospace; font-size: 150%;" title="Elevation">E</th>
-
-<th style="font-family: monospace; font-size: 150%;" title="Tunnel or Therion">T</th>
-<th style="font-family: monospace; font-size: 150%;" title="Website updated">W</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" >{{wallet.date}}</td>
-    <td style="padding:2px">{{wallet.cave}}</td>
-    <td style="padding:2px">{{wallet.name}}</td>
-    
-    <td style="padding:1px; background-color:{{wallet.ticks.S}}">&nbsp;</td>
-    <td style="padding:1px; background-color:{{wallet.ticks.C}}">&nbsp;</td>
-    <td style="padding:1px; background-color:{{wallet.ticks.Q}}">&nbsp;</td>
-
-    <td style="padding:1px; background-color:{{wallet.ticks.N}}">&nbsp;</td>
-    <td style="padding:1px; background-color:{{wallet.ticks.P}}">&nbsp;</td>
-    <td style="padding:1px; background-color:{{wallet.ticks.E}}">&nbsp;</td>
-
-    <td style="padding:1px; background-color:{{wallet.ticks.T}}">&nbsp;</td>
-    <td style="padding:1px; background-color:{{wallet.ticks.W}}">&nbsp;</td>
-  </tr>
-{% endfor %}
-</table>
+{% 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%>Other People</th><th>Cave</th><th>Scans</th><th>Survex blocks</th><th>Drawings using these scans</th></tr>
@@ -74,7 +35,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c
     {% endfor %}
     </td>
 
-    <td style="padding:2px">
+    <td style="padding:2px; font-size: 70%;">
     {% for drawing in wallet.drawingfile_set.all %}
       <a href="{% url "dwgfilesingle" drawing.dwgpath %}">{{drawing.dwgpath}}</a><br>
     {% empty %}

templates/wallet_table.html

@@ -0,0 +1,40 @@
+
+<table width=95%>
+<tr><th>Wallet</th><th width=8%>Wallet Date</th><th>Cave</th><th>Wallet Name</th>
+
+<!-- survex file-->
+<th style="font-family: monospace; font-size: 150%;" title="Survex data">S</th>
+<th style="font-family: monospace; font-size: 150%;" title="Survex Cave Description">C</th>
+<th style="font-family: monospace; font-size: 150%;" title="Survex QMs">Q</th>
+
+
+<!-- scanned-->
+<th style="font-family: monospace; font-size: 150%;" title="Notes">N</th>
+<th style="font-family: monospace; font-size: 150%;" title="Plan">P</th>
+<th style="font-family: monospace; font-size: 150%;" title="Elevation">E</th>
+
+<th style="font-family: monospace; font-size: 150%;" title="Tunnel or Therion">T</th>
+<th style="font-family: monospace; font-size: 150%;" title="Website updated">W</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" >{{wallet.date}}</td>
+    <td style="padding:2px">{{wallet.cave}}</td>
+    <td style="padding:2px">{{wallet.name}}</td>
+    
+    <td style="padding:1px; background-color:{{wallet.ticks.S}}">&nbsp;</td>
+    <td style="padding:1px; background-color:{{wallet.ticks.C}}">&nbsp;</td>
+    <td style="padding:1px; background-color:{{wallet.ticks.Q}}">&nbsp;</td>
+
+    <td style="padding:1px; background-color:{{wallet.ticks.N}}">&nbsp;</td>
+    <td style="padding:1px; background-color:{{wallet.ticks.P}}">&nbsp;</td>
+    <td style="padding:1px; background-color:{{wallet.ticks.E}}">&nbsp;</td>
+
+    <td style="padding:1px; background-color:{{wallet.ticks.T}}">&nbsp;</td>
+    <td style="padding:1px; background-color:{{wallet.ticks.W}}">&nbsp;</td>
+  </tr>
+{% endfor %}
+</table>

templates/yearwallets.html

@@ -14,6 +14,9 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c
 <li>per cave, e.g. <a href="/cave/scans/1623-161">1623/161</a>
 <li>per person, e.g. <a href="/wallets/person/MichaelSargent">Michael Sargent</a>
 </ul>
+
+{% 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>
 {% for wallet in manywallets|dictsort:"walletname" %}
@@ -32,7 +35,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c
     {% endfor %}
     </td>
 
-    <td style="padding:2px">
+    <td style="padding:2px;  font-size: 70%;">
     {% for drawing in wallet.drawingfile_set.all %}
       <a href="{% url "dwgfilesingle" drawing.dwgpath %}">{{drawing.dwgpath}}</a><br>
     {% empty %}