From 830995380da4176004167203098fd8d42c5ce86e Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 20 Dec 2010 11:18:22 -0800
Subject: [PATCH] IP Address page - add Associated Network ID field.

---
 ui/jsp/ipaddress.jsp               | 18 ++++++++++++++----
 ui/scripts/cloud.core.ipaddress.js |  2 +-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ui/jsp/ipaddress.jsp b/ui/jsp/ipaddress.jsp
index 697a5bfde33..51182f71cc9 100644
--- a/ui/jsp/ipaddress.jsp
+++ b/ui/jsp/ipaddress.jsp
@@ -110,6 +110,16 @@
 	                </div>
 	            </div>
 	            <div class="grid_rows even">
+	                <div class="grid_row_cell" style="width: 20%;">
+	                    <div class="row_celltitles">
+	                        Associated Network ID:</div>
+	                </div>
+	                <div class="grid_row_cell" style="width: 79%;">
+	                    <div class="row_celltitles" id="associatednetworkid">
+	                    </div>
+	                </div>
+	            </div>
+	            <div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        Domain:</div>
@@ -119,7 +129,7 @@
 	                    </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">
 	                        Account:</div>
@@ -129,7 +139,7 @@
 	                    </div>
 	                </div>
 	            </div>
-	            <div class="grid_rows even">
+	            <div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        Allocated:</div>
@@ -139,7 +149,7 @@
 	                    </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">
 	                        Static NAT:</div>
@@ -149,7 +159,7 @@
 	                    </div>
 	                </div>
 	            </div>	 
-	            <div class="grid_rows even" id="vm_of_static_nat_container" style="display:none">
+	            <div class="grid_rows odd" id="vm_of_static_nat_container" style="display:none">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        VM of Static NAT:</div>
diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js
index bbfe13a543d..a9d25751aa3 100644
--- a/ui/scripts/cloud.core.ipaddress.js
+++ b/ui/scripts/cloud.core.ipaddress.js
@@ -839,7 +839,7 @@ function ipJsonToDetailsTab() {
     $thisTab.find("#vlanname").text(fromdb(ipObj.vlanname));    
     setBooleanReadField(ipObj.issourcenat, $thisTab.find("#source_nat")); 
     setNetworkTypeField(ipObj.forvirtualnetwork, $thisTab.find("#network_type"));    
-    
+    $thisTab.find("#associatednetworkid").text(fromdb(ipObj.associatednetworkid));
     $thisTab.find("#domain").text(fromdb(ipObj.domain));
     $thisTab.find("#account").text(fromdb(ipObj.account));
     $thisTab.find("#allocated").text(fromdb(ipObj.allocated));