diff options
Diffstat (limited to 'urls.py')
| -rw-r--r-- | urls.py | 72 |
1 files changed, 32 insertions, 40 deletions
@@ -1,18 +1,19 @@ from django.conf.urls import * from django.conf import settings +from django.conf.urls.static import static from core.views import * # flat import from core.views_other import * from core.views_caves import * from core.views_survex import * from core.models import * +from flatpages.views import * from django.views.generic.edit import UpdateView from django.contrib import admin from django.views.generic.list import ListView from django.contrib import admin admin.autodiscover() - # type url probably means it's used. # HOW DOES THIS WORK: @@ -20,7 +21,7 @@ admin.autodiscover() # <reference to python function in 'core' folder>, # <name optional argument for URL reversing (doesn't do much)>) -actualurlpatterns = patterns('', +actualurlpatterns = [ url(r'^testingurl/?$' , views_caves.millenialcaves, name="testing"), @@ -77,11 +78,10 @@ actualurlpatterns = patterns('', 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), + url(r'^prospecting_guide/$', views_caves.prospecting), url(r'^logbooksearch/(.*)/?$', views_logbooks.logbookSearch), - url(r'^statistics/?$', views_other.stats, name="stats"), url(r'^survey/?$', surveyindex, name="survey"), @@ -93,78 +93,70 @@ actualurlpatterns = patterns('', url(r'^logbook(?P<year>\d\d\d\d)\.(?P<extension>.*)/?$',views_other.downloadLogbook), url(r'^logbook/?$',views_other.downloadLogbook, name="downloadlogbook"), url(r'^cave/(?P<cave_id>[^/]+)/qm\.csv/?$', views_other.downloadQMs, name="downloadqms"), - (r'^downloadqms$', views_other.downloadQMs), + url(r'^downloadqms$', views_other.downloadQMs), url(r'^eyecandy$', views_other.eyecandy), - (r'^admin/doc/?', include('django.contrib.admindocs.urls')), + url(r'^admin/doc/?', include('django.contrib.admindocs.urls')), #url(r'^admin/(.*)', admin.site.get_urls, name="admin"), - (r'^admin/', include(admin.site.urls)), + url(r'^admin/', include(admin.site.urls)), # don't know why this needs troggle/ in here. nice to get it out - url(r'^troggle/media-admin/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ADMIN_DIR, 'show_indexes':True}), + # url(r'^troggle/media-admin/(?P<path>.*)$', static, {'document_root': settings.MEDIA_ADMIN_DIR, 'show_indexes':True}), + + url(r'^accounts/', include('registration.backends.default.urls')), + url(r'^profiles/', include('profiles.urls')), - (r'^accounts/', include('registration.backends.default.urls')), - (r'^profiles/', include('profiles.urls')), - # (r'^personform/(.*)$', personForm), - (r'^site_media/(?P<path>.*)$', 'django.views.static.serve', - {'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}), - - + url(r'^site_media/(?P<path>.*)$', static, {'document_root': settings.MEDIA_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"), url(r'^survexfile/(?P<survex_file>.*?)\.log$', views_survex.svxraw), url(r'^survexfile/(?P<survex_file>.*?)\.err$', views_survex.err), - - + + url(r'^survexfile/caves/$', views_survex.survexcaveslist, name="survexcaveslist"), url(r'^survexfile/caves/(?P<survex_cave>.*)$', views_survex.survexcavesingle, name="survexcavessingle"), url(r'^survexfileraw/(?P<survex_file>.*?)\.svx$', views_survex.svxraw, name="svxraw"), - - - (r'^survey_files/listdir/(?P<path>.*)$', view_surveys.listdir), - (r'^survey_files/download/(?P<path>.*)$', view_surveys.download), + + + url(r'^survey_files/listdir/(?P<path>.*)$', view_surveys.listdir), + url(r'^survey_files/download/(?P<path>.*)$', view_surveys.download), #(r'^survey_files/upload/(?P<path>.*)$', view_surveys.upload), - - #(r'^survey_scans/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.SURVEY_SCANS, 'show_indexes':True}), url(r'^survey_scans/$', view_surveys.surveyscansfolders, name="surveyscansfolders"), url(r'^survey_scans/(?P<path>[^/]+)/$', view_surveys.surveyscansfolder, name="surveyscansfolder"), url(r'^survey_scans/(?P<path>[^/]+)/(?P<file>[^/]+(?:png|jpg|jpeg))$', view_surveys.surveyscansingle, name="surveyscansingle"), - + url(r'^tunneldata/$', view_surveys.tunneldata, name="tunneldata"), 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'^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"), -# (r'^gallery/(?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}), # for those silly ideas url(r'^experimental.*$', views_logbooks.experimental, name="experimental"), - + #url(r'^trip_report/?$',views_other.tripreport,name="trip_report") - url(r'^(.*)_edit$', 'flatpages.views.editflatpage', name="editflatpage"), - url(r'^(.*)$', 'flatpages.views.flatpage', name="flatpage"), -) + url(r'^(.*)_edit$', editflatpage, name="editflatpage"), + url(r'^(.*)$', flatpage, name="flatpage"), +] #Allow prefix to all urls -urlpatterns = patterns ('', - ('^%s' % settings.DIR_ROOT, include(actualurlpatterns)) -) +urlpatterns = [ + url('^%s' % settings.DIR_ROOT, include(actualurlpatterns)) +] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) |