summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorgoatchurch <goatchurch@ubuntu.clocksoft.dom>2009-09-10 22:07:31 +0100
committergoatchurch <goatchurch@ubuntu.clocksoft.dom>2009-09-10 22:07:31 +0100
commitece3b79e5d5690c96630b598493009b1c924c8f7 (patch)
treec6fd7aa5fca183fb610a6b1007634ff791bba232 /templates
parent8050476c8a853229f1ab23edee929e5ba9515a8e (diff)
downloadtroggle-ece3b79e5d5690c96630b598493009b1c924c8f7.tar.gz
troggle-ece3b79e5d5690c96630b598493009b1c924c8f7.tar.bz2
troggle-ece3b79e5d5690c96630b598493009b1c924c8f7.zip
survey scans features added
Diffstat (limited to 'templates')
-rw-r--r--templates/survexblock.html8
-rw-r--r--templates/survexscansfolder.html23
-rw-r--r--templates/survexscansfolders.html21
-rw-r--r--templates/svxcavesingle.html4
-rw-r--r--templates/svxfile.html1
5 files changed, 50 insertions, 7 deletions
diff --git a/templates/survexblock.html b/templates/survexblock.html
index ef355eb..31958c0 100644
--- a/templates/survexblock.html
+++ b/templates/survexblock.html
@@ -22,10 +22,10 @@
{% endif %}
{% if survexblock.survexblock_set.all %}
- <p>Survey blocks below:</p>
-{% for survexblockdown in survexblock.survexblock_set.all %}
+ <p>Survey blocks below:</p>
+ {% for survexblockdown in survexblock.survexblock_set.all %}
<p class="indent"><a href="{% url survexblock survexblockdown.survexpath %}">{{survexblockdown.survexpath}}</a></p>
-{% endfor %}
+ {% endfor %}
{% endif %}
<p>Date: {{survexblock.date}}</p>
@@ -43,7 +43,7 @@
</div>
<div class="survexblock">
-{{ftext|survex_to_html}}
+ {{ftext|survex_to_html}}
</div>
{% endblock %}
diff --git a/templates/survexscansfolder.html b/templates/survexscansfolder.html
new file mode 100644
index 0000000..3de449f
--- /dev/null
+++ b/templates/survexscansfolder.html
@@ -0,0 +1,23 @@
+{% extends "base.html" %}
+{% load wiki_markup %}
+{% load survex_markup %}
+
+{% block title %}Survex Scans Folder{% endblock %}
+
+{% block content %}
+
+<h3>Survex Scans in: {{survexscansfolder.walletname}}</h3>
+<table>
+{% for survexscansingle in survexscansfolder.survexscansingle_set.all %}
+ <tr>
+ <td class="survexscansingle"><a href="{{survexscansingle.get_absolute_url}}">{{survexscansingle.name}}</a></td>
+ <td>
+ {% for survexblock in survexscansingle.survexblock_set %}
+ {{survexblock}}
+ {% endfor %}
+ </td>
+ </tr>
+{% endfor %}
+</table>
+
+{% endblock %} \ No newline at end of file
diff --git a/templates/survexscansfolders.html b/templates/survexscansfolders.html
new file mode 100644
index 0000000..186c5f4
--- /dev/null
+++ b/templates/survexscansfolders.html
@@ -0,0 +1,21 @@
+{% extends "base.html" %}
+{% load wiki_markup %}
+{% load survex_markup %}
+
+{% block title %}All Survex scans folders{% endblock %}
+
+{% block content %}
+
+<h3>All Survex scans folders</h3>
+<table>
+<tr><th>Scans folder</th><th>Files</th><th>Survex blocks</th></tr>
+{% for survexscansfolder in survexscansfolders %}
+ <tr>
+ <td><a href="{{survexscansfolder.get_absolute_url}}">{{survexscansfolder.walletname}}</a></td>
+ <td>{{survexscansfolder.survexscansingle_set.all|length}}</td>
+ <td>{{survexscansfolder.survexblock_set.all|length}}</td>
+ </tr>
+{% endfor %}
+</table>
+
+{% endblock %} \ No newline at end of file
diff --git a/templates/svxcavesingle.html b/templates/svxcavesingle.html
index d0fe827..123e92a 100644
--- a/templates/svxcavesingle.html
+++ b/templates/svxcavesingle.html
@@ -66,8 +66,8 @@
</td>
<td>
- {% if survexblock.refscandir %}
- <b><a href="/survey_scans/{{survexblock.refscandir}}/">scans</a></b>
+ {% if survexblock.survexscansfolder %}
+ <b><a href="{{survexblock.survexscansfolder.get_absolute_url}}">{{survexblock.survexscansfolder.walletname}}</a></b>
{% endif %}
</td>
</tr>
diff --git a/templates/svxfile.html b/templates/svxfile.html
index 90dc0e2..ed4318d 100644
--- a/templates/svxfile.html
+++ b/templates/svxfile.html
@@ -52,7 +52,6 @@ $(document).ready(function()
<input type="submit" name="diff" value="Diffy" />
<input type="submit" name="save" value="Save"/>
<input type="submit" name="process" value="Process" title="executes cavern"/>
- (Not implemented: <input type="submit" name="svncheckin" value="svn check-in"/>)
</form>
<div id="difflistajax">