From c851253969d10126dac6050bb491fcda1648e9ec Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 27 Apr 2011 15:29:03 -0700
Subject: [PATCH] =?UTF-8?q?cloudStack=20UI=20-=20zone=20tree=20-=20basic?=
 =?UTF-8?q?=20zone=20-=20add=20network=20tab.=20=E2=80=9CAdd=20IP=20Range?=
 =?UTF-8?q?=E2=80=9D=20button=20and=20=E2=80=9CAdd=20Firewall=E2=80=9D=20b?=
 =?UTF-8?q?utton=20are=20available.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/index.jsp                      |  2 +-
 ui/scripts/cloud.core.network.js  | 56 +++++++++++++++----------------
 ui/scripts/cloud.core.resource.js |  5 ++-
 3 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/ui/index.jsp b/ui/index.jsp
index 37709fc1ac7..037a381e81b 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -867,7 +867,7 @@
 	            </div>
 	        </div>	      
             	            
-            <div id="network_header" class="leftmenu_content" style="display: none">
+            <div id="network_header" class="leftmenu_content">
 	            <div class="leftmenu_fourthindent">
 	                <div class="leftmenu_arrows white_nonexpanded_close" id="network_arrow">
 	                </div>	                
diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js
index 985b20ee793..9895eed190c 100644
--- a/ui/scripts/cloud.core.network.js
+++ b/ui/scripts/cloud.core.network.js
@@ -505,32 +505,25 @@ function doDeleteExternalLoadBalancer($actionLink, $subgridItem) {
 
 function bindAddIpRangeToPublicNetworkButton($button, $midmenuItem1) {   
     var jsonObj = $midmenuItem1.data("jsonObj");      
-    
+    
+    //***** binding Event Handler (begin) ******  		
     var $dialogAddIpRangeToPublicNetwork = $("#dialog_add_iprange_to_publicnetwork"); 
-         
-    //***** binding Event Handler (begin) ******   
-	if (zoneObj.networktype == "Advanced") {
-		$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_tagged").change(function(event) {	
-			if ($(this).val() == "tagged") {
-				$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_vlan_container").show();
-				//$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_pod_container").hide();
-								
-				$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_scope").empty().append('<option value="zone-wide">zone-wide</option>').append('<option value="account-specific">account-specific</option>');
-			} 
-			else if($(this).val() == "untagged") {  
-				$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_vlan_container").hide();
-				//$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_pod_container").hide();
-				
-				$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_scope").empty().append('<option value="zone-wide">zone-wide</option>');				
-			}			
-			
-			// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#domain_container", "#add_publicip_vlan_account_container". 
-			$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_scope").change(); 	
-			
-			return false;
-		});
-	} 
-	
+    $dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_tagged").change(function(event) {	
+		if ($(this).val() == "tagged") {
+			$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_vlan_container").show();				
+			$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_scope").empty().append('<option value="zone-wide">zone-wide</option>').append('<option value="account-specific">account-specific</option>');
+		} 
+		else if($(this).val() == "untagged") {  
+			$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_vlan_container").hide();
+			$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_scope").empty().append('<option value="zone-wide">zone-wide</option>');				
+		}			
+		
+		// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#domain_container", "#add_publicip_vlan_account_container". 
+		$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_scope").change(); 	
+		
+		return false;
+	});    
+   
 	$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_scope").change(function(event) {	   
 	    if($(this).val() == "zone-wide") {
 	        $dialogAddIpRangeToPublicNetwork.find("#domain_container").hide();
@@ -542,7 +535,15 @@ function bindAddIpRangeToPublicNetworkButton($button, $midmenuItem1) {
 	    }		    
 	    return false;
 	});
-	//***** binding Event Handler (end) ******   
+	//***** binding Event Handler (end) ******   
+	
+	if (zoneObj.networktype == "Basic") {
+	    $("#add_network_button,#add_load_balancer_button,#tab_loadbalancer").hide();	
+	} 
+	else { // zoneObj.networktype == "Advanced"
+		$("#add_network_button,#add_load_balancer_button,#tab_loadbalancer").show();	
+	}		
+		
     $button.show();   
     $button.unbind("click").bind("click", function(event) {  
         if($("#public_network_page").find("#tab_content_ipallocation").css("display") == "none")         
@@ -860,8 +861,7 @@ function bindAddLoadBalancerButton($button, $midmenuItem1) {
     var jsonObj = $midmenuItem1.data("jsonObj");      
     
     var $dialogAddLoadBalancer = $("#dialog_add_load_balancer"); 
-          
-    $button.show();   
+              
     $button.unbind("click").bind("click", function(event) {         
         if($("#public_network_page").find("#tab_content_loadbalancer").css("display") == "none")         
             $("#public_network_page").find("#tab_loadbalancer").click();
diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
index 71730ba4adf..a8a5aeb0f2f 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -334,13 +334,16 @@ function zoneJSONToTreeNode(jsonObj, $zoneNode) {
     $zoneNode.data("jsonObj", jsonObj);
     $zoneNode.find("#secondarystorage_header").data("zoneObj", jsonObj);    
     
+    $zoneNode.find("#network_header").data("jsonObj", jsonObj);	
+    /*
     if(jsonObj.networktype == "Advanced") {  //Advanced Zone
         $zoneNode.find("#network_header").show().data("jsonObj", jsonObj);		 
     }
     else { //Basic Zone
         $zoneNode.find("#network_header").hide();
     }
-        
+    */
+    
     $zoneNode.data("id", zoneid).data("name", fromdb(jsonObj.name));
     var zoneName = $zoneNode.find("#zone_name").text(fromdb(jsonObj.name));	    
     zoneName.data("jsonObj", jsonObj);