From 9a2380c337c419e9e6892f3ae4e41ae5e56361cd Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 26 Oct 2010 09:33:08 -0700
Subject: [PATCH] new UI - add secondary storage - do not show action info
 inside subgrid item (action info will be shown in dialog if action fails).

---
 ui/new/scripts/cloud.core2.js          |  4 ++--
 ui/new/scripts/cloud.core2.resource.js | 23 +++++++++--------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js
index 2248641044f..52d669082a0 100644
--- a/ui/new/scripts/cloud.core2.js
+++ b/ui/new/scripts/cloud.core2.js
@@ -884,8 +884,8 @@ function handleErrorInDialog(XMLHttpResponse, $thisDialog) {
 	else 
 	    $infoContainer.find("#info").text("action failed");	
 	
-	$thisDialog.find("#spinning_wheel").fadeOut("slow");
-	$infoContainer.fadeIn("slow");
+	$thisDialog.find("#spinning_wheel").hide();
+	$infoContainer.show();
 }
 
 
diff --git a/ui/new/scripts/cloud.core2.resource.js b/ui/new/scripts/cloud.core2.resource.js
index efa469d3c7e..7b94e62a369 100644
--- a/ui/new/scripts/cloud.core2.resource.js
+++ b/ui/new/scripts/cloud.core2.resource.js
@@ -904,7 +904,7 @@ function initAddVLANButton($addButton) {
 				    return;		
 				    
 				//$thisDialog.dialog("close"); 		//only close dialog when this action succeeds		
-				$thisDialog.find("#spinning_wheel").fadeIn("slow");
+				$thisDialog.find("#spinning_wheel").show()
 				
 				var vlan = trim($thisDialog.find("#add_publicip_vlan_vlan").val());
 				if (isTagged) {
@@ -978,7 +978,7 @@ function initAddSecondaryStorageButton($addButton) {
 			    if (!isValid) 
 			        return;
 			    
-				$thisDialog.find("#spinning_wheel").fadeIn("slow");
+				$thisDialog.find("#spinning_wheel").show()
 								     					  								            				
 			    var zoneId = zoneObj.id;		
 			    var nfs_server = trim($thisDialog.find("#nfs_server").val());		
@@ -992,16 +992,11 @@ function initAddSecondaryStorageButton($addButton) {
 				        $thisDialog.find("#spinning_wheel").hide();				        
 				        $thisDialog.dialog("close");
 					
-					    var $subgridItem = $("#secondary_storage_tab_template").clone(true);	
-	                    var $spinningWheel = $subgridItem.find("#spinning_wheel");
-                        $spinningWheel.find("#description").text("Adding Secondary Storage....");  
-                        $spinningWheel.show();  
-                        $subgridItem.find("#after_action_info_container").removeClass("error").addClass("success").hide();  
-                        $("#zone_page").find("#tab_content_secondarystorage").append($subgridItem.show());  
-				    					        
-				        secondaryStorageJSONToTemplate(json.addsecondarystorageresponse.secondarystorage[0], $subgridItem);				        
+					    var $subgridItem = $("#secondary_storage_tab_template").clone(true);	                        
+				        secondaryStorageJSONToTemplate(json.addsecondarystorageresponse.secondarystorage[0], $subgridItem);	
 	                    $subgridItem.find("#after_action_info").text("Secondary storage was added successfully.");
                         $subgridItem.find("#after_action_info_container").removeClass("error").addClass("success").show();  
+                        $("#zone_page").find("#tab_content_secondarystorage").append($subgridItem.show());  
 				    },			
                     error: function(XMLHttpResponse) {	
                         handleErrorInDialog(XMLHttpResponse, $thisDialog);		 
@@ -1080,7 +1075,7 @@ function initAddZoneButton($midmenuAddLink1) {
 				if (!isValid) 
 				    return;							
 				
-				$thisDialog.find("#spinning_wheel").fadeIn("slow");
+				$thisDialog.find("#spinning_wheel").show()
 				
 				var moreCriteria = [];	
 				
@@ -1175,7 +1170,7 @@ function initAddPodButton($midmenuAddLink1) {
 		        if (!isValid) 
 		            return;			
                 
-                $thisDialog.find("#spinning_wheel").fadeIn("slow");
+                $thisDialog.find("#spinning_wheel").show()
                   
                 var name = trim($thisDialog.find("#add_pod_name").val());
 		        var cidr = trim($thisDialog.find("#add_pod_cidr").val());
@@ -1277,7 +1272,7 @@ function initAddHostButton($midmenuAddLink1) {
 		            return;
 		            
 				//$thisDialog.dialog("close");   //only close dialog when this action succeeds		
-				$thisDialog.find("#spinning_wheel").fadeIn("slow"); 				
+				$thisDialog.find("#spinning_wheel").show() 				
 				
 		        var array1 = [];    
 		        array1.push("&zoneId="+podObj.zoneid);
@@ -1394,7 +1389,7 @@ function initAddPrimaryStorageButton($midmenuAddLink2) {
 			    if (!isValid) 
 			        return;
 			        			    
-				$thisDialog.find("#spinning_wheel").fadeIn("slow");  
+				$thisDialog.find("#spinning_wheel").show()  
 							
 				var array1 = [];
 				array1.push("&zoneId="+podObj.zoneid);