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

new UI - #5855 - primary storage page - display state.

Browse Source
This commit is contained in:
Jessica Wang 2010-11-04 09:56:06 -07:00
parent 137fe40c46
commit 58b7c8f4e5
2 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ui/jsp/primarystorage.jsp
View File

@ -74,6 +74,16 @@
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("state")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="state">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("zone")%>:</div>
@ -83,7 +93,7 @@
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("pod")%>:</div>
@ -93,7 +103,7 @@
</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">
<%=t.t("cluster")%>:</div>
@ -103,7 +113,7 @@
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("type")%>:</div>
@ -113,7 +123,7 @@
</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">
<%=t.t("IP.or.FQDN")%>:</div>
@ -123,7 +133,7 @@
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("path")%>:</div>
@ -133,7 +143,7 @@
</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">
<%=t.t("disk.total")%>:</div>
@ -143,7 +153,7 @@
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("disk.allocated")%>:</div>
@ -153,7 +163,7 @@
</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">
<%=t.t("tags")%>:</div>

21
ui/scripts/cloud.core.primarystorage.js
View File

@ -54,6 +54,9 @@ function primarystorageJsonToDetailsTab($midmenuItem1) {
$detailsTab.find("#id").text(fromdb(jsonObj.id));
$detailsTab.find("#grid_header_title").text(fromdb(jsonObj.name));
$detailsTab.find("#name").text(fromdb(jsonObj.name));
setHostStateInRightPanel(fromdb(jsonObj.state), $detailsTab.find("#state"));
$detailsTab.find("#zonename").text(fromdb(jsonObj.zonename));
$detailsTab.find("#podname").text(fromdb(jsonObj.podname));
$detailsTab.find("#clustername").text(fromdb(jsonObj.clustername));
@ -110,7 +113,23 @@ var primarystorageActionMap = {
//var item = json.queryasyncjobresultresponse.jobresult.prepareprimarystorageformaintenanceresponse;
////item is {success: "true"}, not an embedded object of primary storage. It should an embedded object instead. Comment out the 4 lines until Bug 6955 is fixed.
//primarystorageToMidmenu(item, $midmenuItem1);
//primarystorageToRightPanel($midmenuItem1);
//primarystorageToRightPanel($midmenuItem1);
//make extra API call before bug 6955 is fixed.(enableStorageMaintenance API should return an embedded object like cancelStorageMaintenance API does)
$.ajax({
data: createURL("command=listStoragePools&id="+id),
dataType: "json",
success: function(json) {
debugger;
var items = json.liststoragepoolsresponse.storagepool;
if(items != null && items.length > 0) {
item = items[0];
primarystorageToMidmenu(item, $midmenuItem1);
primarystorageToRightPanel($midmenuItem1);
}
}
});
$("#right_panel_content #after_action_info").text("We are actively enabling maintenance. Please refresh periodically for an updated status.");
}
},