summaryrefslogtreecommitdiffstats
path: root/urls.py
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@klebos.com>2021-04-01 20:08:57 +0100
committerPhilip Sargent <philip.sargent@klebos.com>2021-04-01 20:08:57 +0100
commitf752f934b65d77e9e0f1fb7161d8ec8144fa8887 (patch)
treef4fbe5d42ec470939cd6c42259fe7f9264a607a0 /urls.py
parent573dba47120ae462bd638014453d1688e9a578f3 (diff)
downloadtroggle-f752f934b65d77e9e0f1fb7161d8ec8144fa8887.tar.gz
troggle-f752f934b65d77e9e0f1fb7161d8ec8144fa8887.tar.bz2
troggle-f752f934b65d77e9e0f1fb7161d8ec8144fa8887.zip
fix cave description view
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/urls.py b/urls.py
index 62ea610..f03928d 100644
--- a/urls.py
+++ b/urls.py
@@ -8,7 +8,7 @@ from django.urls import reverse, resolve
from troggle.core.views import surveys, logbooks, other, caves, statistics, survex
from troggle.core.views.other import troggle404, frontpage
-from troggle.core.views.caves import ent, prospecting_image
+from troggle.core.views.caves import ent, prospecting_image, cavepage
from troggle.core.views.statistics import pathsreport, stats
from troggle.core.views.expo import expofiles_redirect, expofilessingle, expopage, editexpopage, mediapage
from troggle.core.views.survex import survexcaveslist, survexcavesingle, svx
@@ -97,7 +97,6 @@ trogglepatterns = [
url(r'^entrance/(?P<caveslug>[^/]+)/(?P<slug>[^/]+)/edit/', caves.editEntrance, name = "editentrance"),
url(r'^entrance/new/(?P<caveslug>[^/]+)/', caves.editEntrance, name = "newentrance"),
- url(r'^prospecting_guide/$', caves.prospecting),
url(r'^logbooksearch/(.*)/?$', logbooks.logbookSearch),
url(r'^statistics/?$', statistics.stats, name="stats"),
@@ -130,6 +129,7 @@ trogglepatterns = [
# url(r'^tunneldatainfo/(?P<path>.+?\.xml)$', surveys.tunnelfileinfo, name="tunnelfileinfo"),
url(r'^tunneldataraw/(?P<path>.+?\.xml)/upload$', surveys.tunnelfileupload, name="tunnelfileupload"),
+ url(r'^prospecting_guide/$', caves.prospecting),
url(r'^prospecting/(?P<name>[^.]+).png$', prospecting_image, name="prospecting_image"),
@@ -137,6 +137,7 @@ trogglepatterns = [
url(r'^site_media/(?P<subpath>.*)$', mediapage, {'doc_root': settings.MEDIA_ROOT}, name="mediapage"), # MEDIA_ROOT: CSS and JS
url(r'^static/(?P<subpath>.*)$', mediapage, {'doc_root': settings.MEDIA_ROOT}, name="mediapage"), # STATIC is in MEDIA now!
+ url(r'^(?P<karea>\d\d\d\d)(?P<subpath>.*)$', cavepage, name="cavepage"), # Cave description
url(r'^(.*)_edit$', editexpopage, name="editexpopage"),
url(r'^(.*)$', expopage, name="expopage"), # CATCHALL assumed relative to EXPOWEB