From b59fcc50e7d3abd8849ea60fb121a8e55f31677c Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 12 Nov 2010 10:15:53 -0800
Subject: [PATCH] new UI - link Add Zone button on top to new Add Zone Pod
 Wizard.

---
 ui/scripts/cloud.core.resource.js | 33 +++++++++++++++++++------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
index cbe27547af2..1a5b2efa01b 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -246,12 +246,27 @@ function resourceLoadPage(pageToShow, $midmenuItem1) {   //$midmenuItem1 is eith
 
 function afterLoadResourceJSP($midmenuItem1) {
     hideMiddleMenu();        
-    initAddZoneButton($("#midmenu_add_link")); 
+    
+    //initAddZoneButton($("#midmenu_add_link")); 
+    $("#midmenu_add_link").show().find("#label").text("Add Zone");   
+    
+    initAddZoneWizard();  
+	initAddZoneLinks();	 
+    
 	initUpdateConsoleCertButton($("#midmenu_add2_link"));
     initDialog("dialog_add_zone");
 	initDialog("dialog_update_cert", 450);	
-	resourceCountTotal();
-	initAddZoneShortcut();     
+	resourceCountTotal();	  
+}
+
+function initAddZoneLinks() {     
+    $("#add_zone_shortcut,#midmenu_add_link").unbind("click").bind("click", function(event) {              
+        if($("#leftmenu_physical_resource").find("#physical_resource_arrow").hasClass("expanded_close") == true)
+			expandOrCollapseZoneTree(); //if Physical Resource arrow shows closed (i.e. zonetree is hidden), expand and show zonetree.    
+			       
+        openAddZoneWizard();
+        return false;
+    });            
 }
 
 function resourceCountTotal() {		
@@ -320,7 +335,7 @@ function closeAddZoneWizard() {
     $("#wizard_overlay").hide();
 }
 
-function initAddZoneShortcut() {    
+function initAddZoneWizard() {    
     var $addZoneWizard = $("#add_zone_wizard");
     $addZoneWizard.find("#add_zone_public").unbind("change").bind("change", function(event) {        
         if($(this).val() == "true") {  //public zone
@@ -346,15 +361,7 @@ function initAddZoneShortcut() {
 			} 
 		}
 	});    
-    
-    $("#add_zone_shortcut").unbind("click").bind("click", function(event) {              
-        if($("#leftmenu_physical_resource").find("#physical_resource_arrow").hasClass("expanded_close") == true)
-			expandOrCollapseZoneTree(); //if Physical Resource arrow shows closed (i.e. zonetree is hidden), expand and show zonetree.    
-       
-        openAddZoneWizard();
-        return false;
-    });    
-          
+     
     $addZoneWizard.unbind("click").bind("click", function(event) {  
         var $thisWizard = $(this);
         var $target = $(event.target);