diff --git a/wagtail/project_template/project_name/settings/base.py b/wagtail/project_template/project_name/settings/base.py index f56e065f6..76b44ce08 100644 --- a/wagtail/project_template/project_name/settings/base.py +++ b/wagtail/project_template/project_name/settings/base.py @@ -51,7 +51,7 @@ INSTALLED_APPS = [ 'django.contrib.staticfiles', ] -MIDDLEWARE_CLASSES = ( +MIDDLEWARE_CLASSES = [ 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', @@ -63,7 +63,7 @@ MIDDLEWARE_CLASSES = ( 'wagtail.wagtailcore.middleware.SiteMiddleware', 'wagtail.wagtailredirects.middleware.RedirectMiddleware', -) +] ROOT_URLCONF = '{{ project_name }}.urls' @@ -116,15 +116,15 @@ USE_TZ = True # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/{{ docs_version }}/howto/static-files/ -STATICFILES_FINDERS = ( +STATICFILES_FINDERS = [ 'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder', 'compressor.finders.CompressorFinder', -) +] -STATICFILES_DIRS = ( +STATICFILES_DIRS = [ os.path.join(PROJECT_DIR, 'static'), -) +] STATIC_ROOT = os.path.join(BASE_DIR, 'static') STATIC_URL = '/static/' diff --git a/wagtail/project_template/project_name/urls.py b/wagtail/project_template/project_name/urls.py index 74d55f1a2..fee79d961 100644 --- a/wagtail/project_template/project_name/urls.py +++ b/wagtail/project_template/project_name/urls.py @@ -6,6 +6,8 @@ from wagtail.wagtailadmin import urls as wagtailadmin_urls from wagtail.wagtaildocs import urls as wagtaildocs_urls from wagtail.wagtailcore import urls as wagtail_urls +from search import views as search_views + urlpatterns = [ url(r'^django-admin/', include(admin.site.urls)), @@ -13,7 +15,7 @@ urlpatterns = [ url(r'^admin/', include(wagtailadmin_urls)), url(r'^documents/', include(wagtaildocs_urls)), - url(r'^search/$', 'search.views.search', name='search'), + url(r'^search/$', search_views.search, name='search'), url(r'', include(wagtail_urls)), ] diff --git a/wagtail/project_template/requirements.txt b/wagtail/project_template/requirements.txt index 3e21b7cd1..67a7c97d0 100644 --- a/wagtail/project_template/requirements.txt +++ b/wagtail/project_template/requirements.txt @@ -1,2 +1,2 @@ -Django>=1.8,<1.9 -wagtail==1.2 +Django>=1.9,<1.10 +wagtail==1.3a1