diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/cavewallets.html | 1 | ||||
| -rw-r--r-- | templates/expedition.html | 4 | ||||
| -rw-r--r-- | templates/personwallets.html | 1 | ||||
| -rw-r--r-- | templates/wallet_table.html | 32 | ||||
| -rw-r--r-- | templates/walletform.html | 6 | ||||
| -rw-r--r-- | templates/yearwallets.html | 1 |
6 files changed, 24 insertions, 21 deletions
diff --git a/templates/cavewallets.html b/templates/cavewallets.html index 6a2fd7c..9a65d28 100644 --- a/templates/cavewallets.html +++ b/templates/cavewallets.html @@ -21,6 +21,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c | <a <a href="/wallets/year/{{ otherexpedition.year }}">{{otherexpedition.year}}</a> {% endfor %}</ul></ul> {% include 'wallet_table.html' %} +<p>Note that names in italics are copied from the related survex file block name. <br /> <table width=95%> <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> diff --git a/templates/expedition.html b/templates/expedition.html index edea06b..92ebde7 100644 --- a/templates/expedition.html +++ b/templates/expedition.html @@ -64,10 +64,6 @@ an "S" for a survey trip. The colours are the same for people on the same trip. {% endfor %} </table> -{% if logged_in %} -<form action="" method="GET"><input type="submit" name="reload" value="Reload from logbook"></form> -{% endif %} - <h3 id="trips"> {{expedition.name}} - Records per day</h3> <table class="expeditionlogbooks"> diff --git a/templates/personwallets.html b/templates/personwallets.html index aed23f6..6554b3a 100644 --- a/templates/personwallets.html +++ b/templates/personwallets.html @@ -20,6 +20,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c {% endfor %}</ul> {% include 'wallet_table.html' %} +<p>Note that names in italics are copied from the related survex file block name. <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</th><th>Scans</th><th>Survex blocks</th><th>Drawings using these scans</th></tr> diff --git a/templates/wallet_table.html b/templates/wallet_table.html index 635ab39..3f033ce 100644 --- a/templates/wallet_table.html +++ b/templates/wallet_table.html @@ -3,17 +3,17 @@ <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> -<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> +<th style="font-family: monospace; font-size: 150%;" title="Survex file exists">S</th> +<th style="font-family: monospace; font-size: 150%;" title="Cave Description in Survex file">C</th> +<th style="font-family: monospace; font-size: 150%;" title="QMs in Survex file">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="Notes exit">N</th> +<th style="font-family: monospace; font-size: 150%;" title="Plan done">P</th> +<th style="font-family: monospace; font-size: 150%;" title="Elevation done">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="Tunnel or Therion done">T</th> <th style="font-family: monospace; font-size: 150%;" title="Website updated">W</th> </tr> @@ -38,16 +38,16 @@ {% endfor %} - <td style="padding:1px; background-color:{{wallet.ticks.S}}"> </td> - <td style="padding:1px; background-color:{{wallet.ticks.C}}"> </td> - <td style="padding:1px; background-color:{{wallet.ticks.Q}}"> </td> + <td style="padding:1px; background-color:{{wallet.ticks.S}}" title="Survex file exists"> </td> + <td style="padding:1px; background-color:{{wallet.ticks.C}}" title="Cave Description in Survex file"> </td> + <td style="padding:1px; background-color:{{wallet.ticks.Q}}" title="QMs in Survex file"> </td> - <td style="padding:1px; background-color:{{wallet.ticks.N}}"> </td> - <td style="padding:1px; background-color:{{wallet.ticks.P}}"> </td> - <td style="padding:1px; background-color:{{wallet.ticks.E}}"> </td> + <td style="padding:1px; background-color:{{wallet.ticks.N}}" title="Notes exit"> </td> + <td style="padding:1px; background-color:{{wallet.ticks.P}}" title="Plan done"> </td> + <td style="padding:1px; background-color:{{wallet.ticks.E}}" title="Elevation done"> </td> - <td style="padding:1px; background-color:{{wallet.ticks.T}}"> </td> - <td style="padding:1px; background-color:{{wallet.ticks.W}}"> </td> + <td style="padding:1px; background-color:{{wallet.ticks.T}}" title="Tunnel or Therion done"> </td> + <td style="padding:1px; background-color:{{wallet.ticks.W}}" title="Website updated"> </td> </tr> {% empty %} <h2>No Wallets for this year</h2> <b>Before 1998</b> we used a survey book system, not wallets. But 1983 has some scraps recreated as wallets. @@ -61,4 +61,4 @@ their wallet names and the drawings that were created using them at <a href="/dw which is probably more useful. {% endfor %} </table> -<p>Note that names in italics are copied from the related survex file block name. + diff --git a/templates/walletform.html b/templates/walletform.html index 51fc1f9..571c13b 100644 --- a/templates/walletform.html +++ b/templates/walletform.html @@ -106,7 +106,11 @@ {% endif %} {% endif %} -<hr /> + +<!-- This won't work with a standard wallet object. To make it work we added extra fields to teh wallet object,--> +setting the .ticks field etc, e.g. in caveifywallet() in scans.py +{% include 'wallet_table.html' %} + {% if not create %} <br> diff --git a/templates/yearwallets.html b/templates/yearwallets.html index 658e890..2bacd0b 100644 --- a/templates/yearwallets.html +++ b/templates/yearwallets.html @@ -28,6 +28,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c </ul> {% include 'wallet_table.html' %} +<p>Note that names in italics are copied from the related survex file block name. <br /> <table width=95%> <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> |