Include auth context processor for snf-webproject

[snf-cloudcms] / cloudcms / synnefo_settings.py

diff --git a/cloudcms/synnefo_settings.py b/cloudcms/synnefo_settings.py
index b559bfe..fac7f0f 100644 (file)
--- a/cloudcms/synnefo_settings.py
+++ b/cloudcms/synnefo_settings.py
@@ -32,10 +32,11 @@
 # or implied, of GRNET S.A.
 
 
-CLOUDCMS_APPS = [
+cloudcms_apps = [
     'cloudcms',
     'cloudcmsblog',
-    #'cloudcmsfiles',
+    'cloudcmsfaq',
+    'cloudcmsresources',
     'pagination',
 
     'django.contrib.auth',
@@ -53,7 +54,7 @@ CLOUDCMS_APPS = [
     'feincms.module.page',
     'feincms.module.medialibrary',
 ]
-CLOUDCMS_MIDDLEWARES = [
+cloudcms_middlewares = [
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
@@ -61,15 +62,20 @@ CLOUDCMS_MIDDLEWARES = [
     'pagination.middleware.PaginationMiddleware',
     'cloudcms.middleware.RequestMessagesMiddleware'
 ]
-CLOUDCMS_STATICFILES = {
+cloudcms_staticfiles = {
         'cloudcms': '',
-        'feincms': ''
+        'cloudcmsresources': '',
+        'feincms': '',
+        'django.contrib.admin': ('media', 'admin_media'),
 }
-CLOUDCMS_CONTEXT_PROCESSORS = [
+
+cloudcms_context_processors = [
+    'django.contrib.auth.context_processors.auth',
     'cloudcms.context_processors.application',
     'synnefo.lib.context_processors.cloudbar'
 ]
 
+ADMIN_MEDIA_PREFIX = '/static/admin_media/'
 
 # Required additions in Django project settings
 
@@ -81,12 +87,14 @@ try:
         # uses the app names
         SOUTH_MIGRATION_MODULES = {
             'cloudcmsblog': 'cloudcms.migrate.cloudcmsblog',
+            'cloudcmsfaq': 'cloudcms.migrate.cloudcmsfaq',
             'feincms.module.page': 'cloudcms.migrate.page',
             'feincms.module.medialibrary': 'cloudcms.migrate.medialibrary',
         }
     else:
         SOUTH_MIGRATION_MODULES = {
             'cloudcmsblog': 'cloudcms.migrate.cloudcmsblog',
+            'cloudcmsfaq': 'cloudcms.migrate.cloudcmsfaq',
             'page': 'cloudcms.migrate.page',
             'medialibrary': 'cloudcms.migrate.medialibrary',
         }
@@ -94,8 +102,6 @@ except:
     pass
 
 
-CLOUDBAR_URL = '/static/im/cloudbar/cloudbar.js'
-CLOUDBAR_ACTIVE_SERVICE = 'okeanos_cms'
-
 import os
 SITE_ID = int(os.environ.get('CLOUDCMS_SITE_ID', 1))
+