1 files changed, 95 insertions, 41 deletions
diff --git a/templates/millenialcaves.html b/templates/millenialcaves.html
index 73372f8..8e8c5c6 100644
--- a/templates/millenialcaves.html
+++ b/templates/millenialcaves.html
@@ -8,62 +8,116 @@
 
 <body>
 
-<h2>Caves of loserplateau (locations acording to all.3d)</h2>
-<span style="font-size:70%">
-Name contains:<br>
-<div id="inputf"><input type="text" name="CaveName" id="CaveName" style="width:100%"></div><br>
-Depth between (min, max) in meters (0 disables filter):<br>
-<div id="inputf"><input type="number" name="CaveDepthMin" id="CaveDepthMin" style="width:45%"> - <input type="number" name="CaveDepthMax" id="CaveDepthMax" style="width:45%"></div><br>
-Length between (min, max) in meters (0 disables filter):<br>
-<div id="inputf"><input type="number" name="CaveLengthMin" id="CaveLengthMin" style="width:45%"> - <input type="number" name="CaveLengthMax" id="CaveLengthMax" style="width:45%"></div><br>
-Last visit after (date in YYYY.MM.DD format works best):<br>
-<div id="inputf"><input type="text" name="VisitDate" id="VisitDate" style="width:100%"></div><br>
-Last visited by (single word or regular expression, search is not case sensitive):<br>
-(e.g. <span id="mono">/da.e/</span> matches both Dave and Dane, <span id="mono">/w..k|ol{2}y/</span> matches either Wook and Olly)<br>
-<div id="inputf"><input type="text" name="Visitor" id="Visitor" style="width:100%"></div><br>
-Hide incomplete entries:<br>
-<div id="inputf"><input type="checkbox" name="Incomplete" id="Incomplete" style="width:100%"></div><br><br>
+<table>
+<tr>
+<th>Cave</th>
+<th>Components</th>
+<th>aaa</th>
+<th>bbb</th>
+</tr>
+
+
+{% for subdircave, cavefiles, subsurvdirs in subdircaves %}
+<tr>
+  <td><b><a href="{% url "svx" cavefiles.0.0 %}">{{cavefiles.0.1}}</a></b></td>
+  <td>
+  root: {% for cavepath, cavename in cavefiles.1 %}
+    <a href="{% url "svx" cavepath %}">{{cavename}}</a>
+  {% endfor %}
+  <br>
+  {% for primarycavefile, subcavefiles in subsurvdirs %}
+    {{ primarycavefile.1 }}:
+    {% for cavepath, cavename in subcavefiles %}
+       <a href="{% url "svx" cavepath %}">{{cavename}}</a>
+    {% endfor %}
+    <br>
+  {% endfor %}
+  </td>
+</tr>
+{% endfor %}
+
+{% for primarycavefile, subcavefiles in multifilecaves %}
+<tr>
+  <td>
+     <a href="{% url "survexcavessingle" primarycavefile.1 %}">{{primarycavefile.1}}</a>
+  </td>
+  <td>
+    {% for cavepath, cavename in subcavefiles %}
+       <a href="{% url "svx" cavepath %}">{{cavename}}</a>
+    {% endfor %}
+  </td>
+</tr>
+{% endfor %}
+
+
+</table>
 
-<button onclick="filterTable('caves_table')">Filter</button><br>
-<button onclick="filterTableReset('caves_table')">Reset filters</button><br>
 
-Click on column headers to sort/reverse sort<br><br><br>
-</span>
 
+======================= OLD STUFF ==============================
 
+<td><a href="{% url "svx" cavefiles.0.0 %}">{{cavefiles.0.1}}</a></td>
 
+<p><a href="#cdir">caves with subdirectories</a> | <a href="#cmult">caves with multiple files</a> | <a href="#csing">caves with single files</a></p>
 
-<table id="caves_table">
+<h3><a href="/survexfile/all.svx">Link to all.svx for processing</a></h3>
+
+<h2 id="cdir">Caves with subdirectories</h2>
+
+{% for subdircave, cavefiles, subsurvdirs in subdircaves %}
+<h3>{{cavefiles.0.1}} - <a href="{% url "survexcavessingle" cavefiles.0.1 %}">dates and explorers</a></h3>
+<table>
 <tr>
-<th onclick="sortTable(0,'caves_table',0)">Cave survex id</th>
-<th onclick="sortTable(1,'caves_table',0)">Cave name</th>
-<th onclick="sortTable(2,'caves_table',1)">Cave depth</th>
-<th onclick="sortTable(3,'caves_table',1)">Cave length</th>
-<th onclick="sortTable(4,'caves_table',0)">Last leg date</th>
-<th onclick="sortTable(5,'caves_table',0)">Cave location (UTM)</th>
-<th onclick="sortTable(6,'caves_table',0)">Cave location (lat/lon)</th>
-<th onclick="sortTable(7,'caves_table',1)">Top camp distance [m]</th>
+  <td><b><a href="{% url "svx" cavefiles.0.0 %}">{{cavefiles.0.1}}</a></b></td>
+  <td>
+  {% for cavepath, cavename in cavefiles.1 %}
+    <a href="{% url "svx" cavepath %}">{{cavename}}</a>
+  {% endfor %}
+  </td>
 </tr>
 
-{% for cave in caves %}
+{% for primarycavefile, subcavefiles in subsurvdirs %}
 <tr>
-    <td><a href={{cave.description}}>{{ cave.name         }}</a></td>
-    <td>{{ cave.title            }}</td>
-    <td>{{ cave.total_depth      }}</td>
-    <td>{{ cave.total_length     }}</td>
-    <td>{{ cave.date             }}</td>
-    <td>33U {{ cave.entrance     }}</td>
-    <td>{{ cave.lat_lon_entrance }}</td>
-    <td>{{ cave.top_camp_distance}}</td>
-</tr>
+  <td><a href="{% url "svx" primarycavefile.0 %}">{{primarycavefile.1}}</a></td>
+  <td>
+    {% for cavepath, cavename in subcavefiles %}
+       <a href="{% url "svx" cavepath %}">{{cavename}}</a>
+    {% endfor %}
+  </td>
+</tr>  
 {% endfor %}
-
 </table>
 
-<script type="text/javascript" src="{{ settings.MEDIA_URL }}/scripts/TableSort.js"></script>
+{% endfor %}
+
 
-</body>
+<h2 id="cmult">Caves of multiple files</h2>
+<table>
+<tr><th>Dates and explorers</th><th>Survex files</th></tr>
+{% for primarycavefile, subcavefiles in multifilecaves %}
+<tr>
+  <td>
+     <a href="{% url "survexcavessingle" primarycavefile.1 %}">{{primarycavefile.1}}</a>
+  </td>
+  <td>
+    <a href="{% url "svx" primarycavefile.0 %}">{{primarycavefile.1}}</a> -
+    {% for cavepath, cavename in subcavefiles %}
+       <a href="{% url "svx" cavepath %}">{{cavename}}</a>
+    {% endfor %}
+  </td>
+</tr>
+{% endfor %}
+</table>
+
+<h2 id="csing">Caves of one file</h2>
+<p>
+{% for cavepath, cavename in onefilecaves %}
+   <a href="{% url "svx" cavepath %}">{{cavename}}</a>
+{% endfor %}
+</p>
+<body>
 
+<script type="text/javascript" src="scripts/TableSort.js"></script>
 
 </html>