diff options
Diffstat (limited to 'urls.py')
| -rw-r--r-- | urls.py | 32 |
1 files changed, 8 insertions, 24 deletions
@@ -12,7 +12,6 @@ from .core.models import * admin.autodiscover() - # type url probably means it's used. # HOW DOES THIS WORK: @@ -48,7 +47,6 @@ actualurlpatterns = patterns('', url(r'^getPeople/(?P<expeditionslug>.*)', views_logbooks.get_people, name = "get_people"), url(r'^getLogBookEntries/(?P<expeditionslug>.*)', views_logbooks.get_logbook_entries, name = "get_logbook_entries"), - url(r'^cave/new/$', views_caves.edit_cave, name="newcave"), url(r'^cave/(?P<cave_id>[^/]+)/?$', views_caves.cave, name="cave"), url(r'^caveslug/([^/]+)/?$', views_caves.caveSlug, name="caveSlug"), @@ -70,16 +68,14 @@ actualurlpatterns = patterns('', url(r'^cave/(?P<slug>[^/]+)/edit/$', views_caves.edit_cave, name="edit_cave"), #(r'^cavesearch', caveSearch), - url(r'^cave/(?P<cave_id>[^/]+)/(?P<year>\d\d\d\d)-(?P<qm_id>\d*)(?P<grade>[ABCDX]?)?$', views_caves.qm, name="qm"), url(r'^prospecting_guide/$', views_caves.prospecting), url(r'^logbooksearch/(.*)/?$', views_logbooks.logbookSearch), - url(r'^statistics/?$', views_other.stats, name="stats"), - + url(r'^survey/?$', surveyindex, name="survey"), url(r'^survey/(?P<year>\d\d\d\d)\#(?P<wallet_number>\d*)$', survey, name="survey"), @@ -89,21 +85,17 @@ actualurlpatterns = patterns('', url(r'^logbook/?$',views_other.downloadLogbook, name="downloadlogbook"), url(r'^cave/(?P<cave_id>[^/]+)/qm\.csv/?$', views_other.downloadQMs, name="downloadqms"), (r'^downloadqms$', views_other.downloadQMs), - - url(r'^eyecandy$', views_other.eyecandy), (r'^admin/doc/?', include('django.contrib.admindocs.urls')), #url(r'^admin/(.*)', admin.site.get_urls, name="admin"), (r'^admin/', include(admin.site.urls)), - + # don't know why this needs troggle/ in here. nice to get it out url(r'^troggle/media-admin/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ADMIN_DIR, 'show_indexes':True}), - (r'^accounts/', include('registration.backends.default.urls')), (r'^profiles/', include('profiles.urls')), - # (r'^personform/(.*)$', personForm), (r'^expofiles/(?P<path>.*)$', 'django.views.static.serve', @@ -121,45 +113,37 @@ actualurlpatterns = patterns('', url(r'^survexfile/(?P<survex_file>.*?)\.3d$', views_survex.threed, name="threed"), url(r'^survexfile/(?P<survex_file>.*?)\.log$', views_survex.svxraw), url(r'^survexfile/(?P<survex_file>.*?)\.err$', views_survex.err), - - + url(r'^survexfile/caves/$', views_survex.survexcaveslist, name="survexcaveslist"), url(r'^survexfile/(?P<survex_cave>.*)$', views_survex.survexcavesingle, name="survexcavessingle"), url(r'^survexfileraw/(?P<survex_file>.*?)\.svx$', views_survex.svxraw, name="svxraw"), - - + (r'^survey_files/listdir/(?P<path>.*)$', view_surveys.listdir), (r'^survey_files/download/(?P<path>.*)$', view_surveys.download), #(r'^survey_files/upload/(?P<path>.*)$', view_surveys.upload), - - #(r'^survey_scans/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.SURVEY_SCANS, 'show_indexes':True}), url(r'^survey_scans/$', view_surveys.surveyscansfolders, name="surveyscansfolders"), url(r'^survey_scans/(?P<path>[^/]+)/$', view_surveys.surveyscansfolder, name="surveyscansfolder"), url(r'^survey_scans/(?P<path>[^/]+)/(?P<file>[^/]+(?:png|jpg|jpeg))$', view_surveys.surveyscansingle, name="surveyscansingle"), - + url(r'^tunneldata/$', view_surveys.tunneldata, name="tunneldata"), url(r'^tunneldataraw/(?P<path>.+?\.xml)$', view_surveys.tunnelfile, name="tunnelfile"), url(r'^tunneldataraw/(?P<path>.+?\.xml)/upload$',view_surveys.tunnelfileupload, name="tunnelfileupload"), - + #url(r'^tunneldatainfo/(?P<path>.+?\.xml)$', view_surveys.tunnelfileinfo, name="tunnelfileinfo"), - + #(r'^photos/(?P<path>.*)$', 'django.views.static.serve', #{'document_root': settings.PHOTOS_ROOT, 'show_indexes':True}), - + url(r'^prospecting/(?P<name>[^.]+).png$', prospecting_image, name="prospecting_image"), # (r'^gallery/(?P<path>.*)$', 'django.views.static.serve', # {'document_root': settings.PHOTOS_ROOT, 'show_indexes':True}), - # for those silly ideas - url(r'^experimental.*$', views_logbooks.experimental, name="experimental"), url(r'^pathsreport.*$', views_logbooks.pathsreport, name="pathsreport"), - #url(r'^trip_report/?$',views_other.tripreport,name="trip_report") - url(r'^(.*)_edit$', 'flatpages.views.editflatpage', name="editflatpage"), url(r'^(.*)$', 'flatpages.views.flatpage', name="flatpage"), ) |