diff --git a/src/sunstone/public/js/plugins/clusters-tab.js b/src/sunstone/public/js/plugins/clusters-tab.js index 7d2aac421b..779885e856 100644 --- a/src/sunstone/public/js/plugins/clusters-tab.js +++ b/src/sunstone/public/js/plugins/clusters-tab.js @@ -1037,7 +1037,7 @@ var cluster_buttons = { }, "Cluster.update_dialog" : { type : "action", - text : tr("Update properties"), + text : tr("Update"), alwaysActive: true }, "Cluster.delete" : { diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js index e0e886a570..88b8e570a1 100644 --- a/src/sunstone/public/js/plugins/hosts-tab.js +++ b/src/sunstone/public/js/plugins/hosts-tab.js @@ -329,16 +329,12 @@ var host_buttons = { var host_info_panel = { "host_info_tab" : { - title: tr("Host information"), + title: tr("Information"), content:"" }, - "host_template_tab" : { - title: tr("Host template"), - content: "" - }, "host_monitoring_tab": { - title: tr("Monitoring information"), + title: tr("Graphs"), content: "" } }; @@ -705,50 +701,43 @@ function updateHostInfo(request,host){ '+ tr("VN MAD") +'\ '+host_info.VN_MAD+'\ \ + \ + ' + tr("Total Mem") + '\ + '+humanize_size(host_info.HOST_SHARE.MAX_MEM)+'\ + \ + \ + ' + tr("Used Mem (real)") + '\ + '+humanize_size(host_info.HOST_SHARE.USED_MEM)+'\ + \ + \ + ' + tr("Used Mem (allocated)") + '\ + '+humanize_size(host_info.HOST_SHARE.MEM_USAGE)+'\ + \ + \ + ' + tr("Total CPU") + '\ + '+host_info.HOST_SHARE.MAX_CPU+'\ + \ + \ + ' + tr("Used CPU (real)") + '\ + '+host_info.HOST_SHARE.USED_CPU+'\ + \ + \ + ' + tr("Used CPU (allocated)") + '\ + '+host_info.HOST_SHARE.CPU_USAGE+'\ + \ + \ + ' + tr("Running VMs") + '\ + '+host_info.HOST_SHARE.RUNNING_VMS+'\ + \ \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ -
' + tr("Host shares") + '
' + tr("Total Mem") + ''+humanize_size(host_info.HOST_SHARE.MAX_MEM)+'
' + tr("Used Mem (real)") + ''+humanize_size(host_info.HOST_SHARE.USED_MEM)+'
' + tr("Used Mem (allocated)") + ''+humanize_size(host_info.HOST_SHARE.MEM_USAGE)+'
' + tr("Total CPU") + ''+host_info.HOST_SHARE.MAX_CPU+'
' + tr("Used CPU (real)") + ''+host_info.HOST_SHARE.USED_CPU+'
' + tr("Used CPU (allocated)") + ''+host_info.HOST_SHARE.CPU_USAGE+'
' + tr("Running VMs") + ''+host_info.HOST_SHARE.RUNNING_VMS+'
' + insert_extended_template_table(host_info.TEMPLATE, + ' + insert_extended_template_table(host_info.TEMPLATE, "Host", host_info.ID) } var monitor_tab = { - title: tr("Monitoring information"), + title: tr("Graphs"), content : generateMonitoringDivs(host_graphs,"host_monitor_") } diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js index bad9c630ee..0494ff7863 100644 --- a/src/sunstone/public/js/plugins/images-tab.js +++ b/src/sunstone/public/js/plugins/images-tab.js @@ -549,14 +549,6 @@ function updateImageInfo(request,img){ '+tr("Datastore")+'\ '+img_info.DATASTORE+'\ \ - \ - '+tr("Owner")+'\ - '+img_info.UNAME+'\ - \ - \ - '+tr("Group")+'\ - '+img_info.GNAME+'\ - \ \ '+tr("Type")+'\ '+OpenNebula.Helper.image_type(img_info.TYPE)+'\