From 697f84d2ff77576d7a6791b339c852ca19bac636 Mon Sep 17 00:00:00 2001 From: SimonFair <39065407+SimonFair@users.noreply.github.com> Date: Sun, 31 Jul 2022 16:05:20 +0100 Subject: [PATCH] VM Manager GUI Changes, --- plugins/dynamix.vm.manager/include/VMMachines.php | 3 ++- plugins/dynamix.vm.manager/javascript/vmmanager.js | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/plugins/dynamix.vm.manager/include/VMMachines.php b/plugins/dynamix.vm.manager/include/VMMachines.php index 8b703ecd2..c996bbbae 100644 --- a/plugins/dynamix.vm.manager/include/VMMachines.php +++ b/plugins/dynamix.vm.manager/include/VMMachines.php @@ -73,6 +73,7 @@ foreach ($vms as $vm) { if ($vncport > 0) { $wsport = $lv->domain_get_ws_port($res); $vnc = autov('/plugins/dynamix.vm.manager/vnc.html',true).'&autoconnect=true&host=' . $_SERVER['HTTP_HOST'] . '&port=&path=/wsproxy/' . $wsport . '/'; + $spice = autov('/plugins/dynamix.vm.manager/spice.html',true).'&autoconnect=true&host=' . $_SERVER['HTTP_HOST'] . '&port='.$vncport ; $graphics = 'VNC:'.$vncport; } elseif ($vncport == -1) { $graphics = 'VNC:auto'; @@ -92,7 +93,7 @@ foreach ($vms as $vm) { $graphics = str_replace("\n", "
", trim($graphics)); } unset($dom); - $menu = sprintf("onclick=\"addVMContext('%s','%s','%s','%s','%s','%s')\"", addslashes($vm),addslashes($uuid),addslashes($template),$state,addslashes($vnc),addslashes($log)); + $menu = sprintf("onclick=\"addVMContext('%s','%s','%s','%s','%s','%s','%s')\"", addslashes($vm),addslashes($uuid),addslashes($template),$state,addslashes($vnc),addslashes($spice),addslashes($log)); $kvm[] = "kvm.push({id:'$uuid',state:'$state'});"; switch ($state) { case 'running': diff --git a/plugins/dynamix.vm.manager/javascript/vmmanager.js b/plugins/dynamix.vm.manager/javascript/vmmanager.js index 10b6dfe5a..b23d1218a 100644 --- a/plugins/dynamix.vm.manager/javascript/vmmanager.js +++ b/plugins/dynamix.vm.manager/javascript/vmmanager.js @@ -14,7 +14,7 @@ function ajaxVMDispatch(params, spin){ } },'json'); } -function addVMContext(name, uuid, template, state, vncurl, log){ +function addVMContext(name, uuid, template, state, vncurl, spicecurl, log){ var opts = []; var path = location.pathname; var x = path.indexOf("?"); @@ -26,6 +26,13 @@ function addVMContext(name, uuid, template, state, vncurl, log){ }}); opts.push({divider:true}); } + if (spicecurl !== "") { + opts.push({text:_("Spice Remote"), icon:"fa-desktop", action:function(e) { + e.preventDefault(); + window.open(spicecurl, '_blank', 'scrollbars=yes,resizable=yes'); + }}); + opts.push({divider:true}); + } if (state == "running") { opts.push({text:_("Stop"), icon:"fa-stop", action:function(e) { e.preventDefault();