3 files changed, 20 insertions, 31 deletions
diff --git a/templates/experimental.html b/templates/experimental.html
deleted file mode 100644
index 17d96ef..0000000
--- a/templates/experimental.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{% extends "base.html" %}
-{% load wiki_markup %}
-{% load link %}
-
-{% block title %}Experimental{% endblock %}
-
-{% block content %}
-
-<h1>Expo Experimental</h1>
-
-<p>Number of survey legs: {{nsurvexlegs}}, total length: {{totalsurvexlength|stringformat:".3f"}} km</p>
-
-<table>
-<tr><th>Year</th><th>Surveys</th><th>Survey Legs</th><th>Total length<br>(km)</th></tr>
-{% for legs in legsbyexpo %}
-<tr>
-  <td>{{legs.0.year}}</td>
-  <td style="text-align:right">{{legs.0.survexblock_set.all|length}}</td>
-  <td style="text-align:right">{{legs.1.nsurvexlegs|rjust:"10"}}</td>
-  <td style="text-align:right">{{legs.1.survexleglength|stringformat:".3f"}}</td>
-</tr>
-{% endfor %}
-</table>
-
-{% endblock %}
-
diff --git a/templates/eyecandy.html b/templates/eyecandy.html
deleted file mode 100644
index 1e8def6..0000000
--- a/templates/eyecandy.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<img id="richardBanner" class="footer" src="{{ settings.MEDIA_URL }}expoBanner.gif" style="display: none;"/>
-<img id="timeMachine" class="footer" src="{{ settings.MEDIA_URL }}timemachine.gif" style="display: none;"/>
-<img id="surveyHover" class="footer" src="{{ settings.MEDIA_URL }}surveyHover.gif" style="display: none;"/>
-\ No newline at end of file
diff --git a/templates/statistics.html b/templates/statistics.html
index daca752..5c9810b 100644
--- a/templates/statistics.html
+++ b/templates/statistics.html
@@ -1,8 +1,26 @@
 {% extends "base.html" %}
 {% load wiki_markup %}
+{% load link %}
 
-{% block title %}Database statistics{% endblock %}
+{% block title %}Expo statistics{% endblock %}
 
 {% block content %}
-Over the course of {{ expoCount }} expeditions, {{ personCount }} people have contributed {{ caveCount }} caves and {{ logbookEntryCount }} logbook entries. 
+<h1>Expo Statistics</h1>
+
+<p>{{ expoCount }} expeditions: {{ personCount }} people have contributed {{ caveCount }} caves and {{ logbookEntryCount }} logbook entries. 
+
+<p>Number of survey legs: {{nsurvexlegs}}, total length: {{totalsurvexlength|stringformat:".3f"}} km</p>
+
+<table>
+<tr><th>Year</th><th>Surveys</th><th>Survey Legs</th><th>Total length<br>(km)</th></tr>
+{% for legs in legsbyexpo %}
+<tr>
+  <td>{{legs.0.year}}</td>
+  <td style="text-align:right">{{legs.0.survexblock_set.all|length}}</td>
+  <td style="text-align:right">{{legs.1.nsurvexlegs|rjust:"10"}}</td>
+  <td style="text-align:right">{{legs.1.survexleglength|stringformat:".3f"}}</td>
+</tr>
+{% endfor %}
+</table>
+
 {% endblock %}
 \ No newline at end of file