mirror of https://github.com/apache/cloudstack.git
new UI - resources page - implement zone details tab.
This commit is contained in:
Jessica Wang
parent
f06eb93c55
commit
8a413180fe
|
|
@ -64,6 +64,12 @@ value = Value
|
|||
description = Description
|
||||
category = Category
|
||||
hypervisor = Hypervisor
|
||||
dns1 = DNS 1
|
||||
dns2 = DNS 2
|
||||
internaldns1 = Internal DNS 1
|
||||
internaldns2 = Internal DNS 2
|
||||
vlan = VLAN
|
||||
guestcidraddress = Guest CIDR
|
||||
|
||||
disk.offering = Disk Offering
|
||||
copy.ISO.to = Copy ISO to
|
||||
|
|
|
|||
|
|
@ -46,43 +46,73 @@
|
|||
<div class="grid_rows even">
|
||||
<div class="grid_row_cell" style="width: 20%;">
|
||||
<div class="row_celltitles">
|
||||
<%=t.t("Name")%>:</div>
|
||||
<%=t.t("name")%>:</div>
|
||||
</div>
|
||||
<div class="grid_row_cell" style="width: 79%;">
|
||||
<div class="row_celltitles" id="name">
|
||||
</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("Accounts")%>:</div>
|
||||
<%=t.t("dns1")%>:</div>
|
||||
</div>
|
||||
<div class="grid_row_cell" style="width: 79%;">
|
||||
<div class="row_celltitles" id="redirect_to_account_page">
|
||||
<div class="row_celltitles" id="dns1">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_rows even">
|
||||
<div class="grid_row_cell" style="width: 20%;">
|
||||
<div class="row_celltitles">
|
||||
<%=t.t("Instances")%>:</div>
|
||||
<%=t.t("dns2")%>:</div>
|
||||
</div>
|
||||
<div class="grid_row_cell" style="width: 79%;">
|
||||
<div class="row_celltitles" id="redirect_to_instance_page">
|
||||
<div class="row_celltitles" id="dns2">
|
||||
</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("Volume")%>:</div>
|
||||
<%=t.t("internaldns1")%>:</div>
|
||||
</div>
|
||||
<div class="grid_row_cell" style="width: 79%;">
|
||||
<div class="row_celltitles" id="redirect_to_volume_page">
|
||||
<div class="row_celltitles" id="internaldns1">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_rows even">
|
||||
<div class="grid_row_cell" style="width: 20%;">
|
||||
<div class="row_celltitles">
|
||||
<%=t.t("internaldns2")%>:</div>
|
||||
</div>
|
||||
<div class="grid_row_cell" style="width: 79%;">
|
||||
<div class="row_celltitles" id="internaldns2">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_rows even">
|
||||
<div class="grid_row_cell" style="width: 20%;">
|
||||
<div class="row_celltitles">
|
||||
<%=t.t("vlan")%>:</div>
|
||||
</div>
|
||||
<div class="grid_row_cell" style="width: 79%;">
|
||||
<div class="row_celltitles" id="vlan">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_rows even">
|
||||
<div class="grid_row_cell" style="width: 20%;">
|
||||
<div class="row_celltitles">
|
||||
<%=t.t("guestcidraddress")%>:</div>
|
||||
</div>
|
||||
<div class="grid_row_cell" style="width: 79%;">
|
||||
<div class="row_celltitles" id="guestcidraddress">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Details tab (end)-->
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
function afterLoadResourceJSP() {
|
||||
var $zonePage = $("#zone_page");
|
||||
var $podPage = $("#pod_page");
|
||||
var $clusterPage = $("#cluster_page");
|
||||
var $hostPage = $("#host_page");
|
||||
var $primarystoragePage = $("#primarystorage_page");
|
||||
var $systemvmPage = $("#systemvm_page");
|
||||
var $rightPanelConent = $("#right_panel_content");
|
||||
var $zonePage = $rightPanelConent.find("#zone_page");
|
||||
var $podPage = $rightPanelConent.find("#pod_page");
|
||||
var $clusterPage = $rightPanelConent.find("#cluster_page");
|
||||
var $hostPage = $rightPanelConent.find("#host_page");
|
||||
var $primarystoragePage = $rightPanelConent.find("#primarystorage_page");
|
||||
var $systemvmPage = $rightPanelConent.find("#systemvm_page");
|
||||
|
||||
var pageArray = [$zonePage, $podPage, $clusterPage, $hostPage, $primarystoragePage, $systemvmPage];
|
||||
|
||||
|
|
@ -16,13 +17,8 @@ function afterLoadResourceJSP() {
|
|||
pageArray[i].hide();
|
||||
}
|
||||
}
|
||||
|
||||
//***** switch between different tabs in zone page (begin) ********************************************************************
|
||||
var tabArray = [$zonePage.find("#tab_details"), $zonePage.find("#tab_network"), $zonePage.find("#tab_secondary_storage")];
|
||||
var tabContentArray = [$zonePage.find("#tab_content_details"), $zonePage.find("#tab_content_network"), $zonePage.find("#tab_content_secondary_storage")];
|
||||
switchBetweenDifferentTabs(tabArray, tabContentArray);
|
||||
//***** switch between different tabs in zone page (end) **********************************************************************
|
||||
|
||||
|
||||
//***** build zone tree (begin) ***********************************************************************************************
|
||||
var forceLogout = true; // We force a logout only if the user has first added a POD for the very first time
|
||||
var $zoneetree1 = $("#zonetree").clone().attr("id", "zonetree1");
|
||||
$("#midmenu_container").append($zoneetree1.show());
|
||||
|
|
@ -218,7 +214,7 @@ function afterLoadResourceJSP() {
|
|||
target.parent().parent().parent().addClass("selected");
|
||||
showPage($zonePage);
|
||||
var obj = {"id": target.data("id"), "name": target.data("name"), "dns1": target.data("dns1"), "dns2": target.data("dns2"), "internaldns1": target.data("internaldns1"), "internaldns2": target.data("internaldns2"), "vlan": target.data("vlan"), "guestcidraddress": target.data("guestcidraddress")};
|
||||
//zoneObjectToRightPanel(obj);
|
||||
zoneJsonToDetailsTab(obj);
|
||||
break;
|
||||
|
||||
|
||||
|
|
@ -311,7 +307,6 @@ function afterLoadResourceJSP() {
|
|||
}
|
||||
return false;
|
||||
});
|
||||
|
||||
|
||||
function getIpRange(startip, endip) {
|
||||
var ipRange = "";
|
||||
|
|
@ -322,6 +317,27 @@ function afterLoadResourceJSP() {
|
|||
ipRange = ipRange + "-" + endip;
|
||||
}
|
||||
return ipRange;
|
||||
}
|
||||
}
|
||||
//***** build zone tree (end) *************************************************************************************************
|
||||
|
||||
//***** zone page (begin) *****************************************************************************************************
|
||||
//switch between different tabs in zone page
|
||||
var tabArray = [$zonePage.find("#tab_details"), $zonePage.find("#tab_network"), $zonePage.find("#tab_secondary_storage")];
|
||||
var tabContentArray = [$zonePage.find("#tab_content_details"), $zonePage.find("#tab_content_network"), $zonePage.find("#tab_content_secondary_storage")];
|
||||
switchBetweenDifferentTabs(tabArray, tabContentArray);
|
||||
|
||||
function zoneJsonToDetailsTab(jsonObj) {
|
||||
var $detailsTab = $zonePage.find("#tab_content_details");
|
||||
$detailsTab.data("jsonObj", jsonObj);
|
||||
$detailsTab.find("#id").text(fromdb(jsonObj.id));
|
||||
$detailsTab.find("#name").text(fromdb(jsonObj.name));
|
||||
$detailsTab.find("#dns1").text(fromdb(jsonObj.dns1));
|
||||
$detailsTab.find("#dns2").text(fromdb(jsonObj.dns2));
|
||||
$detailsTab.find("#internaldns1").text(fromdb(jsonObj.internaldns1));
|
||||
$detailsTab.find("#internaldns2").text(fromdb(jsonObj.internaldns2));
|
||||
$detailsTab.find("#vlan").text(fromdb(jsonObj.vlan));
|
||||
$detailsTab.find("#guestcidraddress").text(fromdb(jsonObj.guestcidraddress));
|
||||
}
|
||||
//***** zone page (end) *******************************************************************************************************
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue