diff options
| author | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 05:48:47 +0100 |
|---|---|---|
| committer | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 05:48:47 +0100 |
| commit | cb52c47aa9632a6c0affde9b0ceeab06877c760b (patch) | |
| tree | 4a242f8a7929db5c1a49958f2aec3a826af893b3 /urls.py | |
| parent | ed345f25760d8927f834a69202c2b9b2cef71ee0 (diff) | |
| download | troggle-cb52c47aa9632a6c0affde9b0ceeab06877c760b.tar.gz troggle-cb52c47aa9632a6c0affde9b0ceeab06877c760b.tar.bz2 troggle-cb52c47aa9632a6c0affde9b0ceeab06877c760b.zip | |
[svn] yorkshire work with tunnel integration
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8232 by julian @ 1/29/2009 11:40 PM
Diffstat (limited to 'urls.py')
| -rw-r--r-- | urls.py | 47 |
1 files changed, 29 insertions, 18 deletions
@@ -1,43 +1,54 @@ from django.conf.urls.defaults import *
-from expo.views import *
-import expo.view_surveys as view_surveys
import troggle.settings as settings
+
+from expo.views import * # flat import
+from expo.views_caves import *
+from expo.views_survex import *
+
from django.contrib import admin
admin.autodiscover()
urlpatterns = patterns('',
- (r'^$', frontPage),
- url(r'^caveindex$', caveindex, name="caveindex"),
- url(r'^cave/(?P<cave_id>[^/]+)/?$', cave),
+ url(r'^$', views_other.frontpage, name="frontpage"),
+
+ url(r'^caveindex$', views_caves.caveindex, name="caveindex"),
+ url(r'^personindex$', views_logbooks.personindex, name="personindex"),
- url(r'^cavehref/(.+)$', cave, name="cave"),
+ url(r'^person/(.+)$', views_logbooks.person, name="person"),
+ url(r'^expedition/(\d+)$', views_logbooks.expedition, name="expedition"),
+ url(r'^personexpedition/(.+?)/(\d+)$', views_logbooks.personexpedition, name="personexpedition"),
+ url(r'^logbookentry/(.+)$', views_logbooks.logbookentry,name="logbookentry"),
+ url(r'^survexblock/(.+)$', views_caves.survexblock, name="survexblock"),
+ url(r'^cavehref/(.+)$', views_caves.cavehref, name="cave"),
+
+ url(r'^jgtfile/(.*)$', view_surveys.jgtfile, name="jgtfile"),
+ url(r'^jgtuploadfile$', view_surveys.jgtuploadfile, name="jgtuploadfile"),
+
+
+
+
+
(r'^cave/(?P<cave_id>[^/]+)/?(?P<ent_letter>[^/])$', ent),
#(r'^cave/(?P<cave_id>[^/]+)/edit/$', edit_cave),
(r'^cavesearch', caveSearch),
url(r'^cavearea', caveArea, name="caveArea"),
- url(r'^survex/(.*?)\.index$', index, name="survexindex"),
+ url(r'^survex/(.*?)\.index$', views_survex.index, name="survexindex"),
+ url(r'^cave/(?P<cave_id>[^/]+)/?$', views_caves.cavehref), # deprecated
(r'^survex/(?P<survex_file>.*)\.svx$', svx),
(r'^survex/(?P<survex_file>.*)\.3d$', threed),
(r'^survex/(?P<survex_file>.*)\.log$', log),
(r'^survex/(?P<survex_file>.*)\.err$', err),
- url(r'^personindex$', personindex, name="personindex"),
- url(r'^person/(.+)$', person, name="person"),
-
- url(r'^logbookentry/(.+)$', logbookentry, name="logbookentry"),
- url(r'^logbooksearch/(.*)/?$', logbookSearch),
- url(r'^expedition/(\d+)$', expedition, name="expedition"),
- url(r'^personexpedition/(.+?)/(\d+)$', personexpedition, name="personexpedition"),
- url(r'^survexblock/(.+)$', survexblock, name="survexblock"),
+ url(r'^logbooksearch/(.*)/?$', views_logbooks.logbookSearch),
- url(r'^statistics/?$', stats, name="stats"),
+ url(r'^statistics/?$', views_other.stats, name="stats"),
- url(r'^calendar/(?P<year>\d\d\d\d)?$', calendar, name="calendar"),
+ url(r'^calendar/(?P<year>\d\d\d\d)?$', views_other.calendar, name="calendar"),
url(r'^survey/?$', surveyindex, name="survey"),
(r'^survey/(?P<year>\d\d\d\d)\#(?P<wallet_number>\d*)$', survey),
@@ -48,7 +59,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}),
|