diff --git a/src/sunstone/public/app/app.js b/src/sunstone/public/app/app.js
index fe02550d4c..e981abc6f5 100644
--- a/src/sunstone/public/app/app.js
+++ b/src/sunstone/public/app/app.js
@@ -2,7 +2,10 @@ define(function(require) {
require('jquery');
var DASHBOARD_TAB_ID = require('tabs/dashboard-tab/tabId');
+ var SETTINGS_TAB_ID = require('tabs/settings-tab/tabId');
var Sunstone = require('sunstone');
+ var OpenNebula = require('opennebula');
+ var Notifier = require('utils/notifier');
var _tabs = [
require('tabs/dashboard-tab'),
@@ -45,13 +48,14 @@ define(function(require) {
Sunstone.insertTabs();
_setupAccordion();
+ _insertUserAndZoneSelector();
Sunstone.showTab(DASHBOARD_TAB_ID);
});
function _setupAccordion() {
$(document).on("click", ".accordion_advanced > a", function() {
- if ($(this).hasClass("active")){
+ if ($(this).hasClass("active")) {
$(this).removeClass("active");
} else {
$(this).addClass("active");
@@ -62,4 +66,71 @@ define(function(require) {
return false;
})
}
+
+ function _insertUserAndZoneSelector() {
+ var user_login_content = '\
+ ' + config['display_name'] + '\
+
\
+ \
+ ' + config['zone_name'] + '\
+ ';
+
+ $(".user-zone-info").html(user_login_content);
+
+ function zoneRefresh() {
+ // Populate Zones dropdown
+ OpenNebula.Zone.list({
+ timeout: true,
+ success: function (request, obj_list) {
+ $('.zone-ul').empty();
+ $.each(obj_list, function() {
+ $('.zone-ul').append('' + this.ZONE.NAME + '');
+ });
+ },
+ error: Notifier.onError
+ });
+ }
+
+ $('#zonelector').on("click", function() {
+ zoneRefresh();
+ });
+
+ $('a.zone-choice').on("click", function() {
+ $.ajax({
+ url: 'config',
+ type: "GET",
+ headers: {
+ "ZONE_NAME" : this.id
+ },
+ dataType: "json",
+ success: function() {
+ window.location.href = ".";
+ },
+ error: function(response) {
+ Notifier.onError(null, OpenNebula.Error(response))
+ }
+ });
+ });
+
+ $(".user-zone-info").foundation('reflow', 'dropdown');
+
+ $("a.logout", $(".user-zone-info ")).click(function() {
+ OpenNebula.Auth.logout({
+ success: function() {
+ window.location.href = "login";
+ },
+ error: Notifier.onError
+ });
+
+ return false;
+ });
+
+ $(".user-zone-info a.configuration").click(function() {
+ $(document).foundation('dropdown', 'closeall');
+ Sunstone.showTab(SETTINGS_TAB_ID);
+ });
+ }
});
diff --git a/src/sunstone/public/app/opennebula/auth.js b/src/sunstone/public/app/opennebula/auth.js
index 6970c14db1..955b832b4c 100644
--- a/src/sunstone/public/app/opennebula/auth.js
+++ b/src/sunstone/public/app/opennebula/auth.js
@@ -49,7 +49,7 @@ define(function(require) {
url: "logout",
type: "POST",
success: function(response) {
- $.cookie("one-user", null);
+ // TODO $.cookie("one-user", null);
return callback ? callback(request, response) : null;
},
error: function(response) {