diff --git a/demo/settings.py b/demo/settings.py index f6885ff..61d0b14 100644 --- a/demo/settings.py +++ b/demo/settings.py @@ -124,7 +124,7 @@ "django.template.context_processors.static", "django.template.context_processors.tz", "django.contrib.messages.context_processors.messages", - 'django.core.context_processors.request', + "django.template.context_processors.request", ] } }, diff --git a/demo/urls.py b/demo/urls.py index 721b0a2..eb5aa7c 100644 --- a/demo/urls.py +++ b/demo/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import patterns, include, url +from django.conf.urls import include, url from django.conf.urls.static import static from django.conf import settings from django.contrib import admin @@ -13,18 +13,18 @@ wagtailsearch_register_signal_handlers() -urlpatterns = patterns('', +urlpatterns = [ url(r'^blog/', include('blog.urls', namespace="blog")), url(r'^django-admin/', include(admin.site.urls)), url(r'^admin/', include(wagtailadmin_urls)), url(r'^comments/', include('django_comments_xtd.urls')), url(r'', include(wagtail_urls)), -) +] if settings.DEBUG: from django.contrib.staticfiles.urls import staticfiles_urlpatterns urlpatterns += staticfiles_urlpatterns() urlpatterns += static(settings.MEDIA_URL + 'images/', document_root=os.path.join(settings.MEDIA_ROOT, 'images')) - urlpatterns += patterns('', + urlpatterns += [ (r'^favicon\.ico$', RedirectView.as_view(url=settings.STATIC_URL + 'demo/images/favicon.ico')) - ) + ]