diff options
Diffstat (limited to 'urls.py')
| -rw-r--r-- | urls.py | 22 |
1 files changed, 10 insertions, 12 deletions
@@ -15,21 +15,17 @@ admin.autodiscover() # type url probably means it's used. -# HOW DOES THIS WORK: -# url( <regular expression that matches the thing in the web browser>, +# HOW DOES THIS WORK: +# url( <regular expression that matches the thing in the web browser>, # <reference to python function in 'core' folder>, -# <name optional argument for URL reversing (doesn't do much)>) +# <name optional argument for URL reversing (doesn't do much)>) actualurlpatterns = patterns('', - - url(r'^testingurl/?$' , views_caves.millenialcaves, name="testing"), - - url(r'^millenialcaves/?$', views_caves.millenialcaves, name="millenialcaves"), - url(r'^troggle$', views_other.frontpage, name="frontpage"), + url(r'^troggle$', views_other.frontpage, name="frontpage"), url(r'^todo/$', views_other.todo, name="todo"), - url(r'^caves/?$', views_caves.caveindex, name="caveindex"), + url(r'^caves/?$', views_caves.caveindex, name="caveindex"), url(r'^people/?$', views_logbooks.personindex, name="personindex"), url(r'^newqmnumber/?$', views_other.ajax_QM_number, ), @@ -110,6 +106,8 @@ actualurlpatterns = patterns('', # (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', @@ -125,9 +123,9 @@ actualurlpatterns = patterns('', 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"), + url(r'^survexfile/caves/$', views_survex.survexcaveslist, name="survexcaveslist"), + 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/listdir/(?P<path>.*)$', view_surveys.listdir), |