From c10b79c7b031600dc299d4a254b883ce0cf08e17 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 21 Dec 2010 16:58:36 -0800
Subject: [PATCH] bug 7604: physical resource - zone - network - create network
 - call even handler of VLAN scope when everytime Create Network Button is
 clicked.

---
 ui/jsp/network.jsp               | 10 ++++-----
 ui/scripts/cloud.core.network.js | 38 ++++++++------------------------
 2 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/ui/jsp/network.jsp b/ui/jsp/network.jsp
index d5b8d1cf96d..494921f77f5 100644
--- a/ui/jsp/network.jsp
+++ b/ui/jsp/network.jsp
@@ -901,14 +901,14 @@
     <div class="dialog_formcontent">
         <form action="#" method="post" id="form_acquire">
         <ol>            
-			<li style="display: none" id="add_publicip_vlan_network_name_container">
+			<li>
                 <label for="user_name">
                     Network Name:</label>
                 <input class="text" type="text" name="add_publicip_vlan_network_name" id="add_publicip_vlan_network_name" />
                 <div id="add_publicip_vlan_network_name_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
-			<li style="display: none" id="add_publicip_vlan_network_desc_container">
+			<li>
                 <label for="user_name">
                     Network Desc:</label>
                 <input class="text" type="text" name="add_publicip_vlan_network_desc" id="add_publicip_vlan_network_desc" />
@@ -932,11 +932,9 @@
             <li id="add_publicip_vlan_scope_container">
                 <label for="add_publicip_vlan_scope">
                     Scope:</label>
-                <select class="select" name="add_publicip_vlan_scope" id="add_publicip_vlan_scope">
-                    <!--  
+                <select class="select" id="add_publicip_vlan_scope">                    
                     <option value="zone-wide">zone-wide</option>
-                    <option value="account-specific">account-specific</option>
-                    -->
+                    <option value="account-specific">account-specific</option>                   
                 </select>
             </li>           
             <li style="display: none" id="add_publicip_vlan_domain_container">
diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js
index 384ef859f71..f351787011d 100644
--- a/ui/scripts/cloud.core.network.js
+++ b/ui/scripts/cloud.core.network.js
@@ -521,7 +521,7 @@ function bindAddIpRangeToPublicNetworkButton($button, $midmenuItem1) {
 				}
 								
 				var scopeParams = "";
-				if($dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_scope").val()=="account-specific") {
+				if($dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_scope").val() == "account-specific") {
 				    scopeParams = "&domainId="+trim($thisDialog.find("#add_publicip_vlan_domain").val())+"&account="+trim($thisDialog.find("#add_publicip_vlan_account").val());  
 				} else if (isDirect) {
 					scopeParams = "&isshared=true";
@@ -1003,26 +1003,8 @@ function bindAddNetworkButton($button) {
         return;
     
     var $dialogAddNetworkForZone = $("#dialog_add_network_for_zone"); 
-     
-    //***** binding Event Handler (begin) ******    
-    $dialogAddNetworkForZone.find("#add_publicip_vlan_network_name_container, #add_publicip_vlan_network_desc_container").show();	
-								
-	$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").empty().append('<option value="zone-wide">zone-wide</option>').append('<option value="account-specific">account-specific</option>');
-	 						
-	// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#add_publicip_vlan_domain_container", "#add_publicip_vlan_account_container". 
-	$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").change(); 
-		
-	// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#add_publicip_vlan_domain_container", "#add_publicip_vlan_account_container". 
-	$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").change(); 	
-        	
-	if (zoneObj.networktype == "Advanced") {	
-	
-	} 
-	else {
-		$dialogAddNetworkForZone.find("#add_publicip_vlan_container").hide();
-	}
-	
-	$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").change(function(event) {	   
+     
+	$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").change(function(event) {		    
 	    if($(this).val() == "zone-wide") {
 	        $dialogAddNetworkForZone.find("#add_publicip_vlan_domain_container").hide();
 			$dialogAddNetworkForZone.find("#add_publicip_vlan_account_container").hide();    
@@ -1033,15 +1015,13 @@ function bindAddNetworkButton($button) {
 	    }		    
 	    return false;
 	});
-	//***** binding Event Handler (end) ******   
- 
-    $button.show();   
-    $button.unbind("click").bind("click", function(event) {  
-        $dialogAddNetworkForZone.find("#info_container").hide();
-        $dialogAddNetworkForZone.find("#zone_name").text(fromdb(zoneObj.name));         
-		$dialogAddNetworkForZone.find("#add_publicip_vlan_domain_container, #add_publicip_vlan_account_container").hide();
+	    
+    $button.unbind("click").bind("click", function(event) {   
+	    $dialogAddNetworkForZone.find("#info_container").hide();
+        $dialogAddNetworkForZone.find("#zone_name").text(fromdb(zoneObj.name));  
 		$dialogAddNetworkForZone.find("#add_publicip_vlan_vlan, #add_publicip_vlan_gateway, #add_publicip_vlan_netmask, #add_publicip_vlan_startip, #add_publicip_vlan_endip, #add_publicip_vlan_account").val("");
-						
+		$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").change();  	                    
+        				
 		if (zoneObj.networktype == 'Basic') {
 			
 		}