New setting PITHOS_UI_CLOUDBAR_ACTIVE_SERVICE

which overrides cloudbar js script ACTIVE_SERVICE setting.

diff --git a/snf-pithos-webclient/pithos_webclient/settings.py b/snf-pithos-webclient/pithos_webclient/settings.py
index 1a454e1..683ccb6 100644 (file)
--- a/snf-pithos-webclient/pithos_webclient/settings.py
+++ b/snf-pithos-webclient/pithos_webclient/settings.py
@@ -3,7 +3,11 @@ from django.conf import settings
 # !!!!!ATTENTION!!!!!
 # loginUrl MUST end at "next=". You should not give the value of the next
 # parameter. It will be determined automatically
-LOGIN_URL = getattr(settings, 'PITHOS_UI_LOGIN_URL', 'https://accounts.okeanos.grnet.gr/im/login?next=')
-FEEDBACK_URL = getattr(settings, 'PITHOS_UI_FEEDBACK_URL', 'https://accounts.okeanos.grnet.gr/im/feedback')
-AUTH_COOKIE_NAME = getattr(settings, 'PITHOS_UI_AUTH_COOKIE_NAME', '_pithos2_a')
-
+LOGIN_URL = getattr(settings, 'PITHOS_UI_LOGIN_URL',
+    'https://accounts.okeanos.grnet.gr/im/login?next=')
+FEEDBACK_URL = getattr(settings, 'PITHOS_UI_FEEDBACK_URL',
+    'https://accounts.okeanos.grnet.gr/im/feedback')
+AUTH_COOKIE_NAME = getattr(settings, 'PITHOS_UI_AUTH_COOKIE_NAME',
+    '_pithos2_a')
+CLOUDBAR_ACTIVE_SERVICE = getattr(settings, 'PITHOS_UI_CLOUDBAR_ACTIVE_SERVICE',
+    'pithos')

diff --git a/snf-pithos-webclient/pithos_webclient/views.py b/snf-pithos-webclient/pithos_webclient/views.py
index f2db004..e0d9911 100644 (file)
--- a/snf-pithos-webclient/pithos_webclient/views.py
+++ b/snf-pithos-webclient/pithos_webclient/views.py
@@ -41,5 +41,6 @@ MEDIA_URL = getattr(settings, "PITHOS_WEB_CLIENT_MEDIA_URL", \
 
 def index(request):
     return direct_to_template(request, 'pithos_webclient/index.html', \
-            {'settings': settings, 'MEDIA_URL': MEDIA_URL})
+            {'settings': settings, 'MEDIA_URL': MEDIA_URL,
+             'PITHOS_UI_CLOUDBAR_ACTIVE_SERVICE': settings.CLOUDBAR_ACTIVE_SERVICE})
 

diff --git a/snf-pithos-webclient/setup.py b/snf-pithos-webclient/setup.py
index 9c6c9d8..f08248d 100644 (file)
--- a/snf-pithos-webclient/setup.py
+++ b/snf-pithos-webclient/setup.py
@@ -248,6 +248,13 @@ def build_gwt(root="../", public_dir="bin/www/gr.grnet.pithos.web.Pithos/"):
     index_data = index_data.replace('\' src=\'', '\' src=\'{{ MEDIA_URL }}pithos_webclient/')
     index_data = index_data.replace('url(', 'url({{ MEDIA_URL }}pithos_webclient/')
 
+    index_data = index_data.replace("{{ CLOUDBAR_CODE }}", """
+            {{ CLOUDBAR_CODE }}
+            <script>
+            var CLOUDBAR_ACTIVE_SERVICE = "{{ PITHOS_UI_CLOUDBAR_ACTIVE_SERVICE }}"
+            </script>
+    """)
+
     ifile = file(index, "w+")
     ifile.write(index_data)
     ifile.close()