Merge remote-tracking branch 'origin/newstyles' into newstyles

[astakos] / snf-astakos-app / astakos / im / static / im / cloudbar / cloudbar.js

diff --git a/snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js b/snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js
index b84d187..4949de1 100644 (file)
--- a/snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js
+++ b/snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js
@@ -32,7 +32,7 @@ $(document).ready(function(){
     }
 
     var root = $('body');
-    var bar = $('<div class="cloudbar"></div>');
+    var bar = $('<div class="cloudbar clearfix"></div>');
     var services = $('<ul class="services"></ul>');
     var profile = $('<div class="profile"></div>');
     
@@ -53,7 +53,7 @@ $(document).ready(function(){
             slink.attr('title', el.name);
             sli.append(slink);
             services.append(sli);
-            if (el.id == ACTIVE_MENU) {
+            if (el.id == ACTIVE_MENU || el.name == ACTIVE_MENU) {
                 sli.addClass("active");
             }
         });
@@ -69,7 +69,7 @@ $(document).ready(function(){
     $.getJSON(get_menu_url, function(data) {
         $.each(data, function(i,el) {
             if (i == 0){
-                username.text(el.name);
+                username.html('<span>'+el.name+'</span>');
                 username.attr('href', el.url);
                 user.removeClass('full');
             }else{
@@ -110,12 +110,13 @@ $(document).ready(function(){
     });*/
    $('.cloudbar .profile .full>a').live('click', function(e){
                e.preventDefault();
+        $('.cloudbar .profile ul').css('width',$('.profile').outerWidth() );
                $(this).siblings('ul').toggle();
                $(this).toggleClass('open');
+               
    });
     
-    var profileWidth = profile.outerWidth(); 
-    $('.header .profile ul').css('width',profileWidth );
+