summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-03-10 12:00:59 -0600
committerDan McGee <dan@archlinux.org>2011-03-14 08:32:54 -0500
commitc4a335d5da78ca4558cea8500ae78db9e3be74ff (patch)
tree22d9ebd5c3e90c38ef7868f96bcc8c85a8c9c065
parent16890b7d8822ae7f82852f01274b11df6aa2ef6a (diff)
Remove duplicate TEMPLATE_LOADERS config
Whoops. This has been there a while. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--settings.py31
1 files changed, 12 insertions, 19 deletions
diff --git a/settings.py b/settings.py
index 9565e6c4..1d26d9eb 100644
--- a/settings.py
+++ b/settings.py
@@ -45,13 +45,6 @@ LOGIN_REDIRECT_URL = '/'
# Set django's User stuff to use our profile model
AUTH_PROFILE_MODULE = 'main.UserProfile'
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
- 'django.template.loaders.filesystem.load_template_source',
- 'django.template.loaders.eggs.load_template_source',
- 'django.template.loaders.app_directories.load_template_source',
-)
-
# We add a processor to determine if the request is secure or not
TEMPLATE_CONTEXT_PROCESSORS = (
'django.contrib.auth.context_processors.auth',
@@ -62,6 +55,18 @@ TEMPLATE_CONTEXT_PROCESSORS = (
'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.template.loaders.filesystem.Loader',
+ 'django.template.loaders.eggs.Loader',
+ 'django.template.loaders.app_directories.Loader',
+)
+
# This bug is a real bummer:
# http://code.djangoproject.com/ticket/14105
MIDDLEWARE_CLASSES = (
@@ -78,18 +83,6 @@ MIDDLEWARE_CLASSES = (
ROOT_URLCONF = 'urls'
-TEMPLATE_DIRS = (
- # Put strings here, like "/home/html/django_templates".
- # Always use forward slashes, even on Windows.
- '%s/templates' % DEPLOY_PATH,
-)
-
-TEMPLATE_LOADERS = (
- 'django.template.loaders.filesystem.Loader',
- 'django.template.loaders.eggs.Loader',
- 'django.template.loaders.app_directories.Loader',
-)
-
# Configure where sessions and messages should reside
MESSAGE_STORAGE = 'django.contrib.messages.storage.session.SessionStorage'
SESSION_ENGINE = 'django.contrib.sessions.backends.cached_db'