diff options
| author | Jelle van der Waa <jelle@vdwaa.nl> | 2016-10-19 22:11:51 +0200 |
|---|---|---|
| committer | Jelle van der Waa <jelle@vdwaa.nl> | 2017-05-02 21:13:56 +0200 |
| commit | 2971c0e576054fbd92d45f6ca00aca3e6a13e894 (patch) | |
| tree | 9730c39fb9945b6e409f117955c2f17f64dbe98f /settings.py | |
| parent | aed90d52e36a280264b11a8e8960e4348d5d36fb (diff) | |
| download | archweb-2971c0e576054fbd92d45f6ca00aca3e6a13e894.tar.gz archweb-2971c0e576054fbd92d45f6ca00aca3e6a13e894.zip | |
Cleanup remove old TEMPLATE_ stuff
Diffstat (limited to 'settings.py')
| -rw-r--r-- | settings.py | 48 |
1 files changed, 10 insertions, 38 deletions
diff --git a/settings.py b/settings.py index 2f775f56..47962d95 100644 --- a/settings.py +++ b/settings.py @@ -48,59 +48,31 @@ AUTH_PROFILE_MODULE = 'devel.UserProfile' from os import path TEMPLATES = [ { - 'BACKEND': 'django.template.backends.django.DjangoTemplates', - #'DIRS': ['%s/templates' % DEPLOY_PATH], - 'DIRS' : [ - path.join(DEPLOY_PATH, 'templates') - ], + 'BACKEND': 'django_jinja.backend.Jinja2', 'APP_DIRS': True, + 'DIRS': [ + path.join(DEPLOY_PATH, 'templates/jinja') + ], 'OPTIONS': { - 'context_processors': [ - 'django.contrib.auth.context_processors.auth', - 'django.core.context_processors.debug', - 'django.contrib.messages.context_processors.messages', - 'main.context_processors.secure', - ], + 'match_extension': '.jinja' } }, { - 'BACKEND': 'django_jinja.backend.Jinja2', - 'APP_DIRS': True, - 'DIRS' : [ + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [ path.join(DEPLOY_PATH, 'templates') - ], + ], + 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ 'django.contrib.auth.context_processors.auth', 'django.core.context_processors.debug', 'django.contrib.messages.context_processors.messages', 'main.context_processors.secure', - ], - 'match_extension': '.jinja' + ] } } ] -# We add a processor to determine if the request is secure or not -#TEMPLATE_CONTEXT_PROCESSORS = ( -# 'django.contrib.auth.context_processors.auth', -# 'django.core.context_processors.debug', -# 'django.contrib.messages.context_processors.messages', -# 'main.context_processors.secure', -#) - -#TEMPLATE_DIRS = ( - # Put strings here, like "/home/html/django_templates". - # Always use forward slashes, even on Windows. -# '%s/templates' % DEPLOY_PATH, -#) - -#TEMPLATE_LOADERS = ( -# 'django_jinja.loaders.FileSystemLoader', -# 'django_jinja.loaders.AppLoader', -#) - -# Send templates matching the following to the Jinja2 engine -#DEFAULT_JINJA2_TEMPLATE_EXTENSION = '.jinja' MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware', |