From 656c93389199d4102b6738e02baba5e1b345ca74 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 20 Oct 2010 19:14:57 -0700
Subject: [PATCH] new UI - system VM page - add view console template.

---
 ui/new/jsp/resource.jsp                | 11 ++++++++++-
 ui/new/scripts/cloud.core2.resource.js |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ui/new/jsp/resource.jsp b/ui/new/jsp/resource.jsp
index 27ff52b9d24..42e79001160 100644
--- a/ui/new/jsp/resource.jsp
+++ b/ui/new/jsp/resource.jsp
@@ -1156,6 +1156,15 @@
 </div>
 <!--  secondary storage tab template (end) -->
 
+<!-- view console template (begin)  -->
+<div id="view_console_template" style="display:none">
+    <div class="vm_consolebox" id="box0">
+    </div>
+    <div class="vm_consolebox" id="box1" style="display: none">
+    </div>
+</div>
+<!-- view console template (end)  -->
+
 <!-- dialogs -->
 <div id="dialog_confirmation_enable_maintenance" title="Confirmation" style="display: none">
     <p>        
@@ -1181,7 +1190,7 @@
     </p>
 </div>
 
-<!-- Update OS Pref Dialog -->
+<!-- Update OS Preference Dialog -->
 <div id="dialog_update_os" title="Update OS Preference" style="display:none">
 	<p>	    
 	    <%=t.t("Please.choose.a.OS.preference.for.this.host..Virtual.machines.will.always.be.allocated.to.hosts.with.an.OS.preference.that.matches.with.the.OS.type.of.the.template.chosen.for.the.virtual.machine.before.choosing.other.hosts.")%>
diff --git a/ui/new/scripts/cloud.core2.resource.js b/ui/new/scripts/cloud.core2.resource.js
index 07a9bb57f20..e6c1c446221 100644
--- a/ui/new/scripts/cloud.core2.resource.js
+++ b/ui/new/scripts/cloud.core2.resource.js
@@ -670,7 +670,7 @@ function systemvmJsonToDetailsTab(jsonObj) {
     var $detailsTab = $("#systemvm_page").find("#tab_content_details");   
     $detailsTab.data("jsonObj", jsonObj);   
      
-    //resetViewConsoleAction(jsonObj, $detailsTab);         
+    resetViewConsoleAction(jsonObj, $detailsTab);         
     setVmStateInRightPanel(jsonObj.state, $detailsTab.find("#state"));		
     $detailsTab.find("#ipAddress").text(jsonObj.publicip);