etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

new UI - instance page, router page - keep getting the newest screenshot(image) of console proxy.

This commit is contained in:
Jessica Wang 2010-09-30 19:54:42 -07:00
parent 279f3854a6
commit 8004e899d8
3 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/new/jsp/instance.jsp
View File

@ -31,7 +31,11 @@
<div class="grid_container" style="display: block;" id="tab_content_details">
<div class="grid_rows odd">
<div class="vm_statusbox">
<div class="vm_consolebox" id="vm_action_view_console">
<div id="vm_action_view_console">
<div class="vm_consolebox" id="box0">
</div>
<div class="vm_consolebox" id="box1" style="display: none">
</div>
</div>
<div class="vm_status_textbox">
<div class="vm_status_textline green" id="state">

8
ui/new/jsp/router.jsp
View File

@ -49,8 +49,12 @@
</div>
<div class="grid_container">
<div class="grid_rows odd">
<div class="vm_statusbox">
<div class="vm_consolebox" id="vm_action_view_console">
<div class="vm_statusbox">
<div id="vm_action_view_console">
<div class="vm_consolebox" id="box0">
</div>
<div class="vm_consolebox" id="box1" style="display: none">
</div>
</div>
<div class="vm_status_textbox">
<div class="vm_status_textline green" id="state">

28
ui/new/scripts/cloud.core2.js
View File

@ -704,10 +704,30 @@ function setViewConsoleAction(jsonObj, $detailsTab) {
$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()+")");
var imgUrl = "console?cmd=thumbnail&vm=" + jsonObj.id + "&w=144&h=110";
imgUrl = "http://localhost:8080/client/" + imgUrl; //temporary hack. This line will be removed after new UI code (/ui/new/*) moves to /ui/*
var time = new Date();
$("#vm_action_view_console #box0").css("background", "url("+imgUrl+"&t="+time.getTime()+")");
//???
var index = 0;
$detailsTab.everyTime(2000, function() {
var time = new Date();
//$("#vm_action_view_console").css("background", "url("+imgUrl+"&t="+time.getTime()+")");
if ((index % 2) == 0) {
$("#vm_action_view_console #box0").hide().css("background", "url("+imgUrl+"&t="+time.getTime()+")");
$("#vm_action_view_console #box1").show();
} else {
$("#vm_action_view_console #box1").hide().css("background", "url("+imgUrl+"&t="+time.getTime()+")");
$("#vm_action_view_console #box0").show();
}
index++;
}, 0);
//???
// Console Proxy UI
$detailsTab.find("#vm_action_view_console").data("proxyUrl", "console?cmd=access&vm=" + jsonObj.id).data("vmId",jsonObj.id).click(function(event) {