1 files changed, 30 insertions, 23 deletions
diff --git a/example_project/urls.py b/example_project/urls.py
index 62a6b1e04..79645b8ae 100644
--- a/example_project/urls.py
+++ b/example_project/urls.py
@@ -1,38 +1,45 @@
 from django.conf import settings
-from django.conf.urls.defaults import *
+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()
-# admin.site.unregister(User)
 
 
-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 += [
+        url('', include(app + '.urls')),
+    ]
 
-urlpatterns += patterns(
-    'ishtar_common.views', url(r'^$', 'index', name='start'),
-)
-
-urlpatterns += patterns(
-    '', (r'^admin/', include(admin.site.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.conf.urls.static import static
+    from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+    urlpatterns += staticfiles_urlpatterns()
+    urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+
+if settings.DEBUG_TOOLBAR:
+    import debug_toolbar
+    urlpatterns = [
+        url(r'^__debug__/', include(debug_toolbar.urls)),
+    ] + urlpatterns
+