Update synnefo entry_points and default settings

diff --git a/cloudcms/synnefo_settings.py b/cloudcms/synnefo_settings.py
index aa39161..b616d25 100644 (file)
--- a/cloudcms/synnefo_settings.py
+++ b/cloudcms/synnefo_settings.py
@@ -32,7 +32,7 @@
 # or implied, of GRNET S.A.
 
 
-CLOUDCMS_APPS = [
+cloudcms_apps = [
     'cloudcms',
     'cloudcmsblog',
     #'cloudcmsfiles',
@@ -53,7 +53,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 +61,17 @@ CLOUDCMS_MIDDLEWARES = [
     'pagination.middleware.PaginationMiddleware',
     'cloudcms.middleware.RequestMessagesMiddleware'
 ]
-CLOUDCMS_STATICFILES = {
+cloudcms_staticfiles = {
         'cloudcms': '',
-        'feincms': ''
+        'feincms': '',
+        'django.contrib.admin': ('media', 'djangoadminstatic'),
 }
-CLOUDCMS_CONTEXT_PROCESSORS = [
+cloudcms_context_processors = [
     'cloudcms.context_processors.application',
     'synnefo.lib.context_processors.cloudbar'
 ]
 
+ADMIN_MEDIA_PREFIX = '/static/djangoadminstatic/'
 
 # Required additions in Django project settings
 

diff --git a/conf/20-snf-cloudcms-settings.conf b/conf/20-snf-cloudcms-settings.conf
index e0058d9..1c8cb0c 100644 (file)
--- a/conf/20-snf-cloudcms-settings.conf
+++ b/conf/20-snf-cloudcms-settings.conf
@@ -4,3 +4,5 @@ CLOUDCMSBLOG_ENTRIES_PER_PAGE = 5
 # directory where cms medialibrary files are uploaded to
 #FEINCMS_MEDIALIBRARY_UPLOAD_TO = '/usr/share/synnefo/static/medialibrary/'
 
+# django admin specific settings
+# ADMIN_MEDIA_PREFIX = '/static/djangoadminstatic/'

diff --git a/setup.py b/setup.py
index d7c6e31..9562842 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -54,7 +54,7 @@ VERSION = __version__
 
 
 INSTALL_REQUIRES = [
-    'snf-common>=0.9.0rc',
+    'snf-common>=0.9.3',
     'Django >=1.2.3, <1.3',
     'South>=0.7',
     'feincms >=1.4.2, < 1.5',
@@ -172,11 +172,11 @@ setup(
     entry_points = {
      'synnefo': [
          'default_settings = cloudcms.synnefo_settings',
-         'web_apps = cloudcms.synnefo_settings:CLOUDCMS_APPS',
-         'web_middleware = cloudcms.synnefo_settings:CLOUDCMS_MIDDLEWARES',
-         'web_context_processors = cloudcms.synnefo_settings:CLOUDCMS_CONTEXT_PROCESSORS',
+         'web_apps = cloudcms.synnefo_settings:cloudcms_apps',
+         'web_middleware = cloudcms.synnefo_settings:cloudcms_middlewares',
+         'web_context_processors = cloudcms.synnefo_settings:cloudcms_context_processors',
          'urls = cloudcms.urls:urlpatterns',
-         'web_static = cloudcms.synnefo_settings:CLOUDCMS_STATICFILES'
+         'web_static = cloudcms.synnefo_settings:cloudcms_staticfiles'
          ]
     },