From 4ea842433290b8196dcb6203b04156726622bdb7 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 10 Dec 2010 19:51:31 -0800
Subject: [PATCH] External Firewall, External Load Balancer - change lable from
 "URL" to "IP" since what API returns is actually IP instead of URL.

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

diff --git a/ui/jsp/network.jsp b/ui/jsp/network.jsp
index 499523f9633..3d495533f26 100644
--- a/ui/jsp/network.jsp
+++ b/ui/jsp/network.jsp
@@ -439,23 +439,13 @@
     <div class="grid_rows even">
         <div class="grid_row_cell" style="width: 20%;">
             <div class="row_celltitles">
-                URL:</div>
+                IP:</div>
         </div>
         <div class="grid_row_cell" style="width: 79%;">
             <div class="row_celltitles" id="url">
             </div>
         </div>
-    </div>    
-    <div class="grid_rows odd">
-        <div class="grid_row_cell" style="width: 20%;">
-            <div class="row_celltitles">
-                Type:</div>
-        </div>
-        <div class="grid_row_cell" style="width: 79%;">
-            <div class="row_celltitles" id="type">
-            </div>
-        </div>
-    </div> 
+    </div>  
 </div>
 <!--  External Firewall template (end) -->
 
@@ -500,23 +490,13 @@
     <div class="grid_rows even">
         <div class="grid_row_cell" style="width: 20%;">
             <div class="row_celltitles">
-                URL:</div>
+                IP:</div>
         </div>
         <div class="grid_row_cell" style="width: 79%;">
             <div class="row_celltitles" id="url">
             </div>
         </div>
-    </div>    
-    <div class="grid_rows odd">
-        <div class="grid_row_cell" style="width: 20%;">
-            <div class="row_celltitles">
-                Type:</div>
-        </div>
-        <div class="grid_row_cell" style="width: 79%;">
-            <div class="row_celltitles" id="type">
-            </div>
-        </div>
-    </div> 
+    </div>        
 </div>
 <!--  Load Balancer template (end) -->
 
diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js
index 9734fcafdc5..ed640173918 100644
--- a/ui/scripts/cloud.core.network.js
+++ b/ui/scripts/cloud.core.network.js
@@ -248,8 +248,7 @@ function publicNetworkFirewallJsonToTemplate(jsonObj, $template) {
     $template.attr("id", "publicNetworkFirewall_" + jsonObj.id);
         
     $template.find("#grid_header_title").text(fromdb(jsonObj.url));    
-    $template.find("#id").text(fromdb(jsonObj.id));
-    $template.find("#type").text(fromdb(jsonObj.type));
+    $template.find("#id").text(fromdb(jsonObj.id));    
     $template.find("#url").text(fromdb(jsonObj.url));   
    
     var $actionLink = $template.find("#firewall_action_link");		
@@ -320,8 +319,7 @@ function publicNetworkLoadBalancerJsonToTemplate(jsonObj, $template) {
     $template.attr("id", "publicNetworkLoadBalancer_" + jsonObj.id);
         
     $template.find("#grid_header_title").text(fromdb(jsonObj.url));    
-    $template.find("#id").text(fromdb(jsonObj.id));
-    $template.find("#type").text(fromdb(jsonObj.type));
+    $template.find("#id").text(fromdb(jsonObj.id));   
     $template.find("#url").text(fromdb(jsonObj.url));   
    
     var $actionLink = $template.find("#loadbalancer_action_link");