diff options
Diffstat (limited to 'urls.py')
| -rw-r--r-- | urls.py | 63 |
1 files changed, 33 insertions, 30 deletions
@@ -3,6 +3,7 @@ from django.conf.urls import * from django.views.generic.edit import UpdateView from django.views.generic.list import ListView from django.contrib import admin +from django.contrib.staticfiles import views as staticviews from .core.views import * # flat import from .core.views_other import * @@ -10,6 +11,7 @@ from .core.views_caves import * from .core.views_survex import * from .core.models import * from troggle.core.views_statistics import pathsreport, stats +from flatpages import views as flatviews admin.autodiscover() @@ -20,7 +22,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'^troggle$', views_other.frontpage, name="frontpage"), url(r'^caves$', views_caves.caveindex, name="caveindex"), @@ -65,7 +67,7 @@ actualurlpatterns = patterns('', #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'), - #(r'^cavesearch', caveSearch), + #url(r'^cavesearch', caveSearch), url(r'^prospecting_guide/$', views_caves.prospecting), @@ -78,32 +80,16 @@ 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), - (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"), - (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}), - - (r'^accounts/', include('registration.backends.default.urls')), - (r'^profiles/', include('profiles.urls')), + url(r'^admin/doc/?', include('django.contrib.admindocs.urls')), # needs docutils Python module (http://docutils.sf.net/). + url(r'^admin/', include(admin.site.urls)), + url(r'^accounts/', include('registration.backends.default.urls')), + url(r'^profiles/', include('profiles.urls')), # (r'^personform/(.*)$', personForm), - (r'^expofiles/(?P<path>.*)$', 'django.views.static.serve', - {'document_root': settings.EXPOFILES, 'show_indexes': True}), - (r'^static/(?P<path>.*)$', 'django.views.static.serve', - {'document_root': settings.STATIC_ROOT, 'show_indexes': True}), - (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}), - #(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"), @@ -115,7 +101,7 @@ actualurlpatterns = patterns('', url(r'^survexfile/(?P<survex_cave>.*)$', views_survex.survexcavesingle, name="survexcavessingle"), url(r'^survexfileraw/(?P<survex_file>.*?)\.svx$', views_survex.svxraw, name="svxraw"), - (r'^survey_files/download/(?P<path>.*)$', view_surveys.download), + url(r'^survey_files/download/(?P<path>.*)$', view_surveys.download), #(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"), @@ -132,11 +118,28 @@ actualurlpatterns = patterns('', url(r'^prospecting/(?P<name>[^.]+).png$', prospecting_image, name="prospecting_image"), - url(r'^(.*)_edit$', 'flatpages.views.editflatpage', name="editflatpage"), - url(r'^(.*)$', 'flatpages.views.flatpage', name="flatpage"), -) + url(r'^expofiles/(?P<path>.*)$', staticviews.serve, + {'document_root': settings.EXPOFILES, 'show_indexes': True}), + url(r'^static/(?P<path>.*)$', staticviews.serve, + {'document_root': settings.STATIC_ROOT, 'show_indexes': True}), + url(r'^site_media/(?P<path>.*)$', staticviews.serve, + {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}), + #url(r'^tinymce_media/(?P<path>.*)$', staticviews.serve, + # {'document_root': settings.TINY_MCE_MEDIA_ROOT, 'show_indexes': True}), + #url(r'^photos/(?P<path>.*)$', staticviews.serve, +# {'document_root': settings.PHOTOS_ROOT, 'show_indexes':True}), +# url(r'^gallery/(?P<path>.*)$', staticviews.serve, +# {'document_root': settings.PHOTOS_ROOT, 'show_indexes':True}), +# don't know why this needs troggle/ in here. nice to get it out + url(r'^troggle/media-admin/(?P<path>.*)$', staticviews.serve, + {'document_root': settings.MEDIA_ADMIN_DIR, 'show_indexes':True}), + + url(r'^(.*)_edit$', flatviews.editflatpage, name="editflatpage"), + url(r'^(.*)$', flatviews.flatpage, name="flatpage"), + +] #Allow prefix to all urls -urlpatterns = patterns ('', - ('^%s' % settings.DIR_ROOT, include(actualurlpatterns)) -) +urlpatterns = [ + url('^%s' % settings.DIR_ROOT, include(actualurlpatterns)) +] |