Merge branch 'feature-newstyles' into release-0.13

Conflicts:
	cloudcms/templates/cms/base.html

diff --git a/Changelog b/Changelog
index 4d2a680..ec1c7b5 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,7 +1,25 @@
 Changelog
 =========
 
-v0.11.0
+v0.7.3
+------
+
+* Proper display of user action messages
+
+
+v0.7.2
+------
+
+* Change googleapi fonts to use https protocol
+
+
+v0.7.1
+------
+
+* Updated styles
+
+
+v0.7.0
 -------
 
 * Userguide application

diff --git a/cloudcms/templates/cms/base.html b/cloudcms/templates/cms/base.html
index 34961fe..c1ae4e6 100644 (file)
--- a/cloudcms/templates/cms/base.html
+++ b/cloudcms/templates/cms/base.html
@@ -28,7 +28,6 @@
   {% endblock css %}
 
   {% block headjs %}
-     
       <script src="{{ MEDIA_URL }}cloudcms/js/jquery-1.7.1.min.js"></script>
       <script src="{{ MEDIA_URL }}cloudcms/js/underscore.js"></script>
       <script src="{{ MEDIA_URL }}cloudcms/js/jquery.infieldlabel.js"></script>
@@ -84,6 +83,15 @@
             </div>
           </div>
           {% endif %}
+                 {% if messages %}
+                 <ul class="messages">
+                         {% for message in messages %}
+                         <li{% if message.tags %}
+                             class="{{ message.tags }}"{% endif %}>
+                             {{ message }}</li>
+                         {% endfor %}
+                 </ul>
+                 {% endif %}
                <div class="mainlogo">
                        {% if APP.logo %}
                                <h1>
@@ -123,16 +131,6 @@
                </div>
            </div>    
     </div>
-    {% if messages %}
-    <ul class="messages">
-        {% for message in messages %}
-        <li{% if message.tags %}
-            class="{{ message.tags }}"{% endif %}>
-            {{ message }}</li>
-        {% endfor %}
-    </ul>
-    {% endif %}
-    
     
     <div class="footer">
         <div class="wrapper">

diff --git a/cloudcms/tests/__init__.py b/cloudcms/tests/__init__.py
index b0b4a1f..8c938fa 100644 (file)
--- a/cloudcms/tests/__init__.py
+++ b/cloudcms/tests/__init__.py
@@ -35,24 +35,18 @@
 import os
 import tempfile
 
-from django.test import TestCase, TransactionTestCase
+from django.test import TransactionTestCase
 from django.contrib.auth.models import User
 from django.core.files.uploadedfile import SimpleUploadedFile
 
-from feincms.module.medialibrary.models import Category as MediaCategory, \
-        MediaFile
+from feincms.module.medialibrary.models import MediaFile
 
 from cloudcmsguide.models import UserGuideEntry
-from cloudcmsfaq.models import Category, Question
-from cloudcms.rstutils import generate_rst_contents_from_dir
-from cloudcms.models import Service, ServiceTranslation
+from cloudcmsfaq.models import Question
 from cloudcms.forms import RstZipImportForm
 
-from synnefo.lib.log import initialize_logging
-
 from django.conf import settings
 
-initialize_logging()
 
 TESTS_BASE = os.path.abspath(os.path.dirname(__file__))
 
@@ -65,20 +59,23 @@ TEST_VALID_ZIP = os.path.join(TESTS_BASE, 'userdocs1.zip')
 
 settings.MEDIA_ROOT = tempfile.mkdtemp("cms-tests")
 
+
 class TestSphinxImport(TransactionTestCase):
 
     fixtures = ['cloudcms_media_categories', 'cloudcms_default_services']
 
     def setUp(self):
-        c = Category.objects.create()
-        self.user = User.objects.create(username="admin", email="admin@admin.com")
+        self.user = User.objects.create(username="admin",
+                                        email="admin@admin.com")
         self.user.is_superuser = True
         self.user.set_password("test")
         self.user.save()
 
     def test_from_dir1(self):
         zipfile = SimpleUploadedFile('file.zip', file(TEST_VALID_ZIP).read())
-        form = RstZipImportForm({'import_categories': ['faqs', 'guide']}, files={'import_file': zipfile})
+        form = RstZipImportForm({
+            'import_categories': ['faqs', 'guide']
+        }, files={'import_file': zipfile})
         form.is_valid()
         success, log = form.save(self.user, TEST_DIR1)
 
@@ -89,15 +86,18 @@ class TestSphinxImport(TransactionTestCase):
 
     def test_form(self):
         zipfile = SimpleUploadedFile('file.zip', file(TEST_INVALID_ZIP).read())
-        form = RstZipImportForm({'import_categories': ['faqs', 'guide']}, files={'import_file': zipfile})
+        form = RstZipImportForm({
+            'import_categories': ['faqs', 'guide']},
+            files={'import_file': zipfile})
         self.assertEqual(form.is_valid(), False)
 
         zipfile = SimpleUploadedFile('file.zip', file(TEST_VALID_ZIP).read())
-        form = RstZipImportForm({'import_categories': ['faqs', 'guide']}, files={'import_file': zipfile})
+        form = RstZipImportForm({
+            'import_categories': ['faqs', 'guide']},
+            files={'import_file': zipfile})
         self.assertEqual(form.is_valid(), True)
 
         form.save(self.user)
-        self.assertEqual(MediaFile.objects.all().count(), 5)
+        self.assertEqual(MediaFile.objects.all().count(), 3)
         self.assertEqual(Question.objects.all().count(), 4)
         self.assertEqual(UserGuideEntry.objects.all().count(), 3)
-

diff --git a/devflow.conf b/devflow.conf
new file mode 100644 (file)
index 0000000..220c3dd
--- /dev/null
+++ b/devflow.conf
@@ -0,0 +1,3 @@
+[ packages ]
+  [[ snf-cloudcms ]]
+    version_file = "cloudcms/version.py"

diff --git a/docs/source/index.rst b/docs/source/index.rst
index 2135ebe..880b234 100644 (file)
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -92,7 +92,7 @@ fixtures file ``mysites.json`` containing the following::
                 "domain": "okeanos.grnet.gr", 
                 "name": "okeanos.grnet.gr"
             }
-        }, 
+        }
     ]
 
 and load the fixtures in your db using:: 

diff --git a/setup.py b/setup.py
index b064362..70d723b 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -39,14 +39,6 @@ from fnmatch import fnmatchcase
 from distutils.util import convert_path
 from setuptools import setup, find_packages
 
-HERE = os.path.abspath(os.path.normpath(os.path.dirname(__file__)))
-try:
-    # try to update the version file
-    from synnefo.util import version
-    version.update_version('cloudcms', 'version', HERE)
-except ImportError:
-    pass
-
 from cloudcms.version import __version__
 
 # Package info

diff --git a/version b/version
new file mode 100644 (file)
index 0000000..124b455
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
+0.13rc1\r
\ No newline at end of file