diff --git a/src/sunstone/OpenNebulaVNC.rb b/src/sunstone/OpenNebulaVNC.rb index e2dfc45a69..891d5807b3 100644 --- a/src/sunstone/OpenNebulaVNC.rb +++ b/src/sunstone/OpenNebulaVNC.rb @@ -174,6 +174,7 @@ class OpenNebulaVNC info = { :password => vnc_pw, :token => random_str, + :vm_name => vm_resource['NAME'] } return [200, info.to_json] diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index a1dbd74cc6..8d6bd32afc 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -2920,6 +2920,7 @@ function vncCallback(request,response){ var proxy_port = config['system_config']['vnc_proxy_port']; var pw = response["password"]; var token = response["token"]; + var vm_name = response["vm_name"]; var path = '?token='+token; var url = "vnc?"; @@ -2928,6 +2929,7 @@ function vncCallback(request,response){ url += "&token=" + token; url += "&password=" + pw; url += "&encrypt=" + config['user_config']['vnc_wss']; + url += "&title=" + vm_name; $("#open_in_a_new_window").attr('href', url) rfb.connect(proxy_host, proxy_port, pw, path); diff --git a/src/sunstone/views/vnc.erb b/src/sunstone/views/vnc.erb index 2c7d6479bf..354dd275ae 100644 --- a/src/sunstone/views/vnc.erb +++ b/src/sunstone/views/vnc.erb @@ -2,7 +2,7 @@ - noVNC + <%= params['vm_name']%> @@ -114,10 +114,10 @@ var INCLUDE_URI = "vendor/noVNC/"; // if port == 80 (or 443) then it won't be present and should be // set manually if (!port) { - if (window.location.protocol.substring(0,4) == 'http') { + if (window.location.protocol.substring(0,4) == 'http') { port = 80; } - else if (window.location.protocol.substring(0,5) == 'https') { + else if (window.location.protocol.substring(0,5) == 'https') { port = 443; } } @@ -151,4 +151,4 @@ var INCLUDE_URI = "vendor/noVNC/"; - \ No newline at end of file +