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

new UI - routers page - implement view console action.

This commit is contained in:
Jessica Wang 2010-09-30 19:19:59 -07:00
parent 7a176ab184
commit 279f3854a6
4 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,7 @@
<div class="grid_container">
<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">

26
ui/new/scripts/cloud.core2.instance.js
View File

@ -414,30 +414,8 @@ 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");
}
setViewConsoleAction(jsonObj, $detailsTab);
}
function vmJsonToVolumeTab(jsonObj) {

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

@ -697,7 +697,32 @@ function updateStateInMidMenu(jsonObj, $midmenuItem1) {
$midmenuItem1.find("#icon_container").show();
}
function setViewConsoleAction(jsonObj, $detailsTab) {
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");
}
}

4
ui/new/scripts/cloud.core2.router.js
View File

@ -49,7 +49,9 @@ function routerJsonToDetailsTab(jsonObj) {
else if (jsonObj.state == 'Stopped') {
//template.find(".grid_links").find("#router_action_start_container").show();
buildActionLinkForDetailsTab("Start Router", routerActionMap, $actionMenu, routerListAPIMap);
}
}
setViewConsoleAction(jsonObj, $detailsTab);
}
var routerListAPIMap = {