diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js index 08a10c6bae..c1dc958d08 100644 --- a/src/sunstone/public/js/plugins/hosts-tab.js +++ b/src/sunstone/public/js/plugins/hosts-tab.js @@ -196,9 +196,7 @@ var host_actions = { call : function() { OpenNebula.Host.list({success: updateHostsView, error: onError}); OpenNebula.Cluster.list({success: updateClustersView, error: onError}); - }, - callback: function(){}, - error: onError + } }, "Cluster.create" : { diff --git a/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js index 72681e30c2..dad3ae4cb6 100644 --- a/src/sunstone/public/js/sunstone.js +++ b/src/sunstone/public/js/sunstone.js @@ -89,24 +89,6 @@ var Sunstone = { } }, - //Generates and returns the HTML div element for an info panel, with - //Jquery tabs. - "getInfoPanelHTML" : function(panel_name,selected_tab){ - var info_panel = $('
'); - var tabs = SunstoneCfg["info_panels"][panel_name]; - var tab=null; - for (tab_name in tabs){ - tab=tabs[tab_name]; - $('ul',info_panel).append('
  • '+tab.title+'
  • '); - info_panel.append('
    '+tab.content+'
    '); - } - if (selected_tab){ - return info_panel.tabs({selected: selected_tab}); - } - return info_panel.tabs({selected: 0}); - - }, - //Adds a new info panel "addInfoPanel" : function(panel_name, panel_obj){ SunstoneCfg["info_panels"][panel_name]=panel_obj; @@ -127,6 +109,24 @@ var Sunstone = { popDialog(Sunstone.getInfoPanelHTML(panel_name, selected_tab)); }, + //Generates and returns the HTML div element for an info panel, with + //Jquery tabs. + "getInfoPanelHTML" : function(panel_name,selected_tab){ + var info_panel = $('
    '); + var tabs = SunstoneCfg["info_panels"][panel_name]; + var tab=null; + for (tab_name in tabs){ + tab=tabs[tab_name]; + $('ul',info_panel).append('
  • '+tab.title+'
  • '); + info_panel.append('
    '+tab.content+'
    '); + } + if (selected_tab){ + return info_panel.tabs({selected: selected_tab}); + } + return info_panel.tabs({selected: 0}); + + }, + //adds a tab to an info panel. "addInfoPanelTab" : function(panel_name, panel_tab_id, panel_tab_obj){ SunstoneCfg["info_panels"][panel_name][panel_tab_id] = panel_tab_obj; @@ -540,7 +540,7 @@ function setupConfirmDialogs(){ //add the HTML with the standard question and buttons. $('div#confirm_dialog').html( '
    \ -
    Do you want to proceed?
    \ +
    You have to confirm this action.
    \
    \
    Do you want to proceed?
    \
    \ @@ -569,7 +569,7 @@ function setupConfirmDialogs(){ $('div#confirm_with_select_dialog').html( '\ -
    \ +
    You need to select something.
    \ \
    \