From d8e285bb0bfea6e210bee1edcdb734244ce4dfd4 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 19 Nov 2010 16:58:48 -0800
Subject: [PATCH] new UI - add zone pod wizard - change visual layout of last
 step (action action screen).

---
 ui/jsp/resource.jsp               | 18 ++++++++--------
 ui/scripts/cloud.core.resource.js | 34 ++++++++++++++++++-------------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/ui/jsp/resource.jsp b/ui/jsp/resource.jsp
index 8af0284d4db..1d706e8ea70 100644
--- a/ui/jsp/resource.jsp
+++ b/ui/jsp/resource.jsp
@@ -370,8 +370,7 @@
             </div>
         </div>
         <div class="zonepopup_container_mid">
-            <div class="zonepopup_maincontentarea">
-                
+            <div class="zonepopup_maincontentarea">                
                 
                 <div class="zonepopup_contentpanel">
                 	<div id="spinning_wheel" class="zonepoup_loadingbox" style="display:none;">
@@ -383,31 +382,34 @@
                     
                    <div class="zonepopup_reviewbox odd">
                       <div class="zonepopup_reviewtextbox">
-                           <div class="zonepopup_reviewtick">
+                           <div id="add_zone_tick_cross"> <!-- class "zonepopup_reviewtick" or class "zonepopup_reviewcross" -->
                            </div>
                            <div class="zonepopup_review_label">
                               Zone:</div>
-                           <span id="wizard_review_zone"></span>
+                           <span id="add_zone_message"> <!-- add class "error" if in error -->
+                           </span>
                       </div>
                     </div>
                     
                     <div class="zonepopup_reviewbox even">
                       <div class="zonepopup_reviewtextbox">
-                           <div class="zonepopup_reviewcross">
+                           <div id="add_pod_tick_cross"> <!-- class "zonepopup_reviewtick" or class "zonepopup_reviewcross" -->
                            </div>
                            <div class="zonepopup_review_label">
                               Pod:</div>
-                           <span class="error" id="wizard_review_zone">some text</span>
+                           <span id="add_pod_message"> <!-- add class "error" if in error -->
+                           </span>
                       </div>
                     </div>
                     
                     <div class="zonepopup_reviewbox odd">
                       <div class="zonepopup_reviewtextbox">
-                           <div class="zonepopup_reviewtick">
+                           <div id="add_guestiprange_tick_cross"> <!-- class "zonepopup_reviewtick" or class "zonepopup_reviewcross" -->
                            </div>
                            <div class="zonepopup_review_label">
                               Guest IP Range:</div>
-                           <span id="wizard_review_zone"></span>
+                           <span id="add_guestiprange_message"> <!-- add class "error" if in error -->
+                           </span>
                       </div>
                     </div>
                 </div>
diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
index fca850a237a..c4d90a040e1 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -775,7 +775,8 @@ function addZoneWizardSubmit($thisWizard) {
 	    dataType: "json",
 	    async: false,
 	    success: function(json) {	
-	        afterActionMsg += "Zone was created successfully<br><br>";	     	 
+	        $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");	         
 	       	        	        			        
 	        $zoneNode = $("#leftmenu_zone_node_template").clone(true); 			            			   
             var $zoneTree = $("#leftmenu_zone_tree").find("#tree_container");		     			
@@ -793,7 +794,8 @@ function addZoneWizardSubmit($thisWizard) {
 	    },
         error: function(XMLHttpResponse) {            
 			handleError(XMLHttpResponse, function() {
-				afterActionMsg += ("Failed to create zone. " + parseXMLHttpResponse(XMLHttpResponse) + "<br><br>");				
+			    $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)));					
 			});
         }
     });
@@ -818,9 +820,10 @@ function addZoneWizardSubmit($thisWizard) {
             data: createURL("command=createPod"+array1.join("")), 
 	        dataType: "json",
 	        async: false,
-	        success: function(json) {
-	            afterActionMsg += "Pod was created successfully<br><br>";	            
-	            	            
+	        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");	    
+	                      
 	            var item = json.createpodresponse.pod; 	
 	            podId = item.id;		            		            				    
                 $podNode = $("#leftmenu_pod_node_template").clone(true);
@@ -846,8 +849,9 @@ function addZoneWizardSubmit($thisWizard) {
 		        }
 	        },
             error: function(XMLHttpResponse) {	
-				handleError(XMLHttpResponse, function() {
-					afterActionMsg += ("Failed to create Pod. " + parseXMLHttpResponse(XMLHttpResponse) + "<br><br>");					
+				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)));			
 				});
             }
         });	
@@ -873,21 +877,23 @@ function addZoneWizardSubmit($thisWizard) {
 		    data: createURL("command=createVlanIpRange" + array1.join("")),
 			dataType: "json",
 			async: false,
-			success: function(json) { 
-			    afterActionMsg += "Guest IP range was created successfully<br><br>";   
+			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");	    
+			    
 				var item = json.createvlaniprangeresponse.vlan;
 				vlanId = item.id;				
 			},		   
 		    error: function(XMLHttpResponse) {	
-				handleError(XMLHttpResponse, function() {
-					afterActionMsg += ("Failed to create Guest IP range. " + parseXMLHttpResponse(XMLHttpResponse) + "<br><br>");					
-				});
+				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("#spinning_wheel").hide();    
-    $thisWizard.find("#after_action_message").html(afterActionMsg);	
+    $thisWizard.find("#spinning_wheel").hide();   
 }
 
 function initUpdateConsoleCertButton($midMenuAddLink2) {