diff --git a/src/sunstone/public/js/plugins/clusters-tab.js b/src/sunstone/public/js/plugins/clusters-tab.js index 2c7c672b9e..af1cf251ea 100644 --- a/src/sunstone/public/js/plugins/clusters-tab.js +++ b/src/sunstone/public/js/plugins/clusters-tab.js @@ -1425,6 +1425,11 @@ function updateClusterInfo(request,cluster){ Sunstone.popUpInfoPanel("cluster_info_panel", "clusters-tab"); + $("#cluster_info_panel_refresh", $("#cluster_info_panel")).click(function(){ + $(this).html(spinner); + Sunstone.runAction('Cluster.showinfo', cluster_info.ID); + }) + // Hosts datatable dataTable_cluster_hosts_panel = $("#datatable_cluster_hosts_info_panel").dataTable({ diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js index 2b8a8fab36..7681fb4468 100644 --- a/src/sunstone/public/js/plugins/datastores-tab.js +++ b/src/sunstone/public/js/plugins/datastores-tab.js @@ -756,6 +756,13 @@ function updateDatastoreInfo(request,ds){ Sunstone.updateInfoPanelTab("datastore_info_panel","datastore_image_tab",datastore_info_tab); Sunstone.popUpInfoPanel("datastore_info_panel", "datastores-tab"); + + + $("#datastore_info_panel_refresh", $("#datastore_info_panel")).click(function(){ + $(this).html(spinner); + Sunstone.runAction('Datastore.showinfo', info.ID); + }) + // Define datatables // Images datatable diff --git a/src/sunstone/public/js/plugins/files-tab.js b/src/sunstone/public/js/plugins/files-tab.js index 417e2ea4dd..553c452b39 100644 --- a/src/sunstone/public/js/plugins/files-tab.js +++ b/src/sunstone/public/js/plugins/files-tab.js @@ -642,6 +642,11 @@ function updateFileInfo(request,img){ Sunstone.updateInfoPanelTab("file_info_panel","file_info_tab",info_tab); Sunstone.popUpInfoPanel("file_info_panel", "files-tab"); + $("#file_info_panel_refresh", $("#file_info_panel")).click(function(){ + $(this).html(spinner); + Sunstone.runAction('File.showinfo', img_info.ID); + }) + setPermissionsTable(img_info,''); } diff --git a/src/sunstone/public/js/plugins/groups-tab.js b/src/sunstone/public/js/plugins/groups-tab.js index f454e3d867..e86503a98f 100644 --- a/src/sunstone/public/js/plugins/groups-tab.js +++ b/src/sunstone/public/js/plugins/groups-tab.js @@ -561,8 +561,14 @@ function updateGroupInfo(request,group){ Sunstone.updateInfoPanelTab("group_info_panel","group_quotas_tab",quotas_tab); Sunstone.popUpInfoPanel("group_info_panel", 'groups-tab'); + + $("#group_info_panel_refresh", $("#group_info_panel")).click(function(){ + $(this).html(spinner); + Sunstone.runAction('Group.showinfo', info.ID); + }) + //preload acct - loadAccounting('Group', info.ID, group_acct_graphs); + //loadAccounting('Group', info.ID, group_acct_graphs); } diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js index 20821ef210..dcff58971b 100644 --- a/src/sunstone/public/js/plugins/hosts-tab.js +++ b/src/sunstone/public/js/plugins/hosts-tab.js @@ -1020,6 +1020,11 @@ function updateHostInfo(request,host){ Sunstone.popUpInfoPanel("host_info_panel", "hosts-tab"); + + $("#host_info_panel_refresh", $("#host_info_panel")).click(function(){ + $(this).html(spinner); + Sunstone.runAction('Host.showinfo', host_info.ID); + }) // TODO: re-use Host.pool_monitor data? //pop up panel while we retrieve the graphs diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js index 76ea59983d..fb9040fc45 100644 --- a/src/sunstone/public/js/plugins/images-tab.js +++ b/src/sunstone/public/js/plugins/images-tab.js @@ -798,6 +798,11 @@ function updateImageInfo(request,img){ setPermissionsTable(img_info,''); + $("#image_info_panel_refresh", $("#image_info_panel")).click(function(){ + $(this).html(spinner); + Sunstone.runAction('Image.showinfo', img_info.ID); + }) + } function enable_all_datastores() diff --git a/src/sunstone/public/js/plugins/marketplace-tab.js b/src/sunstone/public/js/plugins/marketplace-tab.js index c7407ca6d0..504d0ece19 100644 --- a/src/sunstone/public/js/plugins/marketplace-tab.js +++ b/src/sunstone/public/js/plugins/marketplace-tab.js @@ -237,6 +237,11 @@ function updateMarketInfo(request,app){ Sunstone.updateInfoPanelTab("marketplace_info_panel", "marketplace_info_tab", info_tab); Sunstone.popUpInfoPanel("marketplace_info_panel", "marketplace-tab"); + + $("#marketplace_info_panel_refresh", $("#marketplace_info_panel")).click(function(){ + $(this).html(spinner); + Sunstone.runAction('Marketplace.showinfo', app['_id']["$oid"]); + }) }; function infoListenerMarket(dataTable){ diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index 498688ad86..5b795da33c 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -1487,6 +1487,11 @@ function updateTemplateInfo(request,template){ // Populate permissions grid setPermissionsTable(template_info,''); + + $("#template_info_panel_refresh", $("#template_info_panel")).click(function(){ + $(this).html(spinner); + Sunstone.runAction('Template.showinfo', template_info.ID); + }) } //Given the JSON of a VM template (or of a section of it), it crawls diff --git a/src/sunstone/public/js/plugins/users-tab.js b/src/sunstone/public/js/plugins/users-tab.js index f426b9feb8..628150a4a7 100644 --- a/src/sunstone/public/js/plugins/users-tab.js +++ b/src/sunstone/public/js/plugins/users-tab.js @@ -781,6 +781,11 @@ function updateUserInfo(request,user){ Sunstone.updateInfoPanelTab("user_info_panel","user_quotas_tab",quotas_tab); //Sunstone.updateInfoPanelTab("user_info_panel","user_acct_tab",acct_tab); Sunstone.popUpInfoPanel("user_info_panel", 'users-tab'); + + $("#user_info_panel_refresh", $("#user_info_panel")).click(function(){ + $(this).html(spinner); + Sunstone.runAction('User.showinfo', info.ID); + }) }; // Prepare the user creation dialog diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index cf5350517e..e7f7abb53f 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -1536,6 +1536,11 @@ function updateVMInfo(request,vm){ // Populate permissions grid setPermissionsTable(vm_info,''); + + $("#vm_info_panel_refresh", $("#vm_info_panel")).click(function(){ + $(this).html(spinner); + Sunstone.runAction('VM.showinfo', vm_info.ID); + }) } function updateVMDisksInfo(request,vm){ diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index 104e0b0b80..2a6699cbda 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -843,6 +843,10 @@ function updateVNetworkInfo(request,vn){ setPermissionsTable(vn_info,''); + $("#vnet_info_panel_refresh", $("#vnet_info_panel")).click(function(){ + $(this).html(spinner); + Sunstone.runAction('Network.showinfo', vn_info.ID); + }) } // Prints the lis of leases depending on the Vnet TYPE diff --git a/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js index 2c2b06c694..5ca7cf74cd 100644 --- a/src/sunstone/public/js/sunstone.js +++ b/src/sunstone/public/js/sunstone.js @@ -120,7 +120,22 @@ var Sunstone = { //Generates and returns the HTML div element for an info panel, with //Jquery tabs. "getInfoPanelHTML" : function(panel_name,selected_tab){ - var dl_tabs = $('
'); + var active_tab = $("dd.active a", $("#"+panel_name)); + if (active_tab) { + var active_tab_href = active_tab.attr('href'); + } + + var dl_tabs = $('
\ +
\ +
\ +
\ + \ +
\ +
\ +
\ + \ +
'); + var tabs = SunstoneCfg["info_panels"][panel_name]; var tab=null; var active=false;