diff -r 90424cb55cfe -r 4bb38d03e430 src/hdalab/settings.py --- a/src/hdalab/settings.py Thu Apr 02 03:23:59 2015 +0200 +++ b/src/hdalab/settings.py Thu Apr 02 22:52:54 2015 +0200 @@ -2,7 +2,6 @@ # Django settings for hdalab project. DEBUG = True -TEMPLATE_DEBUG = DEBUG ADMINS = ( # ('Your Name', 'your_email@example.com'), @@ -98,14 +97,35 @@ # Make this unique, and don't share it with anybody. SECRET_KEY = 'u!@fo&-)d-hqz7==jmc2*_^__wod8$k^lb7^)y@ihbok)gn4fe' -# List of callables that know how to import templates from various sources. -TEMPLATE_LOADERS = ( - ('django.template.loaders.cached.Loader', ( - 'django.template.loaders.filesystem.Loader', - 'django.template.loaders.app_directories.Loader', - )), - # 'django.template.loaders.eggs.Loader', -) + +#template settings +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [ + ], + '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.contrib.messages.context_processors.messages', + 'hdalab.context_processors.version', + ], + 'loaders': [ + ('django.template.loaders.cached.Loader', ( + 'django.template.loaders.filesystem.Loader', + 'django.template.loaders.app_directories.Loader', + )), + ], + 'debug': DEBUG, + }, + }, +] + MIDDLEWARE_CLASSES = ( 'django.contrib.sessions.middleware.SessionMiddleware', @@ -116,26 +136,9 @@ 'django.contrib.messages.middleware.MessageMiddleware', ) -# List of processors used by RequestContext to populate the context. -# Each one should be a callable that takes the request object as its -# only parameter and returns a dictionary to add to the context. -TEMPLATE_CONTEXT_PROCESSORS = ( - 'django.contrib.auth.context_processors.auth', - 'django.core.context_processors.debug', - 'django.core.context_processors.i18n', - 'django.core.context_processors.media', - 'django.core.context_processors.static', - 'django.contrib.messages.context_processors.messages', - 'hdalab.context_processors.version', -) ROOT_URLCONF = 'hdalab.urls' -TEMPLATE_DIRS = ( - # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". - # Always use forward slashes, even on Windows. - # Don't forget to use absolute paths, not relative paths. -) INSTALLED_APPS = ( 'hdalab',