From 0cd079564533b732171cc3e7dbfb018f57b80c58 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 19 Nov 2010 18:38:18 -0800
Subject: [PATCH] new UI - Add zone pod wizard - after action message screen -
 hide guest ip range message box if it's advanced mode.

---
 ui/jsp/resource.jsp               |  2 +-
 ui/scripts/cloud.core.resource.js | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ui/jsp/resource.jsp b/ui/jsp/resource.jsp
index 1d706e8ea70..5939e49d4cf 100644
--- a/ui/jsp/resource.jsp
+++ b/ui/jsp/resource.jsp
@@ -402,7 +402,7 @@
                       </div>
                     </div>
                     
-                    <div class="zonepopup_reviewbox odd">
+                    <div class="zonepopup_reviewbox odd" id="add_guestiprange_message_container" style="display:none">
                       <div class="zonepopup_reviewtextbox">
                            <div id="add_guestiprange_tick_cross"> <!-- class "zonepopup_reviewtick" or class "zonepopup_reviewcross" -->
                            </div>
diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
index c4d90a040e1..854c3f88dba 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -776,7 +776,7 @@ function addZoneWizardSubmit($thisWizard) {
 	    async: false,
 	    success: function(json) {	
 	        $thisWizard.find("#after_submit_screen").find("#add_zone_tick_cross").removeClass().addClass("zonepopup_reviewtick");
-	        $thisWizard.find("#after_submit_screen").find("#add_zone_message").text("Zone was created successfully");	         
+	        $thisWizard.find("#after_submit_screen").find("#add_zone_message").removeClass().text("Zone was created successfully");	         
 	       	        	        			        
 	        $zoneNode = $("#leftmenu_zone_node_template").clone(true); 			            			   
             var $zoneTree = $("#leftmenu_zone_tree").find("#tree_container");		     			
@@ -795,7 +795,7 @@ function addZoneWizardSubmit($thisWizard) {
         error: function(XMLHttpResponse) {            
 			handleError(XMLHttpResponse, function() {
 			    $thisWizard.find("#after_submit_screen").find("#add_zone_tick_cross").removeClass().addClass("zonepopup_reviewcross");
-	            $thisWizard.find("#after_submit_screen").find("#add_zone_message").addClass("error").text(("Failed to create zone: " + parseXMLHttpResponse(XMLHttpResponse)));					
+	            $thisWizard.find("#after_submit_screen").find("#add_zone_message").removeClass().addClass("error").text(("Failed to create zone: " + parseXMLHttpResponse(XMLHttpResponse)));					
 			});
         }
     });
@@ -822,7 +822,7 @@ function addZoneWizardSubmit($thisWizard) {
 	        async: false,
 	        success: function(json) {	            
 	            $thisWizard.find("#after_submit_screen").find("#add_pod_tick_cross").removeClass().addClass("zonepopup_reviewtick");
-	            $thisWizard.find("#after_submit_screen").find("#add_pod_message").text("Pod was created successfully");	    
+	            $thisWizard.find("#after_submit_screen").find("#add_pod_message").removeClass().text("Pod was created successfully");	    
 	                      
 	            var item = json.createpodresponse.pod; 	
 	            podId = item.id;		            		            				    
@@ -851,13 +851,15 @@ function addZoneWizardSubmit($thisWizard) {
             error: function(XMLHttpResponse) {	
 				handleError(XMLHttpResponse, function() {				    
 				    $thisWizard.find("#after_submit_screen").find("#add_pod_tick_cross").removeClass().addClass("zonepopup_reviewcross");
-	                $thisWizard.find("#after_submit_screen").find("#add_pod_message").addClass("error").text(("Failed to create pod: " + parseXMLHttpResponse(XMLHttpResponse)));			
+	                $thisWizard.find("#after_submit_screen").find("#add_pod_message").removeClass().addClass("error").text(("Failed to create pod: " + parseXMLHttpResponse(XMLHttpResponse)));			
 				});
             }
         });	
     } 
     
-    if(podId != null && $thisWizard.find("#step3").find("#guestip_container").css("display") != "none") {        
+    if(podId != null && $thisWizard.find("#step3").find("#guestip_container").css("display") != "none") {     
+        $thisWizard.find("#after_submit_screen").find("#add_guestiprange_message_container").show();
+       
 		var netmask = $thisWizard.find("#step3").find("#guestnetmask").val();
 		var startip = $thisWizard.find("#step3").find("#startguestip").val();
 		var endip = $thisWizard.find("#step3").find("#endguestip").val();	
@@ -879,7 +881,7 @@ function addZoneWizardSubmit($thisWizard) {
 			async: false,
 			success: function(json) { 			    
 			    $thisWizard.find("#after_submit_screen").find("#add_guestiprange_tick_cross").removeClass().addClass("zonepopup_reviewtick");
-	            $thisWizard.find("#after_submit_screen").find("#add_guestiprange_message").text("Guest IP range was created successfully");	    
+	            $thisWizard.find("#after_submit_screen").find("#add_guestiprange_message").removeClass().text("Guest IP range was created successfully");	    
 			    
 				var item = json.createvlaniprangeresponse.vlan;
 				vlanId = item.id;				
@@ -887,11 +889,14 @@ function addZoneWizardSubmit($thisWizard) {
 		    error: function(XMLHttpResponse) {	
 				handleError(XMLHttpResponse, function() {			
 				    $thisWizard.find("#after_submit_screen").find("#add_guestiprange_tick_cross").removeClass().addClass("zonepopup_reviewcross");
-	                $thisWizard.find("#after_submit_screen").find("#add_guestiprange_message").addClass("error").text(("Failed to create Guest IP range: " + parseXMLHttpResponse(XMLHttpResponse)));			
+	                $thisWizard.find("#after_submit_screen").find("#add_guestiprange_message").removeClass().addClass("error").text(("Failed to create Guest IP range: " + parseXMLHttpResponse(XMLHttpResponse)));			
 			    });
             }
 		});		
     }
+    else {
+         $thisWizard.find("#after_submit_screen").find("#add_guestiprange_message_container").hide();
+    }
     
     $thisWizard.find("#spinning_wheel").hide();   
 }