diff options
Diffstat (limited to 'templates')
-rw-r--r-- | templates/base.html | 16 | ||||
-rw-r--r-- | templates/manyscansfolders.html | 8 | ||||
-rw-r--r-- | templates/tunnelfiles.html | 18 |
3 files changed, 19 insertions, 23 deletions
diff --git a/templates/base.html b/templates/base.html index c38710d..282ec3e 100644 --- a/templates/base.html +++ b/templates/base.html @@ -34,16 +34,14 @@ <a href="{% url "survexcaveslist" %}">All Survex</a> | <a href="{% url "surveyscansfolders" %}">Scans</a> | <a href="{% url "tunneldata" %}">Drawing files</a> | - <a href="{% url "survexcavessingle" "caves-1623/290/290.svx" %}">290</a> | - <a href="{% url "survexcavessingle" "caves-1623/291/291.svx" %}">291</a> | - <a href="{% url "survexcavessingle" "caves-1626/359/359.svx" %}">359</a> | - <a href="{% url "survexcavessingle" "caves-1623/258/258.svx" %}">258</a> | - <a href="{% url "survexcavessingle" "caves-1623/264/264.svx" %}">264</a> | - <a href="{% url "survexcavessingle" "264" %}">Surveys-264</a> | + <a href="/1623/290/290.html">290 (FGH)</a> | + <a href="/1623/291/291.html">291 (GSH)</a> | + <a href="/1626/359/359.html">359 (Homecoming)</a> | + <a href="{% url "survexcavessingle" "204" %}">Surveys-204</a> | <a href="{% url "expedition" 2018 %}">Expo2018</a> | <a href="{% url "expedition" 2019 %}">Expo2019</a> | - <a href="/admin/">Django admin</a> + <br> @@ -56,8 +54,8 @@ <a id="caversLink" href="{% url "personindex" %}">people</a> | <a id="expeditionsLink" href="{% url "expeditions" %}">all expeditions</a> | <a href="{% url "stats" %}">statistics</a> | - <a id="cuccLink" href="{% url "controlpanel" %}">import/export data</a> - + <a href="{% url "controlpanel" %}">import/export data</a> + <a href="/admin/">Django admin</a> </div> <div id="nav"> diff --git a/templates/manyscansfolders.html b/templates/manyscansfolders.html index 00f5bdc..c392af9 100644 --- a/templates/manyscansfolders.html +++ b/templates/manyscansfolders.html @@ -11,13 +11,13 @@ plans and elevations. It also contains scans of centre-line survex output on which hand-drawn passage sections are drawn. These hand-drawn passages will eventually be traced to produce Tunnel or Therion drawings and eventually the final complete cave survey. -<table> +<table width=95%> <tr><th>Scans folder</th><th>Files</th><th>Survex blocks</th></tr> {% for scansfolder in manyscansfolders %} <tr> - <td><a href="{{scansfolder.get_absolute_url}}">{{scansfolder.walletname}}</a></td> - <td>{{scansfolder.singlescan_set.all|length}}</td> - <td> + <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"> {% for survexblock in scansfolder.survexblock_set.all %} <a href="{% url "svx" survexblock.survexfile.path %}">{{survexblock}}</a> {% endfor %} diff --git a/templates/tunnelfiles.html b/templates/tunnelfiles.html index 472bd59..9c527b9 100644 --- a/templates/tunnelfiles.html +++ b/templates/tunnelfiles.html @@ -7,34 +7,32 @@ {% block content %} <h3>All Tunnel files - references to wallets and survey scans</h3> -<table> -<tr><th>File</th><th>Font</th><th>Size</th><th>Paths</th><th>Scans folder</th><th>Scan files</th><th>Frames</th></tr> +<table style="font-size: 85%" width=95%> +<tr><th>File</th><th>Size</th><th>Paths</th><th>Scans folder</th><th>Scan files</th><th>Frames</th></tr> + {% for tunnelfile in tunnelfiles %} <tr> <td><a href="{% url "tunnelfile" tunnelfile.tunnelpath %}">{{tunnelfile.tunnelpath}}</a></td> - <td>{{tunnelfile.bfontcolours}}</td> - <td>{{tunnelfile.filesize}}</td> - <td>{{tunnelfile.npaths}}</td> + <td align="right" style="padding:2px">{{tunnelfile.filesize}}</td> + <td align="right" style="padding:2px">{{tunnelfile.npaths}}</td> - <td> + <td style="padding:2px"> {% for scansfolder in tunnelfile.manyscansfolders.all %} <a href="{{scansfolder.get_absolute_url}}">{{scansfolder.walletname}}</a> {% endfor %} </td> - <td> + <td style="padding:2px"> {% for singlescan in tunnelfile.scans.all %} <a href="{{singlescan.get_absolute_url}}">{{singlescan.name}}</a> {% endfor %} </td> - <td> + <td style="padding:2px"> {% for rtunnelfile in tunnelfile.tunnelcontains.all %} <a href="{% url "tunnelfile" rtunnelfile.tunnelpath %}">{{rtunnelfile.tunnelpath}}</a> {% endfor %} </td> - - </tr> {% endfor %} </table> |