diff --git a/src/sunstone/public/js/plugins/clusters-tab.js b/src/sunstone/public/js/plugins/clusters-tab.js index f0e211a376..81f0900446 100644 --- a/src/sunstone/public/js/plugins/clusters-tab.js +++ b/src/sunstone/public/js/plugins/clusters-tab.js @@ -1246,16 +1246,13 @@ function updateClusterInfo(request,cluster){ \ ' + tr("id") + '\ '+cluster_info.ID+'\ - \ - \ - '+tr("Name")+'\ - '+cluster_info.NAME+'\ -
\ - \ -
\ - \ - \ - \ + '+ + insert_rename_tr( + 'clusters-tab', + "Cluster", + cluster_info.ID, + cluster_info.NAME)+ + '\ \ \
' + @@ -1308,25 +1305,6 @@ function updateClusterInfo(request,cluster){
' } - $("#div_edit_rename_link").die(); - $(".input_edit_value_rename").die(); - - // Listener for edit link for rename - $("#div_edit_rename_link").live("click", function() { - var value_str = $(".value_td_rename").text(); - $(".value_td_rename").html(''); - }); - - $(".input_edit_value_rename").live("change", function() { - var value_str = $(".input_edit_value_rename").val(); - if(value_str!="") - { - // Let OpenNebula know - var name_template = {"name": value_str}; - Sunstone.runAction("Cluster.rename",cluster_info.ID,name_template); - } - }); - //Sunstone.updateInfoPanelTab(info_panel_name,tab_name, new tab object); Sunstone.updateInfoPanelTab("cluster_info_panel","cluster_info_tab",info_tab); Sunstone.updateInfoPanelTab("cluster_info_panel","cluster_host_tab",cluster_host_tab); diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js index 674230903e..7d417d9fa1 100644 --- a/src/sunstone/public/js/plugins/datastores-tab.js +++ b/src/sunstone/public/js/plugins/datastores-tab.js @@ -695,16 +695,13 @@ function updateDatastoreInfo(request,ds){ '+tr("ID")+'\ '+info.ID+'\ \ - \ - \ - '+tr("Name")+'\ - '+info.NAME+'\ -
\ - \ -
\ - \ - \ - '+ + '+ + insert_rename_tr( + 'datastores-tab', + "Datastore", + info.ID, + info.NAME)+ + ''+ cluster_str + '\ \ @@ -770,25 +767,6 @@ function updateDatastoreInfo(request,ds){ ' } - $("#div_edit_rename_link").die(); - $(".input_edit_value_rename").die(); - - // Listener for edit link for rename - $("#div_edit_rename_link").live("click", function() { - var value_str = $(".value_td_rename").text(); - $(".value_td_rename").html(''); - }); - - $(".input_edit_value_rename").live("change", function() { - var value_str = $(".input_edit_value_rename").val(); - if(value_str!="") - { - // Let OpenNebula know - var name_template = {"name": value_str}; - Sunstone.runAction("Datastore.rename",info.ID,name_template); - } - }); - // Add tabs Sunstone.updateInfoPanelTab("datastore_info_panel","datastore_info_tab",info_tab); Sunstone.updateInfoPanelTab("datastore_info_panel","datastore_image_tab",datastore_info_tab); diff --git a/src/sunstone/public/js/plugins/files-tab.js b/src/sunstone/public/js/plugins/files-tab.js index 92688b7407..9bd1c9cc57 100644 --- a/src/sunstone/public/js/plugins/files-tab.js +++ b/src/sunstone/public/js/plugins/files-tab.js @@ -477,16 +477,13 @@ function updateFileInfo(request,file){ '+tr("ID")+'\ '+file_info.ID+'\ \ - \ - \ - '+tr("Name")+'\ - '+file_info.NAME+'\ -
\ - \ -
\ - \ - \ - \ + '+ + insert_rename_tr( + 'files-tab', + "File", + file_info.ID, + file_info.NAME)+ + '\ '+tr("Datastore")+'\ '+file_info.DATASTORE+'\ \ @@ -547,30 +544,12 @@ function updateFileInfo(request,file){ ' } - $("#div_edit_rename_link_files").die(); - $(".input_edit_value_rename_files").die(); $("#div_edit_chg_type_files_link").die(); $("#chg_type_select_files").die(); $("#div_edit_persistency_files").die(); $("#persistency_select_files").die(); - // Listener for edit link for rename - $("#div_edit_rename_link_files").live("click", function() { - var value_str = $(".value_td_rename").text(); - $(".value_td_rename").html(''); - }); - - $(".input_edit_value_rename_files").live("change", function() { - var value_str = $(".input_edit_value_rename_files").val(); - if(value_str!="") - { - // Let OpenNebula know - var name_template = {"name": value_str}; - Sunstone.runAction("File.rename",file_info.ID,name_template); - } - }); - // Listener for edit link for type change $("#div_edit_chg_type_files_link").live("click", function() { $(".value_td_type").html( diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js index 59c79fe9cf..20364126dd 100644 --- a/src/sunstone/public/js/plugins/hosts-tab.js +++ b/src/sunstone/public/js/plugins/hosts-tab.js @@ -686,16 +686,13 @@ function updateHostInfo(request,host){ \ ' + tr("id") + '\ '+host_info.ID+'\ - \ - \ - '+tr("Name")+'\ - '+host_info.NAME+'\ -
\ - \ -
\ - \ - \ - ' + + '+ + insert_rename_tr( + 'hosts-tab', + "Host", + host_info.ID, + host_info.NAME)+ + '' + insert_cluster_dropdown("Host",host_info.ID,host_info.CLUSTER,host_info.CLUSTER_ID) + '\ \ @@ -802,25 +799,6 @@ function updateHostInfo(request,host){ ' } - $("#div_edit_rename_link").die(); - $(".input_edit_value_rename").die(); - - // Listener for edit link for rename - $("#div_edit_rename_link").live("click", function() { - var value_str = $(".value_td_rename").text(); - $(".value_td_rename").html(''); - }); - - $(".input_edit_value_rename").live("change", function() { - var value_str = $(".input_edit_value_rename").val(); - if(value_str!="") - { - // Let OpenNebula know - var name_template = {"name": value_str}; - Sunstone.runAction("Host.rename",host_info.ID,name_template); - } - }); - //Sunstone.updateInfoPanelTab(info_panel_name,tab_name, new tab object); Sunstone.updateInfoPanelTab("host_info_panel","host_info_tab",info_tab); Sunstone.updateInfoPanelTab("host_info_panel","host_monitoring_tab",monitor_tab); diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js index 78484517aa..a3b1b6c028 100644 --- a/src/sunstone/public/js/plugins/images-tab.js +++ b/src/sunstone/public/js/plugins/images-tab.js @@ -636,16 +636,13 @@ function updateImageInfo(request,img){ '+tr("ID")+'\ '+img_info.ID+'\ \ - \ - \ - '+tr("Name")+'\ - '+img_info.NAME+'\ -
\ - \ -
\ - \ - \ - \ + '+ + insert_rename_tr( + 'images-tab', + "Image", + img_info.ID, + img_info.NAME)+ + '\ '+tr("Datastore")+'\ '+img_info.DATASTORE+'\ \ @@ -714,30 +711,11 @@ function updateImageInfo(request,img){ ' } - $("#div_edit_rename_link").die(); - $(".input_edit_value_rename").die(); $("#div_edit_chg_type_link").die(); $("#chg_type_select").die(); $("#div_edit_persistency").die(); $("#persistency_select").die(); - - // Listener for edit link for rename - $("#div_edit_rename_link").live("click", function() { - var value_str = $(".value_td_rename").text(); - $(".value_td_rename").html(''); - }); - - $(".input_edit_value_rename").live("change", function() { - var value_str = $(".input_edit_value_rename").val(); - if(value_str!="") - { - // Let OpenNebula know - var name_template = {"name": value_str}; - Sunstone.runAction("Image.rename",img_info.ID,name_template); - } - }); - // Listener for edit link for type change $("#div_edit_chg_type_link").live("click", function() { $(".value_td_type").html( diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index d8c34d5c70..da7ef36004 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -1737,16 +1737,13 @@ function updateTemplateInfo(request,template){ '+tr("ID")+'\ '+template_info.ID+'\ \ - \ - \ - '+tr("Name")+'\ - '+template_info.NAME+'\ -
\ - \ -
\ - \ - \ - \ + '+ + insert_rename_tr( + 'templates-tab', + "Template", + template_info.ID, + template_info.NAME)+ + '\ '+tr("Register time")+'\ '+pretty_time(template_info.REGTIME)+'\ \ @@ -1775,26 +1772,6 @@ function updateTemplateInfo(request,template){ ' }; - $("#div_edit_rename_link").die(); - $(".input_edit_value_rename").die(); - - // Listener for key,value pair edit action - $("#div_edit_rename_link").live("click", function() { - var value_str = $(".value_td_rename").text(); - $(".value_td_rename").html(''); - }); - - $(".input_edit_value_rename").live("change", function() { - var value_str = $(".input_edit_value_rename").val(); - if(value_str!="") - { - // Let OpenNebula know - var name_template = {"name": value_str}; - Sunstone.runAction("Template.rename",template_info.ID,name_template); - } - }); - - Sunstone.updateInfoPanelTab("template_info_panel","template_info_tab",info_tab); Sunstone.updateInfoPanelTab("template_info_panel","template_template_tab",template_tab); diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index c4d30010d0..f5ed14c8bc 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -1549,16 +1549,13 @@ function updateVMInfo(request,vm){ '+tr("ID")+'\ '+vm_info.ID+'\ \ - \ - \ - '+tr("Name")+'\ - '+vm_info.NAME+'\ -
\ - \ -
\ - \ - \ - \ + '+ + insert_rename_tr( + 'vms-tab', + "VM", + vm_info.ID, + vm_info.NAME)+ + '\ '+tr("State")+'\ '+tr(vm_state)+'\ \ @@ -1669,25 +1666,6 @@ function updateVMInfo(request,vm){ content: generatePlacementTable(vm_info) }; - $("#div_edit_rename_link").die(); - $(".input_edit_value_rename").die(); - - // Listener for key,value pair edit action - $("#div_edit_rename_link").live("click", function() { - var value_str = $(".value_td_rename").text(); - $(".value_td_rename").html(''); - }); - - $(".input_edit_value_rename").live("change", function() { - var value_str = $(".input_edit_value_rename").val(); - if(value_str!="") - { - // Let OpenNebula know - var name_template = {"name": value_str}; - Sunstone.runAction("VM.rename",vm_info.ID,name_template); - } - }); - Sunstone.updateInfoPanelTab("vm_info_panel","vm_info_tab",info_tab); Sunstone.updateInfoPanelTab("vm_info_panel","vm_capacity_tab",capacity_tab); Sunstone.updateInfoPanelTab("vm_info_panel","vm_hotplugging_tab",hotplugging_tab); diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index 9dee419c7b..71410e975e 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -695,16 +695,13 @@ function updateVNetworkInfo(request,vn){ '+tr("ID")+'\ '+vn_info.ID+'\ \ - \ - \ - '+tr("Name")+'\ - '+vn_info.NAME+'\ -
\ - \ -
\ - \ - \ - ' + + '+ + insert_rename_tr( + 'vnets-tab', + "Network", + vn_info.ID, + vn_info.NAME)+ + '' + insert_cluster_dropdown("Network",vn_info.ID,vn_info.CLUSTER,vn_info.CLUSTER_ID) + '\ \ @@ -740,25 +737,6 @@ function updateVNetworkInfo(request,vn){ content: printLeases(vn_info) }; - $("#div_edit_rename_link").die(); - $(".input_edit_value_rename").die(); - - // Listener for key,value pair edit action - $("#div_edit_rename_link").live("click", function() { - var value_str = $(".value_td_rename").text(); - $(".value_td_rename").html(''); - }); - - $(".input_edit_value_rename").live("change", function() { - var value_str = $(".input_edit_value_rename").val(); - if(value_str!="") - { - // Let OpenNebula know - var name_template = {"name": value_str}; - Sunstone.runAction("Network.rename",vn_info.ID,name_template); - } - }); - Sunstone.updateInfoPanelTab("vnet_info_panel","vnet_info_tab",info_tab); Sunstone.updateInfoPanelTab("vnet_info_panel","vnet_leases_tab",leases_tab); diff --git a/src/sunstone/public/js/plugins/zones-tab.js b/src/sunstone/public/js/plugins/zones-tab.js index 71f29279bb..fa22d6b9b8 100644 --- a/src/sunstone/public/js/plugins/zones-tab.js +++ b/src/sunstone/public/js/plugins/zones-tab.js @@ -332,16 +332,13 @@ function updateZoneInfo(request,zone){ \ ' + tr("ID") + '\ '+zone_info.ID+'\ - \ - \ - '+tr("Name")+'\ - '+zone_info.NAME+'\ -
\ - \ -
\ - \ - \ - \ + '+ + insert_rename_tr( + 'zones-tab', + "Zone", + zone_info.ID, + zone_info.NAME)+ + '\ \ \
\ @@ -358,25 +355,6 @@ function updateZoneInfo(request,zone){ ' } - $("#div_edit_rename_link").die(); - $(".input_edit_value_rename").die(); - - // Listener for edit link for rename - $("#div_edit_rename_link").live("click", function() { - var value_str = $(".value_td_rename").text(); - $(".value_td_rename").html(''); - }); - - $(".input_edit_value_rename").live("change", function() { - var value_str = $(".input_edit_value_rename").val(); - if(value_str!="") - { - // Let OpenNebula know - var name_template = {"name": value_str}; - Sunstone.runAction("Zone.rename",zone_info.ID,name_template); - } - }); - //Sunstone.updateInfoPanelTab(info_panel_name,tab_name, new tab object); Sunstone.updateInfoPanelTab("zone_info_panel","zone_info_tab",info_tab); diff --git a/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js index 7964f61903..b9b814aec5 100644 --- a/src/sunstone/public/js/sunstone.js +++ b/src/sunstone/public/js/sunstone.js @@ -3297,6 +3297,42 @@ function insert_permissions_table(tab_name, resource_type, resource_id, owner, g return str; } +function insert_rename_tr(tab_name, resource_type, resource_id, resource_name){ + var str = + '\ + '+tr("Name")+'\ + '+resource_name+'\ + \ +
\ + \ +
\ + \ + '; + + var context = '.'+resource_type.toLowerCase()+'_rename'; + + $("#div_edit_rename_link", context).die(); + $(".input_edit_value_rename", context).die(); + + // Listener for edit link for rename + $("#div_edit_rename_link", context).live("click", function() { + var value_str = $(".value_td_rename", context).text(); + $(".value_td_rename", context).html(''); + }); + + $(".input_edit_value_rename", context).live("change", function() { + var value_str = $(".input_edit_value_rename", context).val(); + if(value_str!="") + { + // Let OpenNebula know + var name_template = {"name": value_str}; + Sunstone.runAction(resource_type+".rename", resource_id, name_template); + } + }); + + return str; +} + function insert_cluster_dropdown(resource_type, resource_id, cluster_value, cluster_id){ var str = '' + tr("Cluster") + '\ '+(cluster_value.length ? cluster_value : "-")+'\