From 7a176ab1848fe30144978698fee2a31d3e5bcdef Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 30 Sep 2010 19:06:30 -0700
Subject: [PATCH] new UI - instance page - pop up console proxy window when
 clicking on monitor icon.

---
 ui/new/jsp/instance.jsp                |  2 +-
 ui/new/jsp/router.jsp                  |  2 +-
 ui/new/scripts/cloud.core2.instance.js | 24 ++++++++++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/ui/new/jsp/instance.jsp b/ui/new/jsp/instance.jsp
index a6033b19521..4f30a8420ab 100644
--- a/ui/new/jsp/instance.jsp
+++ b/ui/new/jsp/instance.jsp
@@ -31,7 +31,7 @@
     <div class="grid_container" style="display: block;" id="tab_content_details">
         <div class="grid_rows odd">
             <div class="vm_statusbox">
-                <div class="vm_consolebox">
+                <div class="vm_consolebox" id="vm_action_view_console">
                 </div>
                 <div class="vm_status_textbox">
                     <div class="vm_status_textline green" id="state">
diff --git a/ui/new/jsp/router.jsp b/ui/new/jsp/router.jsp
index 411382aae92..36698e94853 100644
--- a/ui/new/jsp/router.jsp
+++ b/ui/new/jsp/router.jsp
@@ -37,7 +37,7 @@
                     </ul>
                 </div>
             </div>
-            <div class="grid_editbox">
+            <div class="grid_editbox" style="display:none">
             </div>
             <div class="gridheader_loaderbox" id="spinning_wheel" style="border: 1px solid #999;
                 display: none;">
diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js
index 75b54a94705..6880deed94a 100644
--- a/ui/new/scripts/cloud.core2.instance.js
+++ b/ui/new/scripts/cloud.core2.instance.js
@@ -414,6 +414,30 @@ function clickInstanceGroupHeader($arrowIcon) {
         
         setBooleanField(jsonObj.haenable, $detailsTab.find("#haenable"));	
         setBooleanField((jsonObj.isoid != null && jsonObj.isoid.length > 0), $detailsTab.find("#iso"));	   
+               
+		if (jsonObj.state == 'Destroyed') {			
+			//$detailsTab.find("#vm_action_view_console").unbind("mouseover");
+			$detailsTab.find("#vm_action_view_console").unbind("click");
+		} 
+		else if (jsonObj.state == 'Running') {
+//			$detailsTab.find("#vm_action_view_console").data("imgUrl", "console?cmd=thumbnail&vm=" + jsonObj.id + "&w=144&h=110");				
+//			var imgUrl = "console?cmd=thumbnail&vm=" + jsonObj.id + "&w=144&h=110";	
+//			var time = new Date();					
+//			$("#vm_action_view_console").css("background", "url("+imgUrl+"&t="+time.getTime()+")");		
+
+			// Console Proxy UI
+			$detailsTab.find("#vm_action_view_console").data("proxyUrl", "console?cmd=access&vm=" + jsonObj.id).data("vmId",jsonObj.id).click(function(event) {				
+				var proxyUrl = $(this).data("proxyUrl");				
+				proxyUrl = "http://localhost:8080/client/" + proxyUrl;  //temporary hack. This line will be removed after new UI code (/ui/new/*) moves to /ui/*
+				var viewer = window.open(proxyUrl, $(this).data("vmId"),"width=820,height=640,resizable=yes,menubar=no,status=no,scrollbars=no,toolbar=no,location=no");
+				viewer.focus();
+				return false;
+			});	
+		} 
+		else {			
+			//$detailsTab.find("#vm_action_view_console").unbind("mouseover");
+			$detailsTab.find("#vm_action_view_console").unbind("click");
+		}
     }
     
     function vmJsonToVolumeTab(jsonObj) {