[svn r8225] fix martins front page links

troggle/expo/views_other.py

@@ -29,7 +29,7 @@ def frontPage(request):
 
     #'randSent':randSent.randomLogbookSentence(),
     expeditions =  Expedition.objects.order_by("-year")
-    return render_to_response('index.html', {'expeditions':expeditions, 'settings':settings, "message":message})
+    return render_to_response('index.html', {'expeditions':expeditions, 'settings':settings, 'all':'all', "message":message})
     
 def calendar(request,year):
     week=['S','S','M','T','W','T','F']

troggle/templates/index.html

@@ -30,7 +30,7 @@
     <li><a href="{% url personindex %}">List of People</a></li>
     <li><a href="{% url caveindex %}">List of Caves</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 survexindex all %}">Survex directory</a></li>
     <li><a href="{% url survey %}">Survey files</a></li>
 </ul>
 

troggle/urls.py

@@ -8,13 +8,14 @@ admin.autodiscover()
 urlpatterns = patterns('',
     
     (r'^$', frontPage),
-    url(r'^cave/?$', caveindex, name="caveindex"),
+    url(r'^caveindex$', 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),
 
-    url(r'^survex/(?P<survex_file>.*)\.index$', index, name="survexindex"),
+    url(r'^survex/(.*?)\.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),