6 files changed, 79 insertions, 16 deletions
diff --git a/templates/base.html b/templates/base.html
index c88ac19..820dea7 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/main3.css" />
+<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/main2.css" />
 
 <title>{% block title %}THE TITLE{% endblock %}</title>
 
diff --git a/templates/cave.html b/templates/cave.html
index f8a511d..495e2f7 100644
--- a/templates/cave.html
+++ b/templates/cave.html
@@ -7,10 +7,12 @@
   <h3>All trips done in this cave</h3>
   <table>
   {% for logbookentry in cave.logbookentry_set.all %}
+  {% if logbookentry.title %}
     <tr>
       <td>{{logbookentry.date}}</td>
       <td><a href="{% url logbookentry logbookentry.href %}">{{logbookentry.title|safe}}</a></td>
     </tr>
+  {% endif %}
   {% endfor %}
   </table>
 </div>
diff --git a/templates/fileupload.html b/templates/fileupload.html
new file mode 100644
index 0000000..d1db6ca
--- /dev/null
+++ b/templates/fileupload.html
@@ -0,0 +1,18 @@
+<h2>Fileupload</h2>
+
+<ul>
+{% for fileuploaded in filesuploaded %}
+<li>UPLOADEDFILE: {{fileuploaded}}
+</li>
+{% endfor %}
+</ul>
+<p>MESSAGE: {{message}}
+</p>
+
+{% if not filesuploaded %}
+<form action="" method="POST">
+    <p>file to upload</p>
+    <p><input type="file" name="file1"/></p>
+    <p><input type="submit" name="submit" value="Submit" /></p>
+</form>
+{% endif %}
diff --git a/templates/index.html b/templates/index.html
index 2dad17b..879346e 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -6,33 +6,39 @@
 {% block content %}
 
 <h2>The unfinished front page</h2>
-<b>Work down through an expedition page link</b>
-<p class="indent"><b>Remaining work:</b> 
 
-<p>(separate out the recent/notable people) vast front-page layout table of folks and caving trips and years; </p>
-<p>parse 1995-1976 logbooks; </p>
+<ul>
+    <li><b><a href="{% url personindex %}">List of People</a></b></li>
+    <li><b><a href="{% url caveindex %}">List of Caves</a></b></li>
+    <li><a href="{% url jgtfile aaaa %}">JGT list of files</a> (temporary simple file list and tunnel use)</li>
+    <li><a href="{% url survey %}">Survey files</a></li>
+    <li><a href="{% url survexindex all %}">Survex directory</a></li>
+    <li><a href="{% url expedition 2008 %}">Expedition 2008</a></li>
+    <li><a href="{% url expedition 2007 %}">Expedition 2007</a></li>
+    <li><a href="{% url expedition 1996 %}">Expedition 1996</a></li>
+</ul>
+
+<h2>Further work</h2>
+
+<p>surf through the tunnel sketches and images</p>
+<p>bugs with all.svx block (double dot)
 <p>name matching and spelling in survex files; </p>
+<p>render bitmap view of every survex block as a thumbnail</p>
+<p>upload tunnel images and tunnel sketches</p>
+<p>parse 1995-1976 logbooks; (esp top 161)</p>
+<p>where are the subcaves; </p>
+<p>cave section entrance match for logbook entries</p>
 <p>detect T/U on log entries; </p>
 <p>Improve logbook wikihtml text</p>
-<p>match caves to log entries; </p>
 <p>simplify the survex parsing code (if necessary); </p>
+<p>wiki survex stop linegap between comment lins</p>
 <p>links between logbooks and survex blocks to cave things; </p>
-<p>where are the subcaves; </p>
 <p>mini-tree of survexblocks; </p>
 <p>connect sketches to caves to survey blocks and render thumbnailwise; </p>
 <p>all images to start appearing in pages; and so on</p>
-<p>tables of trips per year per person;</p> 
 
 <h3>{{message}}</h3>
 
-<ul>
-    <li><b><a href="{% url personindex %}">List of People</a></b></li>
-    <li><b><a href="{% url caveindex %}">List of Caves</a></b></li>
-    <li><a href="/statistics">Statistics of what's loaded in the database</a></li>
-    <li><a href="{% url survexindex all %}">Survex directory</a></li>
-    <li><a href="{% url survey %}">Survey files</a></li>
-</ul>
-
 <form action="" method="GET">
   <input type="submit" name="reloadexpos" value="Reload Expos">
   <input type="submit" name="reloadsurvex" value="Reload Survex">
diff --git a/templates/listdir.html b/templates/listdir.html
new file mode 100644
index 0000000..a3b677f
--- /dev/null
+++ b/templates/listdir.html
@@ -0,0 +1,22 @@
+<h2>List file :{{file}}:</h2>
+
+<h3>Files</h3>
+<ul>
+{% for lf in listdirfiles %}
+<li><a href="{% url jgtfile lf.0 %}">{{lf.1}}</a> ({{lf.2}} bytes)</li>
+{% endfor %}
+</ul>
+
+<h3>Upperdirectories</h3>
+<ul>
+{% for lf in upperdirs %}
+<li><a href="{% url jgtfile lf.0 %}">{{lf.1}}</a></li>
+{% endfor %}
+</ul>
+
+<h3>Subdirectories</h3>
+<ul>
+{% for lf in listdirdirs %}
+<li><a href="{% url jgtfile lf.0 %}">{{lf.1}}</a> ({{lf.2}} files)</li>
+{% endfor %}
+</ul>
diff --git a/templates/personindex.html b/templates/personindex.html
index c328628..5ffbe4d 100644
--- a/templates/personindex.html
+++ b/templates/personindex.html
@@ -5,6 +5,21 @@
 
 {% block content %}
 
+<h2>Notable expoers</h2>
+<table>
+<tr><th>Person</th><th>First</th><th>Last</th><th>Notability</th></tr>
+{% for person in notablepersons %}
+<tr>
+  <td><a href="{% url person person.href%}">{{person|wiki_to_html_short}}</a></td>
+  <td><a href="{% url personexpedition person.href person.Firstexpedition.expedition.year %}">{{person.Firstexpedition.expedition.year}}</a></td> 
+  <td><a href="{% url personexpedition person.href person.Lastexpedition.expedition.year %}">{{person.Lastexpedition.expedition.year}}</a></td> 
+  <td>{{person.notability}}</td>
+</tr>
+{% endfor %}
+</table>
+
+
+<h2>All expoers</h2>
 <table>
 <tr>
 {% for persons in personss %}