etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 8538: Host page - statistics tab - seperate CPU row to 2 rows ("Total CPU", "CPU Utilized"). Add/Change labels for the first 3 rows.

This commit is contained in:
Jessica Wang 2011-02-18 11:43:09 -08:00
parent 8695e7250c
commit 70dcfa39fe
7 changed files with 59 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/WEB-INF/classes/resources/messages.properties
View File

@ -11,6 +11,9 @@ message.download.volume=Please click <a href="#">00000</a> to download volume
message.download.ISO=Please click <a href="#">00000</a> to download ISO
message.download.template=Please click <a href="#">00000</a> 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

4
client/WEB-INF/classes/resources/messages_es.properties
View File

@ -11,6 +11,9 @@ message.download.volume=Por favor, haga clic <a href="#">00000</a> para bajar el
message.download.ISO=Por favor, haga clic <a href="#">00000</a> para descargar la ISO
message.download.template=Por favor, haga clic <a href="#">00000</a> 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

4
client/WEB-INF/classes/resources/messages_ja.properties
View File

@ -11,6 +11,9 @@ message.download.volume=をクリックしてください。<a href="#">00000</a
message.download.ISO=をクリックしてください。<a href="#">00000</a>をは、ISOをダウンロードする
message.download.template=をクリックしてください。<a href="#">00000</a>をテンプレートをダウンロードする
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

4
client/WEB-INF/classes/resources/messages_zh_CN.properties
View File

@ -11,6 +11,9 @@ message.download.volume=请点击<a href="#">00000</a>下载卷
message.download.ISO=请点击<a href="#">00000</a>来下载ISO
message.download.template=请点击<a href="#">00000</a>下载模板
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

44
ui/jsp/host.jsp
View File

@ -264,7 +264,7 @@ dictionary = {
<div id="grid_header_title" class="grid_header_title"></div>
</div>
<!--
<div class="dbrow odd" id="cpu_barchart">
<div class="dbrow_cell" style="width: 40%;">
<div class="dbgraph_titlebox">
@ -291,11 +291,41 @@ dictionary = {
</div>
</div>
</div>
-->
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.total.cpu"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles">
<span id="cpunumber">M</span>
x
<span id="cpuspeed">N</span>
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.cpu.allocated"/>:</div>
<fmt:message key="label.cpu.utilized"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="percentused">
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.cpu.allocated.for.VMs"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="cpuallocated">
@ -303,7 +333,7 @@ dictionary = {
</div>
</div>
<div class="grid_rows odd">
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.memory.total"/>:</div>
@ -314,7 +344,7 @@ dictionary = {
</div>
</div>
<div class="grid_rows even">
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.memory.allocated"/>:</div>
@ -325,7 +355,7 @@ dictionary = {
</div>
</div>
<div class="grid_rows odd">
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.memory.used"/>:</div>
@ -336,7 +366,7 @@ dictionary = {
</div>
</div>
<div class="grid_rows even">
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.network.read"/>:</div>
@ -346,7 +376,7 @@ dictionary = {
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.network.write"/>:</div>

7
ui/scripts/cloud.core.host.js
View File

@ -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);

3
ui/scripts/cloud.core.js
View File

@ -1872,6 +1872,9 @@ function convertBytes(bytes) {
}
function convertHz(hz) {
if (hz == null)
return "";
if (hz < 1000) {
return hz + " MHZ";
} else {