diff options
author | coderick14 | 2017-05-17 15:40:18 +0530 |
---|---|---|
committer | coderick14 | 2017-05-17 15:41:00 +0530 |
commit | fe407193c200e03070928c1e2c1a6e067d32893d (patch) | |
tree | 1c492aa814754b5db5d644c769f5382306217298 /sbhs_server/settings.py | |
parent | 9a1393e8470d855762e699abca9911b9cdae6a7d (diff) | |
download | SBHS-2018-Rpi-fe407193c200e03070928c1e2c1a6e067d32893d.tar.gz SBHS-2018-Rpi-fe407193c200e03070928c1e2c1a6e067d32893d.tar.bz2 SBHS-2018-Rpi-fe407193c200e03070928c1e2c1a6e067d32893d.zip |
Upgrade to Django 1.11
- Database integration yet to be tested
Diffstat (limited to 'sbhs_server/settings.py')
-rw-r--r-- | sbhs_server/settings.py | 41 |
1 files changed, 29 insertions, 12 deletions
diff --git a/sbhs_server/settings.py b/sbhs_server/settings.py index 3782f7f..b690e83 100644 --- a/sbhs_server/settings.py +++ b/sbhs_server/settings.py @@ -49,19 +49,19 @@ INSTALLED_APPS = ( 'django.contrib.messages', 'django.contrib.staticfiles', - 'south', + #'south', 'undelete', #'yaksh', 'taggit', - 'sbhs_server.account', - 'sbhs_server.admin', - 'sbhs_server.experiment', - 'sbhs_server.pages', - 'sbhs_server.password', - 'sbhs_server.slot', + 'account', + 'myadmin', + 'experiment', + 'pages', + 'password', + 'slot', 'sbhs_server.tables', - 'sbhs_server.webcam', + 'webcam', ) MIDDLEWARE_CLASSES = ( @@ -149,10 +149,27 @@ if is_production: else: STATIC_URL = '/static/' -TEMPLATE_DIRS = ( - os.path.join(BASE_DIR, 'templates/'), -) - +# TEMPLATE_DIRS = ( +# os.path.join(BASE_DIR, 'pages/templates/'), +# ) + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [ + os.path.join(BASE_DIR, 'templates'), + ], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] import warnings warnings.filterwarnings( |