From 9c1e978da28228cd14d4f2a0ff3ac08ea73240ed Mon Sep 17 00:00:00 2001
From: substantialnoninfringinguser <substantialnoninfringinguser@gmail.com>
Date: Tue, 19 May 2009 06:32:42 +0100
Subject: [svn]

---
 urls.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'urls.py')

diff --git a/urls.py b/urls.py
index 8ae9ca7..fc2b7a2 100644
--- a/urls.py
+++ b/urls.py
@@ -24,7 +24,7 @@ urlpatterns = patterns('',
     #url(r'^person/(\w+_\w+)$',       views_logbooks.person,      name="person"),
     
     url(r'^expedition/(\d+)$',  views_logbooks.expedition,  name="expedition"),
-    url(r'^expeditions/?$',  object_list,  {'queryset':Expedition.objects.all(),'template_name':'expeditions.html'},name="expeditionlist"),
+    url(r'^expeditions/?$',  object_list,  {'queryset':Expedition.objects.all(),'template_name':'object_list.html'},name="expeditions"),
     url(r'^personexpedition/(?P<first_name>[A-Z]*[a-z]*)[^a-zA-Z]*(?P<last_name>[A-Z]*[a-z]*)/(?P<year>\d+)/?$', views_logbooks.personexpedition, name="personexpedition"),
     url(r'^logbookentry/(?P<date>.*)/(?P<slug>.*)/?$', views_logbooks.logbookentry,name="logbookentry"),
     
@@ -72,8 +72,7 @@ urlpatterns = patterns('',
     (r'^accounts/', include('registration.urls')),
     (r'^profiles/', include('profiles.urls')),
     
-#    (r'^personform/(.*)$', personForm),
-
+#   (r'^personform/(.*)$', personForm),
 
     (r'^site_media/(?P<path>.*)$', 'django.views.static.serve',
         {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
-- 
cgit v1.2.3