diff --git a/ui/jsp/network.jsp b/ui/jsp/network.jsp
index ce76a370309..2032d0a0f50 100644
--- a/ui/jsp/network.jsp
+++ b/ui/jsp/network.jsp
@@ -71,73 +71,134 @@
+
- <%=t.t("Name")%>:
+ <%=t.t("state")%>:
-
-
-
-
- <%=t.t("displaytext")%>:
-
-
-
-
-
-
-
- <%=t.t("gateway")%>:
-
-
-
-
-
-
- <%=t.t("netmask")%>:
-
-
- <%=t.t("iprange")%>:
+ <%=t.t("traffic.type")%>:
- <%=t.t("domain")%>:
+ <%=t.t("broad.cast.domain.type")%>:
+
+
+
+ <%=t.t("is.shared")%>:
+
+
+
+
+
+
+ <%=t.t("is.system")%>:
+
+
+
+
+
+
+ <%=t.t("network.offering.name")%>:
+
+
+
+
+
+
+ <%=t.t("network.offering.display.text")%>:
+
+
+
+
+
+
+ <%=t.t("network.offering.id")%>:
+
+
+
+
+
+
+ <%=t.t("related")%>:
+
+
+
+
+
+
+ <%=t.t("zone.id")%>:
+
+
+
+
+
+
+
+
+ <%=t.t("domainid")%>:
+
+
@@ -150,7 +211,8 @@
-
+
+
diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js
index 351afd2d04a..91e2a073cc9 100644
--- a/ui/scripts/cloud.core.network.js
+++ b/ui/scripts/cloud.core.network.js
@@ -121,22 +121,25 @@ function publicNetworkJsonToDetailsTab() {
var $thisTab = $("#right_panel_content #public_network_page #tab_content_details");
$thisTab.find("#tab_container").hide();
$thisTab.find("#tab_spinning_wheel").show();
+
+ $thisTab.find("#grid_header_title").text(fromdb(jsonObj.networkofferingdisplaytext));
- $thisTab.find("#grid_header_title").text(fromdb(jsonObj.name));
-
- $thisTab.find("#id").text(fromdb(jsonObj.id));
- $thisTab.find("#name").text(fromdb(jsonObj.name));
- $thisTab.find("#displaytext").text(fromdb(jsonObj.displaytext));
-
- $thisTab.find("#vlan").text(fromdb(jsonObj.vlan));
- $thisTab.find("#gateway").text(fromdb(jsonObj.gateway));
- $thisTab.find("#netmask").text(fromdb(jsonObj.netmask));
- var ipRange = getIpRange(fromdb(jsonObj.startip), fromdb(jsonObj.endip));
- $thisTab.find("#iprange").text(ipRange);
-
- $thisTab.find("#domain").text(fromdb(jsonObj.domain)); //might be null
- $thisTab.find("#account").text(fromdb(jsonObj.account)); //might be null
-
+ $thisTab.find("#id").text(fromdb(jsonObj.id));
+ $thisTab.find("#state").text(fromdb(jsonObj.state));
+ $thisTab.find("#traffictype").text(fromdb(jsonObj.traffictype));
+ $thisTab.find("#broadcastdomaintype").text(fromdb(jsonObj.broadcastdomaintype));
+ setBooleanReadField(jsonObj.isshared, $thisTab.find("#isshared"));
+ setBooleanReadField(jsonObj.issystem, $thisTab.find("#issystem"));
+ $thisTab.find("#networkofferingname").text(fromdb(jsonObj.networkofferingname));
+ $thisTab.find("#networkofferingdisplaytext").text(fromdb(jsonObj.networkofferingdisplaytext));
+ $thisTab.find("#networkofferingid").text(fromdb(jsonObj.networkofferingid));
+ $thisTab.find("#related").text(fromdb(jsonObj.related));
+ $thisTab.find("#zoneid").text(fromdb(jsonObj.zoneid));
+ $thisTab.find("#dns1").text(fromdb(jsonObj.dns1));
+ $thisTab.find("#dns2").text(fromdb(jsonObj.dns2));
+ $thisTab.find("#domainid").text(fromdb(jsonObj.domainid));
+ $thisTab.find("#account").text(fromdb(jsonObj.account));
+
$thisTab.find("#tab_container").show();
$thisTab.find("#tab_spinning_wheel").hide();
}