diff options
Diffstat (limited to 'settings.py')
| -rw-r--r-- | settings.py | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/settings.py b/settings.py index 8068a89..8f71885 100644 --- a/settings.py +++ b/settings.py @@ -5,7 +5,6 @@ import os from version import VERSION DEBUG = True -TEMPLATE_DEBUG = DEBUG PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__)) ROOT_DIR = os.path.split(PROJECT_ROOT)[-1] @@ -89,13 +88,6 @@ STATICFILES_FINDERS = ( # 'django.contrib.staticfiles.finders.DefaultStorageFinder', ) -# List of callables that know how to import templates from various sources. -TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.Loader', - 'django.template.loaders.app_directories.Loader', - # 'django.template.loaders.eggs.Loader', -) - MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', @@ -107,9 +99,26 @@ MIDDLEWARE_CLASSES = ( ROOT_URLCONF = 'urls' -TEMPLATE_DIRS = ( - os.path.join(PROJECT_ROOT, "templates"), -) +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [ + os.path.join(PROJECT_ROOT, "templates"), + ], + 'APP_DIRS': False, + 'OPTIONS': { + 'context_processors': [ + 'django.contrib.messages.context_processors.messages', + 'django.contrib.auth.context_processors.auth', + 'license_protected_downloads.context_processors.llp_common', + ], + 'loaders': [ + 'django.template.loaders.filesystem.Loader', + 'django.template.loaders.app_directories.Loader', + ] + }, + }, +] INSTALLED_APPS = ( 'django.contrib.auth', @@ -225,12 +234,6 @@ else: SERVED_PATHS = [os.path.join(PROJECT_ROOT, "sampleroot")] UPLOAD_PATH = os.path.join(PROJECT_ROOT, "sample_upload_root") -TEMPLATE_CONTEXT_PROCESSORS = ( - 'django.contrib.messages.context_processors.messages', - 'django.contrib.auth.context_processors.auth', - 'license_protected_downloads.context_processors.llp_common', -) - # Render TEXTILE files settings. LINUX_FILES = ('README.textile', 'INSTALL.textile', |