expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-22 07:11:52 +00:00
Code Issues 19 Projects 3 Activity

rearrange for clarity

Browse Source
This commit is contained in:
Philip Sargent 2020-06-13 01:27:42 +01:00
parent 38beb34a38
commit f8fa426adb
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
urls.py
View File

@ -9,6 +9,7 @@ from .core.views_other import *
from .core.views_caves import * from .core.views_caves import *
from .core.views_survex import * from .core.views_survex import *
from .core.models import * from .core.models import *
from troggle.core.views_statistics import pathsreport, stats
admin.autodiscover() admin.autodiscover()
@ -74,7 +75,8 @@ actualurlpatterns = patterns('',
url(r'^logbooksearch/(.*)/?$', views_logbooks.logbookSearch), url(r'^logbooksearch/(.*)/?$', views_logbooks.logbookSearch),
url(r'^statistics/?$', views_other.stats, name="stats"), url(r'^statistics/?$', views_statistics.stats, name="stats"),
url(r'^pathsreport.*$', views_statistics.pathsreport, name="pathsreport"),
# url(r'^survey/?$', surveyindex, name="survey"), #url referred to troggle menu.. # url(r'^survey/?$', surveyindex, name="survey"), #url referred to troggle menu..
# url(r'^survey/(?P<year>\d\d\d\d)\#(?P<wallet_number>\d*)$', survey, name="survey"), #Survey object # url(r'^survey/(?P<year>\d\d\d\d)\#(?P<wallet_number>\d*)$', survey, name="survey"), #Survey object
@ -86,7 +88,7 @@ actualurlpatterns = patterns('',
url(r'^cave/(?P<cave_id>[^/]+)/qm\.csv/?$', views_other.downloadQMs, name="downloadqms"), url(r'^cave/(?P<cave_id>[^/]+)/qm\.csv/?$', views_other.downloadQMs, name="downloadqms"),
(r'^downloadqms$', views_other.downloadQMs), (r'^downloadqms$', views_other.downloadQMs),
(r'^admin/doc/?', include('django.contrib.admindocs.urls')), (r'^admin/doc/?', include('django.contrib.admindocs.urls')), # needs docutils Python module (http://docutils.sf.net/).
#url(r'^admin/(.*)', admin.site.get_urls, name="admin"), #url(r'^admin/(.*)', admin.site.get_urls, name="admin"),
(r'^admin/', include(admin.site.urls)), (r'^admin/', include(admin.site.urls)),
@ -141,7 +143,6 @@ actualurlpatterns = patterns('',
# (r'^gallery/(?P<path>.*)$', 'django.views.static.serve', # (r'^gallery/(?P<path>.*)$', 'django.views.static.serve',
# {'document_root': settings.PHOTOS_ROOT, 'show_indexes':True}), # {'document_root': settings.PHOTOS_ROOT, 'show_indexes':True}),
url(r'^pathsreport.*$', views_logbooks.pathsreport, name="pathsreport"),
url(r'^(.*)_edit$', 'flatpages.views.editflatpage', name="editflatpage"), url(r'^(.*)_edit$', 'flatpages.views.editflatpage', name="editflatpage"),
url(r'^(.*)$', 'flatpages.views.flatpage', name="flatpage"), url(r'^(.*)$', 'flatpages.views.flatpage', name="flatpage"),