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

bug 8705: seperate "CPU" row into 2 rows: "Total CPU" and "CPU Utilized".

This commit is contained in:
Jessica Wang 2011-02-23 10:47:24 -08:00
parent 0ce385ecf2
commit 91b4a8e172
2 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ui/jsp/instance.jsp
View File

@ -305,7 +305,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">
@ -332,9 +332,36 @@ 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.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.network.read"/>:</div>
@ -344,7 +371,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>

11
ui/scripts/cloud.core.instance.js
View File

@ -1990,6 +1990,9 @@ function vmJsonToStatisticsTab() {
}
var $thisTab = $("#right_panel_content #tab_content_statistics");
/*
var $barChartContainer = $thisTab.find("#cpu_barchart");
var cpuNumber = ((jsonObj.cpunumber==null)? "":jsonObj.cpunumber.toString());
@ -2002,7 +2005,13 @@ function vmJsonToStatisticsTab() {
$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 networkKbsRead = ((jsonObj.networkkbsread==null)? "":convertBytes(jsonObj.networkkbsread * 1024));
$thisTab.find("#networkkbsread").text(networkKbsRead);