From 8fc0ba136fe2aba853474b0ea09a6736455c28fd Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@klebos.com>
Date: Tue, 16 Jun 2020 16:48:19 +0100
Subject: removed jgtfileupload

---
 urls.py | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

(limited to 'urls.py')

diff --git a/urls.py b/urls.py
index 1f94552..eb3e8ae 100644
--- a/urls.py
+++ b/urls.py
@@ -22,9 +22,8 @@ admin.autodiscover()
 
 actualurlpatterns = patterns('',
     
-    url(r'^troggle$',            views_other.frontpage,      name="frontpage"),
-    
-    url(r'^caves$',    views_caves.caveindex,      name="caveindex"),
+    url(r'^troggle$',    views_other.frontpage,      name="frontpage"),
+    url(r'^caves$',      views_caves.caveindex,      name="caveindex"),
     url(r'^people/?$',   views_logbooks.personindex, name="personindex"),
 
     url(r'^newqmnumber/?$',              views_other.ajax_QM_number, ),
@@ -50,26 +49,23 @@ actualurlpatterns = patterns('',
 
     url(r'^cave/new/$', views_caves.edit_cave, name="newcave"),
     url(r'^cave/(?P<cave_id>[^/]+)/?$', views_caves.cave, name="cave"),
+    url(r'^cave/(?P<cave_id>[^/]+)/?(?P<ent_letter>[^/])$', ent), # how can this work?
+    url(r'^cave/(?P<slug>[^/]+)/edit/$', views_caves.edit_cave, name="edit_cave"),
+    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'^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), # blank page
     url(r'^cave/logbook/([^/]+)/?$', views_caves.caveLogbook),
+    url(r'^cave/3d/(?P<cave_id>[^/]+).3d$', views_caves.cave3d, name="cave3d"),
+
     url(r'^entrance/(?P<caveslug>[^/]+)/(?P<slug>[^/]+)/edit/', views_caves.editEntrance, name = "editentrance"),
     url(r'^entrance/new/(?P<caveslug>[^/]+)/', views_caves.editEntrance, name = "newentrance"),
     #url(r'^cavedescription/(?P<cavedescription_name>[^/]+)/?$', views_caves.cave_description, name="cavedescription"),
     #url(r'^cavedescription/?$', object_list, {'queryset':CaveDescription.objects.all(),'template_name':'object_list.html'}, name="cavedescriptions"),
     #url(r'^cavehref/(.+)$',     views_caves.cave,       name="cave"),url(r'cave'),
-    url(r'^cave/3d/(?P<cave_id>[^/]+).3d$', views_caves.cave3d, name="cave3d"),
-
-    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),
-    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),    
 
@@ -104,8 +100,11 @@ actualurlpatterns = patterns('',
         {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
     #(r'^tinymce_media/(?P<path>.*)$', 'django.views.static.serve',
     #    {'document_root': settings.TINY_MCE_MEDIA_ROOT, 'show_indexes': True}),
-                
-        
+    #(r'^photos/(?P<path>.*)$', 'django.views.static.serve',
+    #    {'document_root': settings.PHOTOS_ROOT, 'show_indexes':True}),
+#    (r'^gallery/(?P<path>.*)$', 'django.views.static.serve',
+#        {'document_root': settings.PHOTOS_ROOT, 'show_indexes':True}),
+
     url(r'^survexblock/(.+)$',                     views_caves.survexblock, name="survexblock"),
     url(r'^survexfile/(?P<survex_file>.*?)\.svx$', views_survex.svx,        name="svx"),
     url(r'^survexfile/(?P<survex_file>.*?)\.3d$',  views_survex.threed,     name="threed"),
@@ -129,16 +128,9 @@ actualurlpatterns = patterns('',
     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'^tunneldatainfo/(?P<path>.+?\.xml)$',    view_surveys.tunnelfileinfo,     name="tunnelfileinfo"), 
 
     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}),
-
     
     url(r'^(.*)_edit$', 'flatpages.views.editflatpage', name="editflatpage"),
     url(r'^(.*)$', 'flatpages.views.flatpage', name="flatpage"),
-- 
cgit v1.2.3