Survex directories report tidied

1 files changed, 5 insertions, 17 deletions

diff --git a/templates/survexdir.html b/templates/survexdir.html
index e2e2747..4b4fe11 100644
--- a/templates/survexdir.html
+++ b/templates/survexdir.html
@@ -4,29 +4,17 @@
 {% block content %}
 
 {% autoescape off %}
-<h1>SurvexDirectory objects</h1>
+<h1>Survex Primary files: per Cave and per directory</h1>
 {% endautoescape %}
 
-<h2>All SurvexDirectories</h2>
-<table>
-<tr><th>Dir Path</th><th>Primary svx</th></tr>
-{% for sd in survexdirs %}
-    <tr>       
-        <td><span{% if sd.matchbad %} style="color:red" {% endif %}>{{sd.path}}</span></td>
-        <td><a href="/survexfile/{{sd.primarysurvexfile}}.svx"><span {% if sd.pathbad %} style="color:red" {% endif %}>{{sd.primarysurvexfile}}.svx</span></a></td>
-    </tr>
-{% endfor %}
-</table>
-<p>
 <h2>All SurvexFiles</h2>
 <table>
-<tr><th>Cave</th><th>f.survexdirectory.path</th><th>f.primary.path.parent()</th><th>f.primary</th><th>f.path</th></tr>
+<tr><th>Cave</th><th>Cave primary</th><th>f.primary</th><th>f.path</th></tr>
 {% for f in survexfiles %}
     <tr>       
-<td>{{f.cave}}</td>
-<td><span {% if f.matchbad %} style="color:red" {% endif %}>{{f.survexdirectory.path}}</span></td>
-<td><span {% if f.primarybad %} style="color:red" {% endif %}>{{f.pathparent}}</span></td>
-<td> {{f.primary}}</td>
+<td><a href="/cave/{{f.cave}}">{{f.cave}}</a></td>
+<td>{{f.cave.survex_file}}</td>
+<td> {{f.primary}}.svx</td>
 <td><span {% if f.pathbad %} style="color:red" {% endif %}><a href="/survexfile/{{f.path}}.svx">{{f.path}}.svx</a></span></td>
     </tr>
 {% endfor %}