diff --git a/ui/jsp/network.jsp b/ui/jsp/network.jsp index 272d564df59..499523f9633 100644 --- a/ui/jsp/network.jsp +++ b/ui/jsp/network.jsp @@ -548,6 +548,16 @@
+
+
+ ID:
+
+
+
+
+
+
+
VLAN:
@@ -557,26 +567,16 @@
-
-
-
- Start IP:
-
-
-
-
-
-
- End IP:
+ IP Range:
-
+
-
+ diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js index ac504dc6e2a..1158129511e 100644 --- a/ui/scripts/cloud.core.network.js +++ b/ui/scripts/cloud.core.network.js @@ -191,9 +191,9 @@ function publicNetworkIprangeJsonToTemplate(jsonObj, $template) { var ipRange = getIpRange(fromdb(jsonObj.startip), fromdb(jsonObj.endip)); $template.find("#grid_header_title").text(ipRange); - $template.find("#vlan").text(jsonObj.vlan) - $template.find("#startip").text(fromdb(jsonObj.startip)); - $template.find("#endip").text(fromdb(jsonObj.endip)); + $template.find("#id").text(jsonObj.id); + $template.find("#vlan").text(jsonObj.vlan); + $template.find("#iprange").text(ipRange); var $actionLink = $template.find("#iprange_action_link"); $actionLink.bind("mouseover", function(event) { @@ -941,10 +941,10 @@ function directNetworkIprangeJsonToTemplate(jsonObj, $template) { var ipRange = getIpRange(fromdb(jsonObj.startip), fromdb(jsonObj.endip)); $template.find("#grid_header_title").text(ipRange); - $template.find("#vlan").text(jsonObj.vlan) - $template.find("#startip").text(fromdb(jsonObj.startip)); - $template.find("#endip").text(fromdb(jsonObj.endip)); - + $template.find("#id").text(jsonObj.id) + $template.find("#vlan").text(jsonObj.vlan); + $template.find("#iprange").text(ipRange); + var $actionLink = $template.find("#iprange_action_link"); $actionLink.bind("mouseover", function(event) { $(this).find("#iprange_action_menu").show();