From 69ce2a090e68c10d961da7b6bece2800fb6f99f1 Mon Sep 17 00:00:00 2001
From: will <will@cloud.com>
Date: Tue, 23 Nov 2010 11:13:27 -0800
Subject: [PATCH] Merge with Master: Defaulted the root disk offering to the
 first offering.

---
 ui/jsp/instance.jsp               |  4 ++--
 ui/scripts/cloud.core.instance.js | 33 ++++++++++++++++++-------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/ui/jsp/instance.jsp b/ui/jsp/instance.jsp
index 971df6b3508..f56c2c4e9b4 100644
--- a/ui/jsp/instance.jsp
+++ b/ui/jsp/instance.jsp
@@ -856,7 +856,7 @@
         No Thanks</label>
 </div>
 <div class="vmpopup_offeringbox" id="vm_popup_disk_offering_template_custom" style="display: none">
-    <input type="radio" class="radio" value="custom" checked />
+    <input type="radio" class="radio" value="custom" checked="checked">
     <label class="label" id="name">
     </label>
     <div class="vmpopup_offdescriptionbox_bot" style="background:none; border:none;">
@@ -870,7 +870,7 @@
      </div>
 </div>
 <div class="vmpopup_offeringbox" id="vm_popup_disk_offering_template_existing" style="display: none">
-    <input type="radio" class="radio" checked />
+    <input type="radio" class="radio" checked="checked">
     <label class="label" id="name">
     </label>
     <div class="vmpopup_offdescriptionbox">
diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js
index a4f14917936..6de94584ce3 100644
--- a/ui/scripts/cloud.core.instance.js
+++ b/ui/scripts/cloud.core.instance.js
@@ -44,7 +44,9 @@ function instanceBuildSubMenu2(label, commandString) {
     $newSubMenu.find("#label").text(label);    
     bindAndListMidMenuItems($newSubMenu, commandString, "listvirtualmachinesresponse", "virtualmachine", "jsp/instance.jsp", afterLoadInstanceJSP, vmToMidmenu, vmToRightPanel, getMidmenuId, true);
     $instanceSubMenuContainer.append($newSubMenu.show());
-}
+}
+
+var $doTemplateNo, $doTemplateCustom,$doTemplateExisting;
 
 function afterLoadInstanceJSP() {
     //Add VM button
@@ -65,7 +67,10 @@ function afterLoadInstanceJSP() {
     var afterSwitchFnArray = [vmJsonToDetailsTab, vmJsonToVolumeTab, vmJsonToStatisticsTab, vmJsonToRouterTab];
     switchBetweenDifferentTabs(tabArray, tabContentArray, afterSwitchFnArray);       
     
-    //initialize VM Wizard    
+    //initialize VM Wizard  
+	$doTemplateNo = $("#vm_popup_disk_offering_template_no");
+	$doTemplateCustom = $("#vm_popup_disk_offering_template_custom");
+	$doTemplateExisting = $("#vm_popup_disk_offering_template_existing");
     initVMWizard();       
     
     // dialogs
@@ -349,7 +354,6 @@ function initVMWizard() {
 			    }
 		    }
 		});
-		    			    
 	
 	    $.ajax({
 		    data: createURL("command=listDiskOfferings&domainid=1"),
@@ -362,7 +366,7 @@ function initVMWizard() {
 		        
 		        //***** data disk offering: "no, thanks", "custom", existing disk offerings in database (begin) ****************************************************
 		        //"no, thanks" radio button (default radio button in data disk offering)		               
-	            var $t = $("#vm_popup_disk_offering_template_no").clone(); 		            	     
+	            var $t = $doTemplateNo.clone(); 		            	     
 	            $t.find("input:radio").attr("name","data_disk_offering_radio");  
 	            $t.find("#name").text("no, thanks"); 		            
 	            $dataDiskOfferingContainer.append($t.show()); 
@@ -372,12 +376,12 @@ function initVMWizard() {
 			        for (var i = 0; i < offerings.length; i++) {	
 			            var $t;
 			            if(offerings[i].isCustomized == true) 			                       
-		                    $t = $("#vm_popup_disk_offering_template_custom").clone();  			            
+		                    $t = $doTemplateCustom.clone();  			            
 			            else 
-				            $t = $("#vm_popup_disk_offering_template_existing").clone(); 	
+				            $t = $doTemplateExisting.clone(); 	
 				        
-				        $t.data("jsonObj", offerings[i]);				        
-				        $t.find("input:radio").attr("name","data_disk_offering_radio").val(fromdb(offerings[i].id)).removeAttr("checked");	 	
+				        $t.data("jsonObj", offerings[i]).attr("id", "do"+offerings[i].id);				        
+				        $t.find("input:radio").attr("name","data_disk_offering_radio").attr("checked", "").val(fromdb(offerings[i].id));	 	
 			            $t.find("#name").text(fromdb(offerings[i].name));
 			            $t.find("#description").text(fromdb(offerings[i].displaytext)); 	 
 			            $dataDiskOfferingContainer.append($t.show());	
@@ -396,14 +400,15 @@ function initVMWizard() {
 			        for (var i = 0; i < offerings.length; i++) {	
 			            var $t;
 			            if(offerings[i].isCustomized == true) 
-			                $t = $("#vm_popup_disk_offering_template_custom").clone();  
+			                $t = $doTemplateCustom.clone();  
 			            else 
-				            $t = $("#vm_popup_disk_offering_template_existing").clone(); 	
+				            $t = $doTemplateExisting.clone(); 	
 				        
-				        $t.data("jsonObj", offerings[i]);	
-				        $t.find("input:radio").attr("name","root_disk_offering_radio").val(offerings[i].id);	 
-				        if(i > 0) //default is the 1st existing disk offering. If there is no existing disk offering, default to "custom" radio button
-				            $t.find("input:radio").removeAttr("checked");	 	
+				        $t.data("jsonObj", offerings[i]).attr("id", "do"+offerings[i].id);	
+				        var $offering = $t.find("input:radio").attr("name","root_disk_offering_radio").val(offerings[i].id);	 
+				        if(i > 0) {
+				            $offering.removeAttr("checked");	
+						}
 				        $t.find("#name").text(fromdb(offerings[i].name));
 				        $t.find("#description").text(fromdb(offerings[i].displaytext)); 	 
 				        $rootDiskOfferingContainer.append($t.show());