summaryrefslogtreecommitdiffstats
path: root/urls.py
diff options
context:
space:
mode:
authorsubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-13 06:19:45 +0100
committersubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-13 06:19:45 +0100
commit09a1539aefcf693cc95630d7adcb2a840c8128c8 (patch)
treeeed7a7ae08719ff9b35e47ce9ba3411376408aa5 /urls.py
parent84d92115f3d666d419faf047d9400bd0214de014 (diff)
downloadtroggle-09a1539aefcf693cc95630d7adcb2a840c8128c8.tar.gz
troggle-09a1539aefcf693cc95630d7adcb2a840c8128c8.tar.bz2
troggle-09a1539aefcf693cc95630d7adcb2a840c8128c8.zip
[svn] Interface improvements. Code will need some cleaning up.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8331 by cucc @ 5/8/2009 8:16 PM
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/urls.py b/urls.py
index 0e0e930..9494694 100644
--- a/urls.py
+++ b/urls.py
@@ -12,6 +12,7 @@ admin.autodiscover()
urlpatterns = patterns('',
url(r'^$', views_other.frontpage, name="frontpage"),
+ url(r'^todo/$', views_other.todo, name="todo"),
url(r'^caveindex/?$', views_caves.caveindex, name="caveindex"),
url(r'^personindex$', views_logbooks.personindex, name="personindex"),
@@ -31,11 +32,7 @@ urlpatterns = patterns('',
url(r'^jgtfile/(.*)$', view_surveys.jgtfile, name="jgtfile"),
url(r'^jgtuploadfile$', view_surveys.jgtuploadfile, name="jgtuploadfile"),
-
-
-
-
-
+
url(r'^cave/(?P<cave_id>[^/]+)/?(?P<ent_letter>[^/])$', ent),
#(r'^cave/(?P<cave_id>[^/]+)/edit/$', edit_cave),
#(r'^cavesearch', caveSearch),
@@ -60,7 +57,7 @@ urlpatterns = patterns('',
url(r'^survey/?$', surveyindex, name="survey"),
url(r'^survey/(?P<year>\d\d\d\d)\#(?P<wallet_number>\d*)$', survey, name="survey"),
- url(r'^controlpanel/?$', views_other.controlPanel, name="survey"),
+ url(r'^controlpanel/?$', views_other.controlPanel, name="controlpanel"),
(r'^admin/doc/?', include('django.contrib.admindocs.urls')),
(r'^admin/(.*)', admin.site.root),