Drop redundant horizontal menu from pages.

diff --git a/astakos/im/static/im/cloudbar/cloudbar.js b/astakos/im/static/im/cloudbar/cloudbar.js
index 4aee959..455863b 100644 (file)
--- a/astakos/im/static/im/cloudbar/cloudbar.js
+++ b/astakos/im/static/im/cloudbar/cloudbar.js
@@ -6,14 +6,15 @@ $(document).ready(function(){
 
     var PROFILE_URL = "https://accounts.cloud.grnet.gr";
     var SERVICES_LINKS = window.CLOUDBAR_SERVICES_LINKS || {
-        'cloud':   { url:'http://pithos.dev.grnet.gr/im/', name:'grnet cloud', id:'cloud', icon:'home-icon.png' },
-        'okeanos': { url:'http://staging.okeanos.grnet.gr/ui/', name:'~okeanos', id:'okeanos' },
+        'cloud':   { url:'http://pithos.dev.grnet.gr/', name:'grnet cloud', id:'cloud', icon:'home-icon.png' },
+        'okeanos': { url:'http://pithos.dev.grnet.gr/okeanos.html', name:'~okeanos', id:'okeanos' },
         'pithos':  { url:'http://pithos.dev.grnet.gr/ui/', name:'pithos+', id:'pithos' }
     };
     
     var PROFILE_LINKS = window.CLOUDBAR_PROFILE_LINKS || {
         'login': { url: '/im/login?next=' + window.location.toString(), auth:false, name: "login...", visible:false },
-        'profile': { url: '/im/profile', auth:true, name: "change your profile..." },
+        'profile': { url: '/im/profile', auth:true, name: "view your profile..." },
+        'password': { url: '/im/password', auth:true, name: "change your password..." },
         'invitations': { url: '/im/invite', auth:true, name: "invite some friends..." },
         'feedback': { url: '/im/feedback', auth:true, name: "feedback..." },
         'logout': { url: '/im/logout', auth:true, name: "logout..." }

diff --git a/astakos/im/static/im/css/styles.css b/astakos/im/static/im/css/styles.css
index f6aa3a9..8a74b08 100644 (file)
--- a/astakos/im/static/im/css/styles.css
+++ b/astakos/im/static/im/css/styles.css
@@ -478,7 +478,7 @@ a img {
 }
 .header {
   position: relative;
-  margin-top: 88px;
+  margin-top: 42px;
   margin-bottom: 22px;
 }
 .header h1 {
@@ -547,7 +547,7 @@ ul.inline li {
 .page {
   zoom: 1;
   margin-left: -22px;
-  margin-top: 132px;
+  margin-top: 42px;
   font-size: 1.1em;
 }
 .page:before, .page:after {

diff --git a/astakos/im/templates/im/account_base.html b/astakos/im/templates/im/account_base.html
index 33b9184..d651941 100644 (file)
--- a/astakos/im/templates/im/account_base.html
+++ b/astakos/im/templates/im/account_base.html
@@ -3,13 +3,13 @@
 {% block page.title %}Profile{% endblock %}
 {% block page.nav.classes %}{% endblock %}
 
-{% block page.quicknav.items %}
+{% comment %}{% block page.quicknav.items %}
         <li class="{% block signup_class %}{% endblock %}">
             <a href="{% url astakos.im.views.logout %}">LOGOUT</a>
         </li>
-{% endblock %}
+{% endblock %}{% endcomment %}
 
-{% block page.nav.items %}
+{% comment %}{% 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 %}
+{% endblock %}{% endcomment %}
     
 {% block page.body %}
 <div class="maincol {% block innerpage.class %}full{% endblock %}">

diff --git a/astakos/im/templates/im/base.html b/astakos/im/templates/im/base.html
index 3c2e73d..dfee01b 100644 (file)
--- a/astakos/im/templates/im/base.html
+++ b/astakos/im/templates/im/base.html
@@ -78,22 +78,22 @@
             </div>
             
             <ul class="mainnav inline quicknav">
-                {% block page.quicknav.items %}
+                {% 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 %}
+                {% endblock %}{% endcomment %}
             </ul>
 
-            {% block page.nav %}
+            {% comment %}{% block page.nav %}
             <ul class="mainnav inline">
                 {% block page.nav.items %}
                 {% endblock %}
             </ul>
-            {% endblock %}
+            {% endblock %}{% endcomment %}
         </div>
         <div class="page">
             {% if messages %}

diff --git a/astakos/im/templates/im/login.html b/astakos/im/templates/im/login.html
index f9bd2aa..a7aa102 100644 (file)
--- a/astakos/im/templates/im/login.html
+++ b/astakos/im/templates/im/login.html
@@ -9,7 +9,7 @@ Login
 <div class="section">
     <img class="pic" src="{{ IM_STATIC_URL }}images/pictures/login_pic.png" />
 </div>
-{% include "im/services_description.html" %}
+{% comment %}{% include "im/services_description.html" %}{% endcomment %}
 {% endblock body %}
     
 {% block body.right %}