diff options
author | Christian Pointner <equinox@helsinki.at> | 2016-04-15 18:41:03 (GMT) |
---|---|---|
committer | Christian Pointner <equinox@helsinki.at> | 2016-04-15 18:41:03 (GMT) |
commit | 17f110df8c14ea258d9227d08471a4a82bfa4657 (patch) | |
tree | f2aaf3e4bbf132fa3d0fbbbafca88a420f8225a7 /nop/urls.py | |
parent | 1d521e1c65babb8412b4959bd476596e0aa36aa6 (diff) | |
parent | 179a462bf561dc0cb4d19133e7e3684055278296 (diff) |
merged master into stable after new deployment
Diffstat (limited to 'nop/urls.py')
-rw-r--r-- | nop/urls.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/nop/urls.py b/nop/urls.py index c4012a6..3cc97a4 100644 --- a/nop/urls.py +++ b/nop/urls.py @@ -1,14 +1,13 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url from views import get, get_current, nop_form import os -NOP_STATIC_DIR = os.path.join(os.path.dirname(__file__), 'site_media') +NOP_SITE_MEDIA = os.path.join(os.path.dirname(__file__), 'site_media') -urlpatterns = patterns( - '', - url(r'^/get_current/?$', get_current), - url(r'^/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/(?P<hour>\d{1,2})/(?P<minute>\d{1,2})/?$', get), - url(r'^/?$', nop_form), - url(r'^/static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': NOP_STATIC_DIR}), +urlpatterns = patterns('', + url(r'^/get_current/?$', get_current), + url(r'^/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/(?P<hour>\d{1,2})/(?P<minute>\d{1,2})/?$', get), + url(r'^/?$', nop_form), + url(r'^/static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': NOP_SITE_MEDIA}), ) |