From 3941e98dbbc0af3a393dd1549b8d77fa09c3ea56 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 21 Jan 2011 14:31:53 -0800
Subject: [PATCH] bug 8158: Network page - public network - IP Range - add
 domain, account row.

---
 ui/jsp/network.jsp               | 22 +++++++++++++++++++++-
 ui/scripts/cloud.core.network.js |  4 +++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/ui/jsp/network.jsp b/ui/jsp/network.jsp
index 0c435d1b596..ceebc5e5936 100644
--- a/ui/jsp/network.jsp
+++ b/ui/jsp/network.jsp
@@ -625,7 +625,27 @@
             <div class="row_celltitles" id="iprange">
             </div>
         </div>
-    </div>      
+    </div>     
+    <div class="grid_rows even">
+        <div class="grid_row_cell" style="width: 20%;">
+            <div class="row_celltitles">
+                Domain:</div>
+        </div>
+        <div class="grid_row_cell" style="width: 79%;">
+            <div class="row_celltitles" id="domain">
+            </div>
+        </div>
+    </div>        
+    <div class="grid_rows odd">
+        <div class="grid_row_cell" style="width: 20%;">
+            <div class="row_celltitles">
+                Account:</div>
+        </div>
+        <div class="grid_row_cell" style="width: 79%;">
+            <div class="row_celltitles" id="account">
+            </div>
+        </div>
+    </div>    
 </div>
 <!--  Public IP Range template (end) -->
 
diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js
index e2757fce5de..25fd3e7dcbd 100644
--- a/ui/scripts/cloud.core.network.js
+++ b/ui/scripts/cloud.core.network.js
@@ -216,7 +216,9 @@ function publicNetworkIprangeJsonToTemplate(jsonObj, $template) {
     $template.find("#vlan").text(jsonObj.vlan);    
     $template.find("#gateway").text(jsonObj.gateway);
     $template.find("#netmask").text(jsonObj.netmask);    
-    $template.find("#iprange").text(ipRange);   
+    $template.find("#iprange").text(ipRange);     
+    $template.find("#domain").text(jsonObj.domain);
+    $template.find("#account").text(jsonObj.account);
    
     var $actionLink = $template.find("#iprange_action_link");		
 	$actionLink.bind("mouseover", function(event) {