apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

host page - make statistics tab the last tab.

Browse Source
This commit is contained in:
Jessica Wang 2010-12-14 15:35:13 -08:00
parent fbbf78efbb
commit 1f2ff1bec2
2 changed files with 94 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
ui/jsp/host.jsp
View File

@ -21,15 +21,15 @@
</div>
<div class="tabbox" style="margin-top: 15px;">
<div class="content_tabs on" id="tab_details">
<%=t.t("details")%></div>
<div class="content_tabs off" id="tab_statistics">
<%=t.t("statistics")%></div>
<%=t.t("details")%></div>
<div class="content_tabs off" id="tab_instance">
<%=t.t("instance")%></div>
<div class="content_tabs off" id="tab_router">
<%=t.t("router")%></div>
<div class="content_tabs off" id="tab_systemvm">
<%=t.t("system.vm")%></div>
<div class="content_tabs off" id="tab_statistics">
<%=t.t("statistics")%></div>
</div>
<!-- Details tab (start)-->
<div id="tab_content_details">
@ -176,6 +176,46 @@
</div>
</div>
<!-- Details tab (end)-->
<!--Instance tab (start)-->
<div style="display: none;" id="tab_content_instance">
<div id="tab_spinning_wheel" class="rightpanel_mainloader_panel" style="display:none;">
<div class="rightpanel_mainloaderbox">
<div class="rightpanel_mainloader_animatedicon"></div>
<p>Loading &hellip;</p>
</div>
</div>
<div id="tab_container">
</div>
</div>
<!--Instance tab (end)-->
<!--router tab (start)-->
<div style="display: none;" id="tab_content_router">
<div id="tab_spinning_wheel" class="rightpanel_mainloader_panel" style="display:none;">
<div class="rightpanel_mainloaderbox">
<div class="rightpanel_mainloader_animatedicon"></div>
<p>Loading &hellip;</p>
</div>
</div>
<div id="tab_container">
</div>
</div>
<!--router tab (end)-->
<!--systemvm tab (start)-->
<div style="display: none;" id="tab_content_systemvm">
<div id="tab_spinning_wheel" class="rightpanel_mainloader_panel" style="display:none;">
<div class="rightpanel_mainloaderbox">
<div class="rightpanel_mainloader_animatedicon"></div>
<p>Loading &hellip;</p>
</div>
</div>
<div id="tab_container">
</div>
</div>
<!--systemvm tab (end)-->
<!--Statistics tab (start)-->
<div style="display: none;" id="tab_content_statistics">
@ -287,45 +327,6 @@
</div>
</div>
<!--Statistics tab (end)-->
<!--Instance tab (start)-->
<div style="display: none;" id="tab_content_instance">
<div id="tab_spinning_wheel" class="rightpanel_mainloader_panel" style="display:none;">
<div class="rightpanel_mainloaderbox">
<div class="rightpanel_mainloader_animatedicon"></div>
<p>Loading &hellip;</p>
</div>
</div>
<div id="tab_container">
</div>
</div>
<!--Instance tab (end)-->
<!--router tab (start)-->
<div style="display: none;" id="tab_content_router">
<div id="tab_spinning_wheel" class="rightpanel_mainloader_panel" style="display:none;">
<div class="rightpanel_mainloaderbox">
<div class="rightpanel_mainloader_animatedicon"></div>
<p>Loading &hellip;</p>
</div>
</div>
<div id="tab_container">
</div>
</div>
<!--router tab (end)-->
<!--systemvm tab (start)-->
<div style="display: none;" id="tab_content_systemvm">
<div id="tab_spinning_wheel" class="rightpanel_mainloader_panel" style="display:none;">
<div class="rightpanel_mainloaderbox">
<div class="rightpanel_mainloader_animatedicon"></div>
<p>Loading &hellip;</p>
</div>
</div>
<div id="tab_container">
</div>
</div>
<!--systemvm tab (end)-->
</div>
<!-- instance tab template (begin) -->

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

@ -52,9 +52,9 @@ function afterLoadHostJSP($midmenuItem1) {
initDialog("dialog_update_os");
// switch between different tabs
var tabArray = [$("#tab_details"), $("#tab_statistics"), $("#tab_instance"), $("#tab_router"), $("#tab_systemvm")];
var tabContentArray = [$("#tab_content_details"), $("#tab_content_statistics"), $("#tab_content_instance"), $("#tab_content_router"), $("#tab_content_systemvm")];
var afterSwitchFnArray = [hostJsonToDetailsTab, hostJsonToStatisticsTab, hostJsonToInstanceTab, hostJsonToRouterTab, hostJsonToSystemvmTab];
var tabArray = [$("#tab_details"), $("#tab_instance"), $("#tab_router"), $("#tab_systemvm"), $("#tab_statistics")];
var tabContentArray = [$("#tab_content_details"), $("#tab_content_instance"), $("#tab_content_router"), $("#tab_content_systemvm"), $("#tab_content_statistics")];
var afterSwitchFnArray = [hostJsonToDetailsTab, hostJsonToInstanceTab, hostJsonToRouterTab, hostJsonToSystemvmTab, hostJsonToStatisticsTab];
switchBetweenDifferentTabs(tabArray, tabContentArray, afterSwitchFnArray);
$("#right_panel_content").data("$midmenuItem1", $midmenuItem1);
@ -169,54 +169,6 @@ function hostJsonToDetailsTab() {
$thisTab.find("#tab_spinning_wheel").hide();
$thisTab.find("#tab_container").show();
}
function hostJsonToStatisticsTab() {
var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
if($midmenuItem1 == null)
return;
var jsonObj = $midmenuItem1.data("jsonObj");
if(jsonObj == null)
return;
var $thisTab = $("#right_panel_content").find("#tab_content_statistics");
$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());
$barChartContainer.find("#cpunumber").text(cpuNumber);
var cpuSpeed = ((jsonObj.cpuspeed==null)? "":convertHz(jsonObj.cpuspeed)) ;
$barChartContainer.find("#cpuspeed").text(cpuSpeed);
$barChartContainer.find("#bar_chart").removeClass().addClass("db_barbox").css("width", "0%");
$barChartContainer.find("#percentused").text("");
if(jsonObj.cpuused!=null)
drawBarChart($barChartContainer, jsonObj.cpuused);
var cpuAllocated = ((jsonObj.cpuallocated==null)? "":jsonObj.cpuallocated);
$thisTab.find("#cpuallocated").text(cpuAllocated);
var memoryTotal = ((jsonObj.cpuallocated==null)? "":convertBytes(jsonObj.memorytotal));
$thisTab.find("#memorytotal").text(memoryTotal);
var memoryAllocated = ((jsonObj.cpuallocated==null)? "":convertBytes(jsonObj.memoryallocated));
$thisTab.find("#memoryallocated").text(memoryAllocated);
var memoryUsed = ((jsonObj.memoryused==null)? "":convertBytes(jsonObj.memoryused));
$thisTab.find("#memoryused").text(memoryUsed);
var networkKbsRead = ((jsonObj.networkkbsread==null)? "":convertBytes(jsonObj.networkkbsread * 1024));
$thisTab.find("#networkkbsread").text(networkKbsRead);
var networkKbsWrite = ((jsonObj.networkkbswrite==null)? "":convertBytes(jsonObj.networkkbswrite * 1024));
$thisTab.find("#networkkbswrite").text(networkKbsWrite);
$thisTab.find("#tab_spinning_wheel").hide();
$thisTab.find("#tab_container").show();
}
function hostJsonToInstanceTab() {
var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
@ -298,6 +250,54 @@ function hostJsonToRouterTab() {
}
});
}
function hostJsonToStatisticsTab() {
var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
if($midmenuItem1 == null)
return;
var jsonObj = $midmenuItem1.data("jsonObj");
if(jsonObj == null)
return;
var $thisTab = $("#right_panel_content").find("#tab_content_statistics");
$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());
$barChartContainer.find("#cpunumber").text(cpuNumber);
var cpuSpeed = ((jsonObj.cpuspeed==null)? "":convertHz(jsonObj.cpuspeed)) ;
$barChartContainer.find("#cpuspeed").text(cpuSpeed);
$barChartContainer.find("#bar_chart").removeClass().addClass("db_barbox").css("width", "0%");
$barChartContainer.find("#percentused").text("");
if(jsonObj.cpuused!=null)
drawBarChart($barChartContainer, jsonObj.cpuused);
var cpuAllocated = ((jsonObj.cpuallocated==null)? "":jsonObj.cpuallocated);
$thisTab.find("#cpuallocated").text(cpuAllocated);
var memoryTotal = ((jsonObj.cpuallocated==null)? "":convertBytes(jsonObj.memorytotal));
$thisTab.find("#memorytotal").text(memoryTotal);
var memoryAllocated = ((jsonObj.cpuallocated==null)? "":convertBytes(jsonObj.memoryallocated));
$thisTab.find("#memoryallocated").text(memoryAllocated);
var memoryUsed = ((jsonObj.memoryused==null)? "":convertBytes(jsonObj.memoryused));
$thisTab.find("#memoryused").text(memoryUsed);
var networkKbsRead = ((jsonObj.networkkbsread==null)? "":convertBytes(jsonObj.networkkbsread * 1024));
$thisTab.find("#networkkbsread").text(networkKbsRead);
var networkKbsWrite = ((jsonObj.networkkbswrite==null)? "":convertBytes(jsonObj.networkkbswrite * 1024));
$thisTab.find("#networkkbswrite").text(networkKbsWrite);
$thisTab.find("#tab_spinning_wheel").hide();
$thisTab.find("#tab_container").show();
}
function hostRouterJSONToTemplate(jsonObj, template) {
template.data("jsonObj", jsonObj);