From a4f35f90cea8f4a6c9cc52f7f55a53152b8915e4 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 8 Dec 2010 18:52:44 -0800
Subject: [PATCH] bug 7448: zone tree - network - change element ID of IP range
 template since it's shared by both public network and direct network.

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

diff --git a/ui/jsp/network.jsp b/ui/jsp/network.jsp
index 2032d0a0f50..fe08e2010d8 100644
--- a/ui/jsp/network.jsp
+++ b/ui/jsp/network.jsp
@@ -409,8 +409,8 @@
         
 </div>
 
-<!--  Direct Network - IP Allocation tab template (begin) -->
-<div class="grid_container" id="directnetwork_iprange_template" style="display: none">
+<!--  IP Range template (begin) -->
+<div class="grid_container" id="iprange_template" style="display: none">
     <div class="grid_header">
         <div class="grid_header_title" id="grid_header_title">
         </div>        
@@ -446,4 +446,4 @@
         </div>
     </div> 
 </div>
-<!--  Direct Network - IP Allocation tab template (end) -->
\ No newline at end of file
+<!--  IP Range template (end) -->
\ No newline at end of file
diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js
index c1909ce12b5..821acf2dd1b 100644
--- a/ui/scripts/cloud.core.network.js
+++ b/ui/scripts/cloud.core.network.js
@@ -163,7 +163,7 @@ function publicNetworkJsonToIpAllocationTab() {
 		success: function(json) {		    
 		    var items = json.listvlaniprangesresponse.vlaniprange;		    
 		    var $container = $thisTab.find("#tab_container").empty();
-		    var $template = $("#directnetwork_iprange_template");
+		    var $template = $("#iprange_template");
 		    if(items != null && items.length > 0) {		        
 		        for(var i=0; i<items.length; i++) {
 		            var $newTemplate = $template.clone();
@@ -307,7 +307,7 @@ function directNetworkJsonToIpAllocationTab() {
 		success: function(json) {
 		    var items = json.listvlaniprangesresponse.vlaniprange;		    
 		    var $container = $thisTab.find("#tab_container").empty();
-		    var $template = $("#directnetwork_iprange_template");
+		    var $template = $("#iprange_template");
 		    if(items != null && items.length > 0) {		        
 		        for(var i=0; i<items.length; i++) {
 		            var $newTemplate = $template.clone();