diff --git a/src/sunstone/public/app/sunstone.js b/src/sunstone/public/app/sunstone.js index 2553bb69db..6926e5f452 100644 --- a/src/sunstone/public/app/sunstone.js +++ b/src/sunstone/public/app/sunstone.js @@ -36,7 +36,7 @@ define(function(require) { for (tabName in SunstoneCfg["tabs"]) { _insertTab(tabName); _insertButtonsInTab(tabName); - _initializeDataTable(tabName); + _setupDataTable(tabName); // TODO Add openenbula actions /*if (config['view']['autorefresh']) { @@ -53,7 +53,7 @@ define(function(require) { _setupTabs(); } - var _initializeDataTable = function(tabName) { + var _setupDataTable = function(tabName) { if (SunstoneCfg['tabs'][tabName].dataTable) { SunstoneCfg['tabs'][tabName].dataTable.initialize(); } @@ -362,7 +362,7 @@ define(function(require) { return false; } else { var tabName = $(this).attr('id').substring(3); - showTab(tabName); + _showTab(tabName); return false; } }); @@ -376,7 +376,7 @@ define(function(require) { subtabs.fadeToggle('fast'); return false; } else { - showTab(tabName); + _showTab(tabName); return false; } }); @@ -384,7 +384,33 @@ define(function(require) { _setupButtons(); }; - var showTab = function(tabName) { + var _showRighList = function(tabName){ + var tab = $('#' + tabName); + $(".tab").hide(); + tab.show(); + + $(".right-info", tab).hide(); + $(".right-form", tab).hide(); + $(".right-list", tab).show(); + $(".only-right-info", tab).hide(); + $(".only-right-form", tab).hide(); + $(".only-right-list", tab).show(); + }; + + var _showRighInfo = function(tabName){ + var tab = $('#' + tabName); + $(".tab").hide(); + tab.show(); + + $(".right-list", tab).hide(); + $(".right-form", tab).hide(); + $(".right-info", tab).show(); + $(".only-right-list", tab).hide(); + $(".only-right-form", tab).hide(); + $(".only-right-info", tab).show(); + } + + var _showTab = function(tabName) { if (!SunstoneCfg['tabs'][tabName]) { return false; } @@ -398,69 +424,38 @@ define(function(require) { //clean selected menu $("#navigation li").removeClass("navigation-active-li"); - - //select tab in left menu - var li = $("#navigation li#li_" + tabName) - li.addClass("navigation-active-li"); + $("#navigation li#li_" + tabName).addClass("navigation-active-li"); var tab = $('#' + tabName); //show tab - $(".tab").hide(); - tab.show(); - $(".right-info", tab).hide(); - $(".right-form", tab).hide(); - $(".right-list", tab).show(); - $(".only-right-info", tab).hide(); - $(".only-right-form", tab).hide(); - $(".only-right-list", tab).show(); + _showRighList(tabName); // TODO Add recountCheckboxes //recountCheckboxes($(".dataTable", tab).first()); - // TODO Add opennebula.js - /*var res = SunstoneCfg['tabs'][activeTab]['resource'] + var res = SunstoneCfg['tabs'][tabName]['resource'] if (res) { Sunstone.runAction(res + ".list"); - } else { - var action = activeTab + ".refresh"; - - if (SunstoneCfg["actions"][action]) { - Sunstone.runAction(action); - } - }*/ + } } var _showElement = function(tabName, infoAction, elementId) { - showTab(tabName); + _showTab(tabName); var context = $('#' + tabName); $(".resource-id", context).html(elementId); $(".resource-info-header", context).text(""); - _popDialogLoading(context); + var loading = '

