diff options
Diffstat (limited to 'example_project')
| -rw-r--r-- | example_project/urls.py | 47 |
1 files changed, 21 insertions, 26 deletions
diff --git a/example_project/urls.py b/example_project/urls.py index 1b8d00901..9e2439a01 100644 --- a/example_project/urls.py +++ b/example_project/urls.py @@ -1,44 +1,39 @@ from django.conf import settings -from django.conf.urls import patterns, include, url +from django.conf.urls import include, url from django.contrib import admin from ishtar_common.apps import admin_site from ajax_select import urls as ajax_select_urls +from ishtar_common.views import index + admin.autodiscover() -urlpatterns = patterns( - '', (r'^accounts/', include('registration.urls')), -) +urlpatterns = [ + url(r'^accounts/', include('registration.urls')), + +] APP_LIST = ['archaeological_files_pdl', 'archaeological_files', 'archaeological_operations', 'archaeological_context_records', 'archaeological_warehouse', 'archaeological_finds'] for app in APP_LIST: - # filter by activated apps? - urlpatterns += patterns( - '', ('', include(app + '.urls')), - ) - -urlpatterns += patterns( - '', ('', include('ishtar_common.urls')), -) - -urlpatterns += patterns( - 'ishtar_common.views', url(r'^$', 'index', name='start'), -) - -urlpatterns += patterns( - '', (r'^admin/', include(admin_site.urls)), -) + urlpatterns += [ + url('', include(app + '.urls')), + ] -urlpatterns += patterns( - '', (r'^ajax-select/', include(ajax_select_urls)), -) +urlpatterns += [ + url(r'^admin/', include(admin_site.urls)), + url(r'^ajax-select/', include(ajax_select_urls)), + url(r'', include('ishtar_common.urls')), + url(r'^$', index, name='start'), +] if settings.DEBUG: # static files (images, css, javascript, etc.) - urlpatterns += patterns( - '', (r'^media/(?P<path>.*)$', 'django.views.static.serve', - {'document_root': settings.MEDIA_ROOT})) + from django.views.static import serve + urlpatterns += [ + url(r'^media/(?P<path>.*)$', serve, + {'document_root': settings.MEDIA_ROOT}) + ] |