diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/cavewallets.html | 2 | ||||
| -rw-r--r-- | templates/expedition.html | 2 | ||||
| -rw-r--r-- | templates/personwallets.html | 2 | ||||
| -rw-r--r-- | templates/tasks.html | 8 | ||||
| -rw-r--r-- | templates/wallet_table.html | 2 | ||||
| -rw-r--r-- | templates/walletform.html | 2 | ||||
| -rw-r--r-- | templates/yearwallets.html | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/templates/cavewallets.html b/templates/cavewallets.html index 8ce1da1..4c61e63 100644 --- a/templates/cavewallets.html +++ b/templates/cavewallets.html @@ -23,7 +23,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c <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">{% if wallet.date %}{{wallet.date}}{% else %} {% endif %}</td> <td style="padding:2px">{{wallet.name}}</td> <td style="padding:2px">{{wallet.persons}}</td> diff --git a/templates/expedition.html b/templates/expedition.html index 98cc871..7146099 100644 --- a/templates/expedition.html +++ b/templates/expedition.html @@ -18,7 +18,7 @@ {% endfor %} </p> <p>See also the <a href="/years/{{expedition.year}}/">documentation index</a> for this Expo -<p>See also the <a href="/expofiles/surveyscans/{{expedition.year}}/walletindex.html">wallet completion status</a> for this Expo +<p>See also the <a href="/wallets/year/{{expedition.year}}">wallet completion status</a> for this Expo {% if logged_in %} <p>Reparse and reload this year's logbook by clicking here: <a href="/expedition/{{expedition.year}}?reload">RELOAD</a> {% endif %} diff --git a/templates/personwallets.html b/templates/personwallets.html index f513e20..ace67a7 100644 --- a/templates/personwallets.html +++ b/templates/personwallets.html @@ -23,7 +23,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c <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" >{% if wallet.date %}{{wallet.date}}{% else %} {% endif %}</td> <td style="padding:2px">{{wallet.name}}</td> <td style="padding:2px">{{wallet.persons}}</td> <td style="padding:2px">{{wallet.cave}}</td> diff --git a/templates/tasks.html b/templates/tasks.html index 3ba9b3a..ba7fe56 100644 --- a/templates/tasks.html +++ b/templates/tasks.html @@ -57,10 +57,10 @@ ul {list-style: disc} <h3>Unfinished wallets work to do:</h3> <ul> -<li><a href="/expofiles/surveyscans/2016/walletindex.html">2016 wallets</a><br> -<li><a href="/expofiles/surveyscans/2017/walletindex.html">2017 wallets</a><br> -<li><a href="/expofiles/surveyscans/2018/walletindex.html">2018 wallets</a><br> -<li><a href="/expofiles/surveyscans/2019/walletindex.html">2019 wallets</a><br> +<li><a href="/wallets/year/2016">2016 wallets</a><br> +<li><a href="/wallets/year/2017">2017 wallets</a><br> +<li><a href="/wallets/year/2018">2018 wallets</a><br> +<li><a href="/wallets/year/2019">2019 wallets</a><br> </ul> <h3>Upload new data</h3> diff --git a/templates/wallet_table.html b/templates/wallet_table.html index b239e91..1dedb3b 100644 --- a/templates/wallet_table.html +++ b/templates/wallet_table.html @@ -21,7 +21,7 @@ <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" >{% if wallet.date %}{{wallet.date}}{% else %} {% endif %}</td> <td style="padding:2px">{{wallet.cave}}</td> <td style="padding:2px">{{wallet.name}}</td> diff --git a/templates/walletform.html b/templates/walletform.html index 37b1c11..bf859f0 100644 --- a/templates/walletform.html +++ b/templates/walletform.html @@ -60,7 +60,7 @@ {% endif %} <p><em> -<a href="/expofiles/surveyscans/{{year}}/walletindex.html">Wallet index for this year</a> (old script, being replaced...) +<a href="/wallets/year/{{year}}">Wallet index for this year</a> <br /> <a href="/expedition/{{year}}">Logbook entries, people, Survex files for {{year}}</a> </em> diff --git a/templates/yearwallets.html b/templates/yearwallets.html index 33b86ef..e9e258a 100644 --- a/templates/yearwallets.html +++ b/templates/yearwallets.html @@ -23,7 +23,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c <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">{% if wallet.date %}{{wallet.date}}{% else %} {% endif %}</td> <td style="padding:2px">{{wallet.name}}</td> <td style="padding:2px">{{wallet.persons}}</td> <td style="padding:2px">{{wallet.cave}}</td> |