Merge branch 'newstyles' of https://code.grnet.gr/git/snf-cloudcms into newstyles

[snf-cloudcms] / cloudcms / synnefo_settings.py

diff --git a/cloudcms/synnefo_settings.py b/cloudcms/synnefo_settings.py
index 213fe9a..66a7e9e 100644 (file)
--- a/cloudcms/synnefo_settings.py
+++ b/cloudcms/synnefo_settings.py
@@ -35,7 +35,7 @@
 cloudcms_apps = [
     'cloudcms',
     'cloudcmsblog',
 cloudcms_apps = [
     'cloudcms',
     'cloudcmsblog',

-    #'cloudcmsfiles',
+    'cloudcmsresources',

     'pagination',
 
     'django.contrib.auth',
     'pagination',
 
     'django.contrib.auth',

@@ -63,15 +63,17 @@ cloudcms_middlewares = [
 ]
 cloudcms_staticfiles = {
         'cloudcms': '',
 ]
 cloudcms_staticfiles = {
         'cloudcms': '',

+        'cloudcmsresources': '',

         'feincms': '',
         'feincms': '',

-        #'django.contrib.admin': ('media', 'djangoadminstatic'),
+        'django.contrib.admin': ('media', 'admin_media'),

 }
 }

+

 cloudcms_context_processors = [
     'cloudcms.context_processors.application',
     'synnefo.lib.context_processors.cloudbar'
 ]
 
 cloudcms_context_processors = [
     'cloudcms.context_processors.application',
     'synnefo.lib.context_processors.cloudbar'
 ]
 

-#ADMIN_MEDIA_PREFIX = '/static/djangoadminstatic/'
+ADMIN_MEDIA_PREFIX = '/static/admin_media/'

 
 # Required additions in Django project settings
 
 
 # Required additions in Django project settings