commit 4bc1e7b003784cf8700bb92a66e1c3bdbea2303d
Author: Kostas Papadimitriou <kpap@grnet.gr>
Date:   Wed Mar 7 21:02:01 2012 +0200

    Display menu and use cloudbar processor for cloudbar

diff --git a/snf-astakos-app/astakos/im/synnefo_settings.py b/snf-astakos-app/astakos/im/synnefo_settings.py
index 4fb5384..38efce5 100644
--- a/snf-astakos-app/astakos/im/synnefo_settings.py
+++ b/snf-astakos-app/astakos/im/synnefo_settings.py
@@ -53,7 +53,8 @@ context_processors = [
     'astakos.im.context_processors.im_modules',
     'astakos.im.context_processors.next',
     'astakos.im.context_processors.code',
-    'astakos.im.context_processors.invitations'
+    'astakos.im.context_processors.invitations',
+    'synnefo.lib.context_processors.cloudbar'
 ]
 
 middlware_classes = [
diff --git a/snf-astakos-app/astakos/im/templates/im/account_base.html b/snf-astakos-app/astakos/im/templates/im/account_base.html
index d651941..33b9184 100644
--- a/snf-astakos-app/astakos/im/templates/im/account_base.html
+++ b/snf-astakos-app/astakos/im/templates/im/account_base.html
@@ -3,13 +3,13 @@
 {% block page.title %}Profile{% endblock %}
 {% block page.nav.classes %}{% endblock %}
 
-{% comment %}{% block page.quicknav.items %}
+{% block page.quicknav.items %}
         <li class="{% block signup_class %}{% endblock %}">
             <a href="{% url astakos.im.views.logout %}">LOGOUT</a>
         </li>
-{% endblock %}{% endcomment %}
+{% endblock %}
 
-{% comment %}{% block page.nav.items %}
+{% block page.nav.items %}
     <li class="{% if tab == "im/profile" %}active{% endif %}">
         <a href="{% url astakos.im.views.edit_profile %}">Profile</a>
     </li>
@@ -24,7 +24,7 @@
     <li class="{% if tab == "im/feedback" %}active{% endif %}">
         <a href="{% url astakos.im.views.send_feedback %}">Send feedback</a>
     </li>
-{% endblock %}{% endcomment %}
+{% endblock %}
     
 {% block page.body %}
 <div class="maincol {% block innerpage.class %}full{% endblock %}">
diff --git a/snf-astakos-app/astakos/im/templates/im/base.html b/snf-astakos-app/astakos/im/templates/im/base.html
index bee5ea0..8fcbaa8 100644
--- a/snf-astakos-app/astakos/im/templates/im/base.html
+++ b/snf-astakos-app/astakos/im/templates/im/base.html
@@ -64,18 +64,10 @@
           $("label[for=id_recaptcha_challenge_field]").closest('.form-row').hide();
     })
   </script>
-  <script>
-    var CLOUDBAR_LOCATION = "{{ CLOUDBAR_LOC }}";
-    var CLOUDBAR_COOKIE_NAME = "{{ CLOUDBAR_COOKIE_NAME }}";
-    var CLOUDBAR_ACTIVE_SERVICE = '{{ CLOUDBAR_ACTIVE_SERVICE }}';
-    
-    var GET_SERVICES_URL = "{{ GET_SERVICES_URL }}";
-    var GET_MENU_URL = "{{ GET_MENU_URL }}";
 
-    $(document).ready(function(){
-      $.getScript(CLOUDBAR_LOCATION + 'cloudbar.js');
-    })
-  </script>
+    {% if CLOUDBAR_ACTIVE %}
+        {{ CLOUDBAR_CODE }}
+    {% endif %}
 </head>
 
 <body>
@@ -85,34 +77,28 @@
                 <h1>accounts</h1>
             </div>
             
-            <ul class="mainnav inline quicknav">
-                {% comment %}{% block page.quicknav.items %}
-                    <li class="{% block signup_class %}{% endblock %}">
-                        <a href="{% url astakos.im.views.index %}">Login</a>
-                    </li>
-                    <li class="{% block signin_class %}{% endblock %}">
-                        <a href="{% url astakos.im.views.signup %}">Sign up</a>
-                    </li>
-                {% endblock %}{% endcomment %}
-            </ul>
-
-            {% comment %}{% block page.nav %}
+            {% block page.nav %}
+            <div class="navigation">
             <ul class="mainnav inline">
                 {% block page.nav.items %}
                 {% endblock %}
             </ul>
-            {% endblock %}{% endcomment %}
+            <ul class="mainnav inline subnav">
+                {% block page.subnav %}{%endblock %}
+            </ul>
+            </div>
+            {% endblock %}
         </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="page">
-            {% if messages %}
-            <ul class="messages">
-                {% for message in messages %}
-                <li{% if message.tags %} 
-                    class="{{ message.tags }}"{% endif %}>
-                    {{ message }}</li>
-                {% endfor %}
-            </ul>
-            {% endif %}
             {% block page.body %}
                 <div class="maincol">
                     {% block body %}
diff --git a/snf-astakos-app/astakos/im/templates/im/login.html b/snf-astakos-app/astakos/im/templates/im/login.html
index d611ad2..2a1b6dc 100644
--- a/snf-astakos-app/astakos/im/templates/im/login.html
+++ b/snf-astakos-app/astakos/im/templates/im/login.html
@@ -13,6 +13,7 @@ Login
 {% endblock body %}
     
 {% block body.right %}
+<div class="section">
      {% if "local" in im_modules %}
         <form action="{% url astakos.im.target.local.login %}" method="post"
             class="login innerlabels">{% csrf_token %}
@@ -26,7 +27,7 @@ Login
         </form>
       {% endif %}
 
-          <div class="section">
+          <div class="extralogin">
               {% for o in im_modules %}
               <div>
             {% if o != 'local' %}
@@ -38,12 +39,15 @@ Login
             {% endfor %}
         </div>
         {% block body.signup %}
-        <div class="section signup">
-            <br /><br />
-                <h2>NEW TO OKEANOS ?</h2>
-                <a class="button" href="{% url astakos.im.views.signup %}">CREATE ACCOUNT</a>
+        {% for o in im_modules %}
+            {% if o != 'local' %}
+            <br />
+            {% endif %}
+        {% endfor %}
+        <div class="bottom">
+                new to okeanos ? <a href="{% url astakos.im.views.signup %}">SIGN UP</a>
             </div>
         </div>
         {% endblock %}
-
+    </div>
 {% endblock %}
