diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties
index b65212e5771..b8a09221fc5 100644
--- a/client/WEB-INF/classes/resources/resource.properties
+++ b/client/WEB-INF/classes/resources/resource.properties
@@ -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
diff --git a/ui/new/jsp/resource.jsp b/ui/new/jsp/resource.jsp
index 6bc32bf05a2..15a438fa8f3 100644
--- a/ui/new/jsp/resource.jsp
+++ b/ui/new/jsp/resource.jsp
@@ -46,43 +46,73 @@
- <%=t.t("Name")%>:
+ <%=t.t("name")%>:
-
+
- <%=t.t("Accounts")%>:
+ <%=t.t("dns1")%>:
- <%=t.t("Instances")%>:
+ <%=t.t("dns2")%>:
-
+
- <%=t.t("Volume")%>:
+ <%=t.t("internaldns1")%>:
+
+
+
+ <%=t.t("internaldns2")%>:
+
+
+
+
+
+
+
+ <%=t.t("guestcidraddress")%>:
+
+
+
diff --git a/ui/new/scripts/cloud.core2.resource.js b/ui/new/scripts/cloud.core2.resource.js
index 740d0c8e7c6..0f97c6c9c44 100644
--- a/ui/new/scripts/cloud.core2.resource.js
+++ b/ui/new/scripts/cloud.core2.resource.js
@@ -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) *******************************************************************************************************
}