diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index 67d19218a97..fd4743ff86d 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -11,6 +11,9 @@ message.download.volume=Please click 00000 to download volume message.download.ISO=Please click 00000 to download ISO message.download.template=Please click 00000 to download template label.download.progress=Download Progress +label.total.cpu=Total CPU +label.cpu.utilized=CPU Utilized +label.cpu.allocated.for.VMs=CPU Allocated for VMs #Labels label.SR.name = SR Name-Label @@ -238,7 +241,6 @@ label.cloud.managed=Cloud.com Managed label.cluster.type=Cluster Type label.cluster=Cluster label.code=Code -label.cpu.allocated=CPU Allocated label.cpu.mhz=CPU (in MHz) label.cpu=CPU label.created=Created diff --git a/client/WEB-INF/classes/resources/messages_es.properties b/client/WEB-INF/classes/resources/messages_es.properties index b0ba9b37d3e..a2f659b82bc 100644 --- a/client/WEB-INF/classes/resources/messages_es.properties +++ b/client/WEB-INF/classes/resources/messages_es.properties @@ -11,6 +11,9 @@ message.download.volume=Por favor, haga clic 00000 para bajar el message.download.ISO=Por favor, haga clic 00000 para descargar la ISO message.download.template=Por favor, haga clic 00000 para descargar la plantilla label.download.progress=Progreso de la descarga +label.total.cpu=Total CPU +label.cpu.utilized=CPU Utilizado +label.cpu.allocated.for.VMs=CPU asignado para máquinas virtuales #Labels label.SR.name = SR Nombre de etiqueta @@ -239,7 +242,6 @@ label.cluster = Grupo label.cluster.type = Tipo de Cluster Server label.code = Código label.cpu = CPU -label.cpu.allocated = CPU asignado label.cpu.mhz = CPU (en MHZ) label.created = creación label.cross.zones = Cruz Zonas diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties index 646eeb6b924..dde0dd5d0f5 100644 --- a/client/WEB-INF/classes/resources/messages_ja.properties +++ b/client/WEB-INF/classes/resources/messages_ja.properties @@ -11,6 +11,9 @@ message.download.volume=をクリックしてください。0000000000をは、ISOをダウンロードする message.download.template=をクリックしてください。00000をテンプレートをダウンロードする label.download.progress=ダウンロードの進捗状況 +label.total.cpu=合計CPU +label.cpu.utilized=CPUが活用さ +label.cpu.allocated.for.VMs=CPUはVMの割り当て #Labels label.SR.name=SRの名 -レーベル @@ -239,7 +242,6 @@ label.cluster =クラスタ label.cluster.type =クラスタ種類 label.code =コード label.cpu = CPU -label.cpu.allocated = CPU割り当て label.cpu.mhz =CPU(MHz) label.created=作成 label.cross.zones =クロスZone diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties index f1a646d245d..963997c67a4 100644 --- a/client/WEB-INF/classes/resources/messages_zh_CN.properties +++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties @@ -11,6 +11,9 @@ message.download.volume=请点击00000下载卷 message.download.ISO=请点击00000来下载ISO message.download.template=请点击00000下载模板 label.download.progress=下载进度 +label.total.cpu=总的CPU +label.cpu.utilized=CPU的利用率 +label.cpu.allocated.for.VMs=分配给虚拟机的CPU #Labels label.account =帐号 @@ -238,7 +241,6 @@ label.cluster =集群 label.cluster.type =集群类型 label.code =代码 label.cpu =中央处理器 -label.cpu.allocated = 已分配CPU label.cpu.mhz = CPU(兆赫) label.created =已创建 label.cross.zones =跨Zone diff --git a/ui/jsp/host.jsp b/ui/jsp/host.jsp index b7936303c32..bfef9257a8d 100644 --- a/ui/jsp/host.jsp +++ b/ui/jsp/host.jsp @@ -264,7 +264,7 @@ dictionary = {
- + + +
+
+
+ :
+
+
+
+ M + x + N +
+
+
- :
+ :
+
+
+
+
+
+ + + + + + +
+
+
+ :
@@ -303,7 +333,7 @@ dictionary = {
-
+
:
@@ -314,7 +344,7 @@ dictionary = {
-
+
:
@@ -325,7 +355,7 @@ dictionary = {
-
+
:
@@ -336,7 +366,7 @@ dictionary = {
-
+
:
@@ -346,7 +376,7 @@ dictionary = {
-
+
:
diff --git a/ui/scripts/cloud.core.host.js b/ui/scripts/cloud.core.host.js index dc8a4884e86..45188f968b3 100644 --- a/ui/scripts/cloud.core.host.js +++ b/ui/scripts/cloud.core.host.js @@ -362,6 +362,7 @@ function hostJsonToStatisticsTab() { $thisTab.find("#tab_container").hide(); $thisTab.find("#tab_spinning_wheel").show(); + /* var $barChartContainer = $thisTab.find("#cpu_barchart"); var cpuNumber = ((jsonObj.cpunumber==null)? "":jsonObj.cpunumber.toString()); @@ -374,6 +375,12 @@ function hostJsonToStatisticsTab() { $barChartContainer.find("#percentused").text(""); if(jsonObj.cpuused!=null) drawBarChart($barChartContainer, jsonObj.cpuused); + */ + + $thisTab.find("#cpunumber").text(fromdb(jsonObj.cpunumber)); + $thisTab.find("#cpuspeed").text(convertHz(jsonObj.cpuspeed)); + + $thisTab.find("#percentused").text(jsonObj.cpuused); var cpuAllocated = ((jsonObj.cpuallocated==null)? "":jsonObj.cpuallocated); $thisTab.find("#cpuallocated").text(cpuAllocated); diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js index e8e1543e441..6e61996722b 100644 --- a/ui/scripts/cloud.core.js +++ b/ui/scripts/cloud.core.js @@ -1872,6 +1872,9 @@ function convertBytes(bytes) { } function convertHz(hz) { + if (hz == null) + return ""; + if (hz < 1000) { return hz + " MHZ"; } else {