From 62a2732c19ca7c6ca8a3cc2f88a05f533fc0cd31 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 6 Oct 2010 17:47:45 -0700
Subject: [PATCH] new UI - vm wizard - final step - show selected hypervisor in
 review area. Pass hypervisor parameter to DeployVirtualMachine.

---
 ui/new/jsp/instance.jsp                | 21 +++++++++++++++------
 ui/new/scripts/cloud.core2.instance.js |  7 +++++--
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/ui/new/jsp/instance.jsp b/ui/new/jsp/instance.jsp
index b03810c5e26..4f31ba167f7 100644
--- a/ui/new/jsp/instance.jsp
+++ b/ui/new/jsp/instance.jsp
@@ -570,8 +570,17 @@
                                     Zone:</div>
                                 <span id="wizard_review_zone"></span>
                             </div>
-                        </div>
+                        </div>                        
                         <div class="vmpopup_reviewbox_even">
+                            <div class="vmopopup_reviewtextbox">
+                                <div class="vmpopup_reviewtick">
+                                </div>
+                                <div class="vmopopup_review_label">
+                                    Hypervisor:</div>
+                                <span id="wizard_review_hypervisor"></span>
+                            </div>
+                        </div>                        
+                        <div class="vmpopup_reviewbox_odd">
                             <div class="vmopopup_reviewtextbox">
                                 <div class="vmpopup_reviewtick">
                                 </div>
@@ -581,7 +590,7 @@
                                 <span id="wizard_review_template"></span>
                             </div>
                         </div>
-                        <div class="vmpopup_reviewbox_odd">
+                        <div class="vmpopup_reviewbox_even">
                             <div class="vmopopup_reviewtextbox">
                                 <div class="vmpopup_reviewtick">
                                 </div>
@@ -590,7 +599,7 @@
                                 <span id="wizard_review_service_offering"></span>
                             </div>
                         </div>
-                        <div class="vmpopup_reviewbox_even">
+                        <div class="vmpopup_reviewbox_odd">
                             <div class="vmopopup_reviewtextbox">
                                 <div class="vmpopup_reviewtick">
                                 </div>
@@ -600,7 +609,7 @@
                                 <span id="wizard_review_disk_offering"></span>
                             </div>
                         </div>
-                        <div class="vmpopup_reviewbox_odd">
+                        <div class="vmpopup_reviewbox_even">
                             <div class="vmopopup_reviewtextbox">
                                 <div class="vmpopup_reviewtick">
                                 </div>
@@ -609,7 +618,7 @@
                                 <span id="wizard_review_network"></span>
                             </div>
                         </div>
-                        <div class="vmpopup_reviewbox_even">
+                        <div class="vmpopup_reviewbox_odd">
                             <div class="vmopopup_reviewtextbox">
                                 <div class="vmpopup_reviewtick">
                                 </div>
@@ -621,7 +630,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="vmpopup_reviewbox_odd">
+                        <div class="vmpopup_reviewbox_even">
                             <div class="vmopopup_reviewtextbox">
                                 <div class="vmpopup_reviewtick">
                                 </div>
diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js
index f28ed60c664..822844ea968 100644
--- a/ui/new/scripts/cloud.core2.instance.js
+++ b/ui/new/scripts/cloud.core2.instance.js
@@ -498,7 +498,8 @@ function clickInstanceGroupHeader($arrowIcon) {
 			        $thisPopup.find("#root_disk_offering_container").hide();			       
 			    }	
     			
-    			$thisPopup.find("#wizard_review_zone").text($thisPopup.find("#wizard_zone option:selected").text());    	
+    			$thisPopup.find("#wizard_review_zone").text($thisPopup.find("#wizard_zone option:selected").text());    
+    			$thisPopup.find("#wizard_review_hypervisor").text($thisPopup.find("#wizard_hypervisor option:selected").text());   	
     			$thisPopup.find("#wizard_review_template").text($thisPopup.find("#step1 .rev_wiztemplistbox_selected .rev_wiztemp_listtext").text()); 
 		    }			
     		
@@ -553,7 +554,9 @@ function clickInstanceGroupHeader($arrowIcon) {
 			    // Create a new VM!!!!
 			    var moreCriteria = [];								
 			    moreCriteria.push("&zoneId="+$thisPopup.find("#wizard_zone").val());
-    									
+			    
+    			moreCriteria.push("&hypervisor="+$thisPopup.find("#wizard_hypervisor").val());	
+    								
 			    moreCriteria.push("&templateId="+$thisPopup.find("#step1 .rev_wiztemplistbox_selected").attr("id"));
     							
 			    moreCriteria.push("&serviceOfferingId="+$thisPopup.find("input:radio[name=service_offering_radio]:checked").val());