From 5662ea7d9064dad91878dbd7ce0ed1773e967e5d Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 9 Dec 2010 11:47:44 -0800
Subject: [PATCH] bug 7448: zone tree - network - direct network page - details
 tab - remove IP range row.

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

diff --git a/ui/jsp/network.jsp b/ui/jsp/network.jsp
index ea218af71fc..cab9acc8310 100644
--- a/ui/jsp/network.jsp
+++ b/ui/jsp/network.jsp
@@ -355,18 +355,8 @@
 	                        <div class="row_celltitles" id="netmask">
 	                        </div>
 	                    </div>
-	                </div>
+	                </div>	               
 	                <div class="grid_rows odd">
-	                    <div class="grid_row_cell" style="width: 20%;">
-	                        <div class="row_celltitles">
-	                            <%=t.t("iprange")%>:</div>
-	                    </div>
-	                    <div class="grid_row_cell" style="width: 79%;">
-	                        <div class="row_celltitles" id="iprange">
-	                        </div>
-	                    </div>
-	                </div>
-	                <div class="grid_rows even">
 	                    <div class="grid_row_cell" style="width: 20%;">
 	                        <div class="row_celltitles">
 	                            <%=t.t("domain")%>:</div>
@@ -376,7 +366,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">
 	                            <%=t.t("account")%>:</div>
diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js
index 0e237ae528a..0c76f06b392 100644
--- a/ui/scripts/cloud.core.network.js
+++ b/ui/scripts/cloud.core.network.js
@@ -99,7 +99,7 @@ function publicNetworkToMidmenu(jsonObj, $midmenuItem1) {
     */
          
     $midmenuItem1.find("#first_row").text("Public Network"); 
-    $midmenuItem1.find("#second_row").text("VLAN: multiple");   
+    $midmenuItem1.find("#second_row").text("VLAN: Multiple");   
 }
 
 function publicNetworkToRightPanel($midmenuItem1) {      
@@ -551,9 +551,7 @@ function directNetworkJsonToDetailsTab() {
     $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