diff --git a/ui/jsp/cluster.jsp b/ui/jsp/cluster.jsp index 237cb7e5b00..858a45c775f 100644 --- a/ui/jsp/cluster.jsp +++ b/ui/jsp/cluster.jsp @@ -118,7 +118,17 @@ dictionary = {
- + +
+
+
+ :
+
+
+
+
+
+
diff --git a/ui/jsp/pod.jsp b/ui/jsp/pod.jsp index e20ebd0fb5d..d35f527b79c 100644 --- a/ui/jsp/pod.jsp +++ b/ui/jsp/pod.jsp @@ -126,6 +126,16 @@ dictionary = { +
+
+
+ :
+
+
+
+
+
+
diff --git a/ui/jsp/zone.jsp b/ui/jsp/zone.jsp index 970ce96815b..7166ee5c3a3 100644 --- a/ui/jsp/zone.jsp +++ b/ui/jsp/zone.jsp @@ -202,6 +202,18 @@ dictionary = {
+ +
+
+
+ :
+
+
+
+
+
+
+
diff --git a/ui/scripts/cloud.core.cluster.js b/ui/scripts/cloud.core.cluster.js index f00b38ecc37..25cf7843333 100644 --- a/ui/scripts/cloud.core.cluster.js +++ b/ui/scripts/cloud.core.cluster.js @@ -72,6 +72,7 @@ function clusterJsonToDetailsTab() { $thisTab.find("#podname").text(fromdb(jsonObj.podname)); $thisTab.find("#hypervisortype").text(fromdb(jsonObj.hypervisortype)); $thisTab.find("#clustertype").text(fromdb(jsonObj.clustertype)); + $thisTab.find("#allocationstate").text(fromdb(jsonObj.allocationstate)); //actions *** var $actionLink = $thisTab.find("#action_link"); diff --git a/ui/scripts/cloud.core.pod.js b/ui/scripts/cloud.core.pod.js index 79d5241f381..8f29a9084b7 100644 --- a/ui/scripts/cloud.core.pod.js +++ b/ui/scripts/cloud.core.pod.js @@ -113,6 +113,7 @@ function podJsonToDetailsTab() { $thisTab.find("#gateway").text(fromdb(jsonObj.gateway)); $thisTab.find("#gateway_edit").val(fromdb(jsonObj.gateway)); + $thisTab.find("#allocationstate").text(fromdb(jsonObj.allocationstate)); // hide network tab upon zone vlan var networkType; diff --git a/ui/scripts/cloud.core.zone.js b/ui/scripts/cloud.core.zone.js index 58282c5b972..0069892d483 100644 --- a/ui/scripts/cloud.core.zone.js +++ b/ui/scripts/cloud.core.zone.js @@ -175,7 +175,9 @@ function zoneJsonToDetailsTab() { $readonlyFields = $("#tab_content_details").find("#name, #dns1, #dns2, #internaldns1, #internaldns2, #vlan, #guestcidraddress, #ispublic"); $editFields = $("#tab_content_details").find("#name_edit, #dns1_edit, #dns2_edit, #internaldns1_edit, #internaldns2_edit, #startvlan_edit, #endvlan_edit, #guestcidraddress_edit, #ispublic_edit"); } - + + $thisTab.find("#allocationstate").text(fromdb(jsonObj.allocationstate)); + //actions *** var $actionLink = $thisTab.find("#action_link"); bindActionLink($actionLink);