[svn r8223] Added links to front page

Add names for views in order to link from the main page

troggle/templates/index.html

@@ -27,8 +27,11 @@
 <h3>{{message}}</h3>
 
 <ul>
-    <li><a href="{% url personindex %}">List osf people</a></li>
+    <li><a href="{% url caveindex %}">List of Caves</a></li>
+    <li><a href="{% url personindex %}">List of People</a></li>
     <li><a href="/statistics">Statistics of what's loaded in the database</a></li>
+    <li><a href="{% url survexindex survex_file=all %}">Survex directory</a></li>
+    <li><a href="{% url survey %}">Survey files</a></li>
 </ul>
 
 <form action="" method="GET">
@@ -37,11 +40,13 @@
 </form>
 
 <ul id="expeditionlist">
-    <li>
+
     {% for expedition in expeditions %}
-        <a href="{% url expedition expedition.year %}">{{expedition.name}}</a>
+        <li>
+            <a href="{% url expedition expedition.year %}">{{expedition.name}}</a>
+        </li>
     {% endfor %}
-    </li>
+
 </ul>
 
 {% endblock %}

troggle/urls.py

@@ -8,13 +8,13 @@ admin.autodiscover()
 urlpatterns = patterns('',
     
     (r'^$', frontPage),
-    (r'^cave/?$', caveindex),
+    url(r'^cave/?$', caveindex, name="caveindex"),
     (r'^cave/(?P<cave_id>[^/]+)/?$', cave),
     (r'^cave/(?P<cave_id>[^/]+)/?(?P<ent_letter>[^/])$', ent),
     #(r'^cave/(?P<cave_id>[^/]+)/edit/$', edit_cave),
     (r'^cavesearch', caveSearch),
 
-    (r'^survex/(?P<survex_file>.*)\.index$', index),
+    url(r'^survex/(?P<survex_file>.*)\.index$', index, name="survexindex"),
     (r'^survex/(?P<survex_file>.*)\.svx$', svx),
     (r'^survex/(?P<survex_file>.*)\.3d$', threed),
     (r'^survex/(?P<survex_file>.*)\.log$', log),
@@ -34,7 +34,7 @@ urlpatterns = patterns('',
     url(r'^statistics/?$', stats, name="stats"),
     
     url(r'^calendar/(?P<year>\d\d\d\d)?$', calendar, name="calendar"),
-    
+
     url(r'^survey/?$', surveyindex, name="survey"),
     (r'^survey/(?P<year>\d\d\d\d)\#(?P<wallet_number>\d*)$', survey),