summaryrefslogtreecommitdiffstats
path: root/urls.py
diff options
context:
space:
mode:
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py45
1 files changed, 22 insertions, 23 deletions
diff --git a/urls.py b/urls.py
index 7184823..abff59e 100644
--- a/urls.py
+++ b/urls.py
@@ -65,15 +65,13 @@ trogglepatterns = [
url(r'^admin/doc/', include('django.contrib.admindocs.urls')), # needs docutils Python module (http://docutils.sf.net/).
url(r'^admin/', admin.site.urls), # includes admin login & logout urls
- # setting LOGIN_URL = '/accounts/login/' is default
- # url ENDS WITH this string
+# setting LOGIN_URL = '/accounts/login/' is default
+# url ENDS WITH this string
url(r'logout/$', expologout, name='expologout'), # higher precedence than /accounts/logout
url(r'login/$', expologin, name='expologin'), # higher precedence than /accounts/login
#url(r'^accounts/', include('django.contrib.auth.urls')), # from Dj3.0, see site-packages\registration\auth_urls_classes.py
- url(r'^newqmnumber/?$', other.ajax_QM_number, ),
-# url(r'^lbo_suggestions/?$', logbook_entry_suggestions), #broken, removed.
# url(r'^person/(?P<person_id>\d*)/?$', logbooks.person),
url(r'^person/(?P<first_name>[A-Z]*[a-z\-\'&;]*)[^a-zA-Z]*(?P<last_name>[a-z\-\']*[^a-zA-Z]*[A-Z]*[a-z\-&;]*)/?', logbooks.person, name="person"),
# url(r'^person/(\w+_\w+)$', logbooks.person, name="person"),
@@ -83,18 +81,25 @@ trogglepatterns = [
url(r'^api/expeditions_tsv$', logbooks.Expeditions_tsvListView.as_view()),
url(r'^api/expeditions_json$', logbooks.Expeditions_jsonListView.as_view()),
url(r'^personexpedition/(?P<first_name>[A-Z]*[a-z&;]*)[^a-zA-Z]*(?P<last_name>[A-Z]*[a-zA-Z&;]*)/(?P<year>\d+)/?$', logbooks.personexpedition, name="personexpedition"),
+
+# Logbook entries
url(r'^logbookentry/(?P<date>.*)/(?P<slug>.*)/?$', logbooks.logbookentry,name="logbookentry"),
-# url(r'^newlogbookentry/(?P<expeditionyear>.*)$', logbooks.newLogbookEntry, name="newLogBookEntry"), # Needed !
-# url(r'^editlogbookentry/(?P<expeditionyear>[^/]*)/(?P<pdate>[^/]*)/(?P<pslug>[^/]*)/$', logbooks.newLogbookEntry, name="editLogBookEntry"), # working !
-# url(r'^deletelogbookentry/(?P<expeditionyear>[^/]*)/(?P<date>[^/]*)/(?P<slug>[^/]*)/$', logbooks.deleteLogbookEntry, name="deleteLogBookEntry"),
+ url(r'^getLogBookEntries/(?P<expeditionslug>.*)', logbooks.get_logbook_entries, name = "get_logbook_entries"), #works
url(r'^newfile', other.newFile, name="newFile"), # oddly broken, needs investigating more
+ url(r'^logbooksearch/(.*)/?$', logbooks.logbookSearch),
+ url(r'^logbook(?P<year>\d\d\d\d)\.(?P<extension>.*)/?$', other.downloadLogbook),
+ url(r'^logbook/?$', other.downloadLogbook, name="downloadlogbook"),
+
- url(r'^getEntrances/(?P<caveslug>.*)', caves.get_entrances, name = "get_entrances"), #works
- # e.g. /getEntrances/1623-161
+# QMs pages
+ url(r'^cave/qms/([^/]+)/?$', caves.caveQMs), # blank page
+ url(r'^cave/(?P<cave_id>[^/]+)/qm\.csv/?$', other.downloadQMs, name="downloadqms"),
+ url(r'^newqmnumber/?$', other.ajax_QM_number, ),
url(r'^getQMs/(?P<caveslug>.*)', caves.get_qms, name = "get_qms"), # no template "get_qms"?
url(r'^getPeople/(?P<expeditionslug>.*)', logbooks.get_people, name = "get_people"), # fails
- url(r'^getLogBookEntries/(?P<expeditionslug>.*)', logbooks.get_logbook_entries, name = "get_logbook_entries"), #works
+ url(r'^downloadqms$', other.downloadQMs),
+# Cave description pages
url(r'^cave/new/$', caves.edit_cave, name="newcave"),
url(r'^cave/3d/(?P<cave_id>[^/]+)$', caves.cave3d, name="cave3d"),
url(r'^cave/(?P<cave_id>[^/]+)/?$', caves.cave, name="cave"),
@@ -104,30 +109,25 @@ trogglepatterns = [
url(r'^cave/entrance/([^/]+)/?$', caves.caveEntrance),
url(r'^cave/description/([^/]+)/?$', caves.caveDescription),
- url(r'^cave/qms/([^/]+)/?$', caves.caveQMs), # blank page
url(r'^cave/logbook/([^/]+)/?$', caves.caveLogbook),
+ url(r'^(?P<karea>\d\d\d\d)(?P<subpath>.*)$', cavepage, name="cavepage"), # shorthand references such as /1623/264
+ url(r'^getEntrances/(?P<caveslug>.*)', caves.get_entrances, name = "get_entrances"), #works e.g. /getEntrances/1623-161
url(r'^entrance/(?P<caveslug>[^/]+)/(?P<slug>[^/]+)/edit/', caves.editEntrance, name = "editentrance"),
url(r'^entrance/new/(?P<caveslug>[^/]+)/', caves.editEntrance, name = "newentrance"),
- url(r'^logbooksearch/(.*)/?$', logbooks.logbookSearch),
url(r'^statistics/?$', statistics.stats, name="stats"),
url(r'^stats/?$', statistics.stats, name="stats"),
url(r'^pathsreport.*$', statistics.pathsreport, name="pathsreport"),
url(r'^controlpanel/?$', other.controlPanel, name="controlpanel"),
- url(r'^logbook(?P<year>\d\d\d\d)\.(?P<extension>.*)/?$', other.downloadLogbook),
- url(r'^logbook/?$', other.downloadLogbook, name="downloadlogbook"),
- url(r'^cave/(?P<cave_id>[^/]+)/qm\.csv/?$', other.downloadQMs, name="downloadqms"),
- url(r'^downloadqms$', other.downloadQMs),
-# url(r'^map/', .........), # Intercepted by Apache. Yields OpenStreetMap. Redirects to expoweb/map
url(r'^prospecting_guide/$', caves.prospecting),
url(r'^prospecting/(?P<name>[^.]+).png$', prospecting_image, name="prospecting_image"),
- # The survexfile pages
+# The survexfile pages
url(r'^survexfile/(?P<survex_file>.*?)\.svx$', survex.svx, name="svx"),
url(r'^survexfile/(?P<survex_file>.*?)\.3d$', survex.threed, name="threed"),
url(r'^survexfile/(?P<survex_file>.*?)\.log$', survex.svxraw),
@@ -142,7 +142,7 @@ trogglepatterns = [
url(r'^survey_scans/(?P<path>[^/]+)/(?P<file>[^/]+)$',
surveys.surveyscansingle, name="surveyscansingle"),
- # The tunnel and therion drawings files pages
+# The tunnel and therion drawings files pages
url(r'^tunneldata/$', surveys.tunneldata, name="tunneldata"),
url(r'^tunneldataraw/(?P<path>.+?\.xml)$', surveys.dwgfilesingle, name="dwgfilesingle"),
url(r'^tunneldataraw/(?P<path>.+?\.th)$', surveys.dwgfilesingle, name="dwgfilesingle"),
@@ -150,17 +150,16 @@ trogglepatterns = [
# url(r'^tunneldatainfo/(?P<path>.+?\.xml)$', surveys.tunnelfileinfo, name="tunnelfileinfo"), # parses tunnel for info
url(r'^tunneldataraw/(?P<path>.+?\.xml)/upload$', surveys.tunnelfileupload, name="tunnelfileupload"),
- # This next set are all intercepted by Apache, if it is running.
+# This next set are all intercepted by Apache, if it is running.
url(r'^photos/(?P<subpath>.*)$', mediapage, {'doc_root': settings.PHOTOS_ROOT}, name="mediapage"), # photo galleries
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'^javascript/(?P<subpath>.*)$', mediapage, {'doc_root': settings.JSLIB_ROOT}, name="mediapage"), # JSLIB_URL
url(r'^expowebcache/3d/(?P<subpath>.*)$', mediapage, {'doc_root': settings.THREEDCACHEDIR}, name="mediapage"),
- # This next is for shorthand references such as /1623/264
- url(r'^(?P<karea>\d\d\d\d)(?P<subpath>.*)$', cavepage, name="cavepage"), # Cave description
+# url(r'^map/', .........), # Intercepted by Apache. Yields OpenStreetMap. Redirects to expoweb/map
- # Final catchall which also serves expoweb handbook pages and images
+# Final catchall which also serves expoweb handbook pages and images
url(r'^(.*)_edit$', editexpopage, name="editexpopage"),
url(r'^(.*)$', expopage, name="expopage"), # CATCHALL assumed relative to EXPOWEB
]