Merge branch 'master' of mmka.chem.univ.gda.pl:qcg-portal

[qcg-portal.git] / plgng / settings_common.py

diff --git a/plgng/settings_common.py b/plgng/settings_common.py
index 503c0a5..337f557 100644 (file)
--- a/plgng/settings_common.py
+++ b/plgng/settings_common.py
@@ -11,7 +11,8 @@ https://docs.djangoproject.com/en/1.7/ref/settings/
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
 
-import django.conf.global_settings as defaults
+from django.conf import global_settings
+from django.contrib.messages import constants as messages
 
 from local import *
 from settings_logging import LOGGING
@@ -31,6 +32,7 @@ INSTALLED_APPS = (
     'django.contrib.staticfiles',
     'django.contrib.webdesign',
     'qcg',
+    'filex',
     'django_openid_auth',
     'bootstrap3',
 )
@@ -45,7 +47,7 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
 
-TEMPLATE_CONTEXT_PROCESSORS = defaults.TEMPLATE_CONTEXT_PROCESSORS + (
+TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
     'django.core.context_processors.request',
 )
 
@@ -86,7 +88,7 @@ AUTHENTICATION_BACKENDS = (
     'django.contrib.auth.backends.ModelBackend',
 )
 
-LOGIN_URL = 'openid-login'
+LOGIN_URL = 'login'
 LOGIN_REDIRECT_URL = '/jobs/'
 
 # If set, always use this as the identity URL rather than asking the
@@ -105,6 +107,7 @@ OPENID_STRICT_USERNAMES = True
 
 
 SESSION_COOKIE_NAME = 'qcg_session'
+SESSION_COOKIE_AGE = 60 * 60 * 24 * 6  # 6 days, length of user proxy from openid is 1 week
 SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
 
 
@@ -115,3 +118,15 @@ BOOTSTRAP3 = {
     'horizontal_field_class': 'col-sm-9 col-md-6',
     'set_placeholder': False,
 }
+
+# map message tags to bootstrap classes
+
+MESSAGE_TAGS = {
+    messages.INFO: 'alert alert-info',
+    messages.SUCCESS: 'alert alert-success',
+    messages.WARNING: 'alert alert-warning',
+    messages.ERROR: 'alert alert-danger',
+}
+
+
+GRAPPELLI_ADMIN_TITLE = 'Portal UNRES'