replace novnc with xtermjs

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/js/ServerAdministration.js b/js/ServerAdministration.js
index 8f0936099a15cae966924c8a0bb863c44cfd0e69..723757878c6b651ef291df92a0589ea166e8c3d8 100644 (file)
--- a/js/ServerAdministration.js
+++ b/js/ServerAdministration.js
@@ -42,7 +42,7 @@ Ext.define('PMG.ServerAdministration', {
                disabled: true,
                text: gettext('Upgrade'),
                handler: function() {
-                   PMG.Utils.openVNCViewer('upgrade', Proxmox.NodeName);
+                   Proxmox.Utils.openXtermJsViewer('upgrade', 0, Proxmox.NodeName);
                }
            },
            itemId: 'updates',

diff --git a/js/ServerStatus.js b/js/ServerStatus.js
index 8ff793b796e96cd03cda55d5f5ca8c66e83a3ded..de85050c162de2c2fcf41d0f68f1d571b4fca618 100644 (file)
--- a/js/ServerStatus.js
+++ b/js/ServerStatus.js
@@ -21,7 +21,7 @@ Ext.define('PMG.ServerStatus', {
        {
            text: gettext("Console"),
            handler: function() {
-               PMG.Utils.openVNCViewer('shell', Proxmox.NodeName);
+               Proxmox.Utils.openXtermJsViewer('shell', 0, Proxmox.NodeName);
            }
        },
        '->',

diff --git a/js/Utils.js b/js/Utils.js
index 43558e7475cb1d23b3a2d3947434bb6a98abaed2..dbc3e78f77d84d0cbf4e0d7e1b1a05116d90e048 100644 (file)
--- a/js/Utils.js
+++ b/js/Utils.js
@@ -627,17 +627,6 @@ Ext.define('PMG.Utils', {
        }
     },
 
-    openVNCViewer: function(consoletype, nodename) {
-       var url = Ext.urlEncode({
-           console: consoletype, // upgrade or shell
-           novnc: 1,
-           node: nodename
-       });
-       var nw = window.open("?" + url, '_blank',
-                            "innerWidth=745,innerheight=427");
-       nw.focus();
-    },
-
     updateLoginData: function(data) {
        Proxmox.CSRFPreventionToken = data.CSRFPreventionToken;
        Proxmox.UserName = data.username;