Minor fixes

diff --git a/cloudcms/astakos_cms.py b/cloudcms/astakos_cms.py
deleted file mode 100644 (file)
index 84e0485..0000000
--- a/cloudcms/astakos_cms.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2012 GRNET S.A. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or
-# without modification, are permitted provided that the following
-# conditions are met:
-#
-#   1. Redistributions of source code must retain the above
-#      copyright notice, this list of conditions and the following
-#      disclaimer.
-#
-#   2. Redistributions in binary form must reproduce the above
-#      copyright notice, this list of conditions and the following
-#      disclaimer in the documentation and/or other materials
-#      provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# The views and conclusions contained in the software and
-# documentation are those of the authors and should not be
-# interpreted as representing official policies, either expressed
-# or implied, of GRNET S.A.
-
-
-from feincms.module.page.extensions.navigation import NavigationExtension, \
-        PagePretender
-from django.utils.translation import ugettext as _
-
-ASTAKOS_NAVIGATION = (
-        ('Profile', 'astakos-profile'),
-        ('Change password', 'astakos-profile')
-)
-
-class AstakosNavigationExtension(NavigationExtension):
-    name = _('astakos pages')
-
-    def children(self, page, **kwargs):
-        from django.core.urlresolvers import reverse
-        for title, url in dict(ASTAKOS_NAVIGATION).iteritems():
-            yield PagePretender(title=title, url='/im/profile')

diff --git a/conf/20-snf-cloudcms-settings.conf b/conf/20-snf-cloudcms-settings.conf
index b2d7b13..eb44d22 100644 (file)
--- a/conf/20-snf-cloudcms-settings.conf
+++ b/conf/20-snf-cloudcms-settings.conf
@@ -1,5 +1,5 @@
 # directory where cms medialibrary files are uploaded to
-FEINCMS_MEDIALIBRARY_UPLOAD_TO = '/usr/share/synnefo/static/medialibrary/'
+FEINCMS_MEDIALIBRARY_UPLOAD_TO = '/usr/share/synnefo/static/cmsuploads/'
 
 # Base url of cloudbar static files
 # If you have an astakos deployment this should be