From be26dcc2525cd5bffadb3a9c413d0a1d01f4b2dd Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 27 Oct 2010 19:44:26 -0700
Subject: [PATCH] new UI - apply new vm template in vm wizard.

---
 ui/new/jsp/instance.jsp                | 34 +++++++++++++++++++-------
 ui/new/scripts/cloud.core2.instance.js | 12 ++++++++-
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/ui/new/jsp/instance.jsp b/ui/new/jsp/instance.jsp
index b0b388c65e9..080a7e9227a 100644
--- a/ui/new/jsp/instance.jsp
+++ b/ui/new/jsp/instance.jsp
@@ -297,19 +297,19 @@
                             </div>
                             <div class="rev_wizmid_tempbox_right">
                                 <div class="rev_wiztemplistpanel" id="template_container">
-                                 
-                                    <div class="rev_wiztemplistbox">
-                                        <div class="rev_wiztemo_centosicons">
+                                    <!--  
+                                    <div id="vmtemplate_in_vmwizard" class="rev_wiztemplistbox">
+                                        <div id="icon">
                                         </div>
                                         <div class="rev_wiztemp_listtext">
-                                            CentOS 5.4 64-bit Web Server (Apache) 
-                                            <div class="rev_wiztemp_listtext hypervisortext">Hypervisor: <strong>VMWare Xen</strong></div>
+                                            <span id="name"></span>
+                                            <div class="rev_wiztemp_listtext hypervisortext">
+                                                Hypervisor: <strong id="hypervisor"></strong></div>
                                         </div>
                                         <div class="rev_wiztemp_ownertext">
-                                            [Submitted by: <span>System</span>]</div>
-                                    </div>
-                                    
-                                  
+                                            [Submitted by: <span id="submitted_by"></span>]</div>
+                                    </div>                                    
+                                    -->
                                 </div>
                                 <div class="rev_wiztemplistactions">
                                     <div class="rev_wiztemplist_actionsbox">
@@ -675,6 +675,22 @@
     </div>
 </div>
 <!-- VM wizard (end)-->
+
+<!-- VM Wizard - VM template (begin) -->
+<div id="vmtemplate_in_vmwizard" class="rev_wiztemplistbox" style="display:none">
+    <div id="icon">
+    </div>
+    <div class="rev_wiztemp_listtext">
+        <span id="name"></span>
+        <div class="rev_wiztemp_listtext hypervisortext">
+            Hypervisor: <strong id="hypervisor"></strong>
+        </div>
+    </div>
+    <div class="rev_wiztemp_ownertext">
+        [Submitted by: <span id="submitted_by"></span>]</div>
+</div>
+<!-- VM Wizard - VM template (end) -->
+
 <!-- VM Wizard - Service Offering template (begin) -->
 <div class="vmpopup_offeringbox" id="vm_popup_service_offering_template" style="display: none">
     <input type="radio" name="service_offering_radio" class="radio" checked />
diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js
index 09840becb1a..c5294f13b80 100644
--- a/ui/new/scripts/cloud.core2.instance.js
+++ b/ui/new/scripts/cloud.core2.instance.js
@@ -567,10 +567,18 @@ function initVMWizard() {
 			    else
 			        items = json.listisosresponse.iso;
 			    loading.hide();
-			    container.empty();
+			    container.empty(); 
 			    if (items != null && items.length > 0) {
 				    var first = true;
+				    var $vmTemplateInWizard = $("#vmtemplate_in_vmwizard");
 				    for (var i = 0; i < items.length; i++) {
+				        var $newTemplate = $vmTemplateInWizard.clone();
+				        $newTemplate.find("#icon").removeClass().addClass(getIconForOS(items[i].ostypename));
+				        $newTemplate.find("#name").text(fromdb(items[i].displaytext));		
+				        $newTemplate.find("#hypervisor").text(fromdb(items[i].hypervisor));					    
+				        $newTemplate.find("#submitted_by").text(fromdb(items[i].account));
+				        container.append($newTemplate.show());
+				        /*
 					    var divClass = "rev_wiztemplistbox";
 					    if (first) {
 						    divClass = "rev_wiztemplistbox_selected";
@@ -583,6 +591,8 @@ function initVMWizard() {
 								      +'<div class="rev_wiztemp_ownertext">'+fromdb(items[i].account)+'</div>'
 							      +'</div>';
 					    container.append(html);
+					    */
+					    
 				    }						
 				    if(items.length < vmPopupStep2PageSize)
 	                    $vmPopup.find("#nextPage").hide();