diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base.html | 2 | ||||
| -rw-r--r-- | templates/dwgfiles.html | 4 | ||||
| -rw-r--r-- | templates/expowebbase.html | 2 | ||||
| -rw-r--r-- | templates/manywallets.html | 8 | ||||
| -rw-r--r-- | templates/svxcaveseveral.html | 4 | ||||
| -rw-r--r-- | templates/svxcavesingle.html | 4 | ||||
| -rw-r--r-- | templates/wallet.html (renamed from templates/scansfolder.html) | 6 |
7 files changed, 15 insertions, 15 deletions
diff --git a/templates/base.html b/templates/base.html index 0ae254d..c10f2ab 100644 --- a/templates/base.html +++ b/templates/base.html @@ -31,7 +31,7 @@ <a href="{% url "survexcavessingle" "204" %}">Survex-204</a> | <a href="/survexfile/">Survex</a> | <a href="{% url "survexcaveslist" %}">All Survex</a> | - <a href="{% url "scanswallets" %}">Scans</a> | + <a href="{% url "allwallets" %}">Scans</a> | <a href="{% url "dwgdata" %}">Drawings</a> | <a href="/1623/290/290.html">290 (FGH)</a> | <a href="/1623/291/291">291 (GSH)</a> | diff --git a/templates/dwgfiles.html b/templates/dwgfiles.html index a89bca3..d850976 100644 --- a/templates/dwgfiles.html +++ b/templates/dwgfiles.html @@ -17,8 +17,8 @@ <td align="right" style="padding:2px">{{dwgfile.npaths}}</td> <td style="padding:2px"> - {% for scansfolder in dwgfile.manywallets.all %} - <a href="{{scansfolder.get_absolute_url}}">{{scansfolder.walletname}}</a> + {% for scanswallet in dwgfile.manywallets.all %} + <a href="{{scanswallet.get_absolute_url}}">{{scanswallet.walletname}}</a> {% endfor %} </td> diff --git a/templates/expowebbase.html b/templates/expowebbase.html index 5261e8a..097c4e0 100644 --- a/templates/expowebbase.html +++ b/templates/expowebbase.html @@ -17,7 +17,7 @@ {% if cavepage %} <ul> <li><a href="{% url "survexcaveslist" %}">All Survex</a></li> -<li><a href="{% url "scanswallets" %}">Scans</a></li> +<li><a href="{% url "allwallets" %}">Scans</a></li> <li><a href="{% url "dwgdata" %}">Drawings</a></li> <li><a href="{% url "survexcavessingle" "caves-1623/290/290.svx" %}">290</a></li> <li><a href="{% url "survexcavessingle" "caves-1623/291/291.svx" %}">291</a></li> diff --git a/templates/manywallets.html b/templates/manywallets.html index fd63bcc..d841398 100644 --- a/templates/manywallets.html +++ b/templates/manywallets.html @@ -13,12 +13,12 @@ hand-drawn passage sections are drawn. These hand-drawn passages will eventually traced to produce Tunnel or Therion drawings and eventually the final complete cave survey. <table width=95%> <tr><th>Scans folder</th><th>Files</th><th>Survex blocks</th></tr> -{% for scansfolder in manywallets %} +{% for scanswallet in manywallets %} <tr> - <td style="padding:2px"><a href="{{scansfolder.get_absolute_url}}">{{scansfolder.walletname}}</a></td> - <td align="right" style="padding:2px">{{scansfolder.singlescan_set.all|length}}</td> + <td style="padding:2px"><a href="{{scanswallet.get_absolute_url}}">{{scanswallet.walletname}}</a></td> + <td align="right" style="padding:2px">{{scanswallet.singlescan_set.all|length}}</td> <td style="padding:2px"> - {% for survexblock in scansfolder.survexblock_set.all %} + {% for survexblock in scanswallet.survexblock_set.all %} <a href="{% url "svx" survexblock.survexfile.path %}">{{survexblock}}</a> {% endfor %} </td> diff --git a/templates/svxcaveseveral.html b/templates/svxcaveseveral.html index a0e2f97..b6b7f14 100644 --- a/templates/svxcaveseveral.html +++ b/templates/svxcaveseveral.html @@ -89,8 +89,8 @@ </td> <!-- Scans --> <td> - {% if survexblock.scansfolder %} - <b><a href="{{survexblock.scansfolder.get_absolute_url}}">{{survexblock.scansfolder.walletname}}</a></b> + {% if survexblock.scanswallet %} + <b><a href="{{survexblock.scanswallet.get_absolute_url}}">{{survexblock.scanswallet.walletname}}</a></b> {% endif %} </td> </tr> diff --git a/templates/svxcavesingle.html b/templates/svxcavesingle.html index a17231d..bf7faef 100644 --- a/templates/svxcavesingle.html +++ b/templates/svxcavesingle.html @@ -89,8 +89,8 @@ to go to a form to correct the online data. </td> <!-- Scans --> <td> - {% if survexblock.scansfolder %} - <b><a href="{{survexblock.scansfolder.get_absolute_url}}">{{survexblock.scansfolder.walletname}}</a></b> + {% if survexblock.scanswallet %} + <b><a href="{{survexblock.scanswallet.get_absolute_url}}">{{survexblock.scanswallet.walletname}}</a></b> {% endif %} </td> </tr> diff --git a/templates/scansfolder.html b/templates/wallet.html index a15f054..7301ce3 100644 --- a/templates/scansfolder.html +++ b/templates/wallet.html @@ -6,9 +6,9 @@ {% block content %} -<h3>Survey Scans in: {{scansfolder.walletname}}</h3> +<h3>Survey Scans in: {{wallet.walletname}}</h3> <table> -{% for singlescan in scansfolder.singlescan_set.all %} +{% for singlescan in wallet.singlescan_set.all %} <tr> <td class="singlescan"><a href="{{singlescan.get_absolute_url}}">{{singlescan.name}}</a></td> <td> @@ -23,7 +23,7 @@ <h3>Survex surveys referring to this wallet</h3> <table> -{% for survexblock in scansfolder.survexblock_set.all %} +{% for survexblock in wallet.survexblock_set.all %} <tr> <td><a href="{% url "svx" survexblock.survexfile.path %}">{{survexblock}}</a></td> </tr> |