xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

rename scansfolder to wallet

Browse Source
This commit is contained in:
Philip Sargent
2021-04-26 19:50:03 +01:00
parent 7f64670f36
commit 49b9225b6e
14 changed files with 64 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/base.html
View File

@@ -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> |

4
templates/dwgfiles.html
View File

@@ -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>

2
templates/expowebbase.html
View File

@@ -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>

8
templates/manywallets.html
View File

@@ -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>

4
templates/svxcaveseveral.html
View File

@@ -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>

4
templates/svxcavesingle.html
View File

@@ -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>

6
templates/scansfolder.html → templates/wallet.html
View File

@@ -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>