summaryrefslogtreecommitdiffstats
path: root/urls.py
diff options
context:
space:
mode:
authorPhilip Sargent <philip@Muscogee.localdomain>2020-05-15 21:32:55 +0100
committerPhilip Sargent <philip@Muscogee.localdomain>2020-05-15 21:32:55 +0100
commitd4ac28af18ef41661c299a1b9fc1f630cda6193c (patch)
treebe6a0200be3459835c21769a8073c6c45739d00d /urls.py
parent931aa4e3cba04382b8d8c94658c7a871c739be5b (diff)
downloadtroggle-d4ac28af18ef41661c299a1b9fc1f630cda6193c.tar.gz
troggle-d4ac28af18ef41661c299a1b9fc1f630cda6193c.tar.bz2
troggle-d4ac28af18ef41661c299a1b9fc1f630cda6193c.zip
Remove PHOTOS_ROOT and DPhoto class
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/urls.py b/urls.py
index 281e189..410c391 100644
--- a/urls.py
+++ b/urls.py
@@ -48,7 +48,7 @@ actualurlpatterns = patterns('',
url(r'^newfile', views_other.newFile, name="newFile"),
url(r'^getEntrances/(?P<caveslug>.*)', views_caves.get_entrances, name = "get_entrances"),
- url(r'^getQMs/(?P<caveslug>.*)', views_caves.get_qms, name = "get_qms"),
+ url(r'^getQMs/(?P<caveslug>.*)', views_caves.get_qms, name = "get_qms"), # no template "get_qms"?
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"),
@@ -58,7 +58,7 @@ actualurlpatterns = patterns('',
url(r'^caveslug/([^/]+)/?$', views_caves.caveSlug, name="caveSlug"),
url(r'^cave/entrance/([^/]+)/?$', views_caves.caveEntrance),
url(r'^cave/description/([^/]+)/?$', views_caves.caveDescription),
- url(r'^cave/qms/([^/]+)/?$', views_caves.caveQMs),
+ url(r'^cave/qms/([^/]+)/?$', views_caves.caveQMs), # blank page
url(r'^cave/logbook/([^/]+)/?$', views_caves.caveLogbook),
url(r'^entrance/(?P<caveslug>[^/]+)/(?P<slug>[^/]+)/edit/', views_caves.editEntrance, name = "editentrance"),
url(r'^entrance/new/(?P<caveslug>[^/]+)/', views_caves.editEntrance, name = "newentrance"),
@@ -87,6 +87,7 @@ actualurlpatterns = patterns('',
url(r'^survey/?$', surveyindex, name="survey"),
url(r'^survey/(?P<year>\d\d\d\d)\#(?P<wallet_number>\d*)$', survey, name="survey"),
+# Is all this lot out of date ? Maybe the logbooks work?
url(r'^controlpanel/?$', views_other.controlPanel, name="controlpanel"),
url(r'^CAVETAB2\.CSV/?$', views_other.downloadCavetab, name="downloadcavetab"),
url(r'^Surveys\.csv/?$', views_other.downloadSurveys, name="downloadsurveys"),
@@ -147,8 +148,8 @@ actualurlpatterns = patterns('',
#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}),
+ #(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"),