diff --git a/app/settings.py b/app/settings.py index 03be12e..7107e2a 100644 --- a/app/settings.py +++ b/app/settings.py @@ -148,44 +148,44 @@ MIDDLEWARE_CLASSES = ( 'cms.middleware.language.LanguageCookieMiddleware' ) -# TEMPLATE_CONTEXT_PROCESSORS = ( -# 'django.contrib.auth.context_processors.auth', -# 'django.contrib.messages.context_processors.messages', -# 'django.core.context_processors.i18n', -# 'django.core.context_processors.debug', -# 'django.core.context_processors.request', -# 'django.core.context_processors.media', -# 'django.core.context_processors.csrf', -# 'django.core.context_processors.tz', -# 'sekizai.context_processors.sekizai', -# 'django.core.context_processors.static', -# 'cms.context_processors.cms_settings', -# 'aldryn_boilerplates.context_processors.boilerplate', - -# ) - -TEMPLATES = [ -{ - 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'APP_DIRS': True, - 'OPTIONS': { - 'context_processors': - ( - "django.contrib.auth.context_processors.auth", - "django.template.context_processors.debug", - "django.template.context_processors.i18n", - "django.template.context_processors.media", - "django.template.context_processors.static", - "django.template.context_processors.tz", - 'django.template.context_processors.csrf', - 'django.template.context_processors.request', - "django.contrib.messages.context_processors.messages" - 'sekizai.context_processors.sekizai', - 'cms.context_processors.cms_settings' - ) - } -}, -] +TEMPLATE_CONTEXT_PROCESSORS = ( + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + 'django.core.context_processors.i18n', + 'django.core.context_processors.debug', + 'django.core.context_processors.request', + 'django.core.context_processors.media', + 'django.core.context_processors.csrf', + 'django.core.context_processors.tz', + 'sekizai.context_processors.sekizai', + 'django.core.context_processors.static', + 'cms.context_processors.cms_settings', + 'aldryn_boilerplates.context_processors.boilerplate', + +) + +# TEMPLATES = [ +# { +# 'BACKEND': 'django.template.backends.django.DjangoTemplates', +# 'APP_DIRS': True, +# 'OPTIONS': { +# 'context_processors': +# ( +# "django.contrib.auth.context_processors.auth", +# "django.template.context_processors.debug", +# "django.template.context_processors.i18n", +# "django.template.context_processors.media", +# "django.template.context_processors.static", +# "django.template.context_processors.tz", +# 'django.template.context_processors.csrf', +# 'django.template.context_processors.request', +# "django.contrib.messages.context_processors.messages" +# 'sekizai.context_processors.sekizai', +# 'cms.context_processors.cms_settings' +# ) +# } +# }, +# ] TEMPLATE_DIRS = ( os.path.join(BASE_DIR, 'zsite', 'templates'), diff --git a/requirements.txt b/requirements.txt index 16e555d..f9b6cfc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +django==1.7.8 djangocms-installer djangocms_text_ckeditor git+https://github.com/fefa4ka/aldryn-people