[pve-devel] [PATCH novnc 2/3] rebase patches to current master
Dominik Csapak
d.csapak at proxmox.com
Thu Jul 19 16:38:14 CEST 2018
this patch rebases the patches onto the current master and changes some
things:
* show the noVNC settings window/button (but still hide the advanced
options there, since those only contain connection relevant settings)
* decouple the window autoresize somewhat from the 'resize' setting, so
that a user can deactivate that and still have the wanted scaling
(but keep the default behaviour, incl. changing the scaling on
fullscreen change)
* do not use the updateSetings call anymore (since it lost its second
parameter) use forceSetting/initSettings instead
(we have to give the resize parameter in pve-manager for this
to correctly work)
Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
debian/patches/0001-add-pve-specific-js-code.patch | 113 ++++++++++++++-------
.../0002-add-custom-fbresize-event-on-rfb.patch | 25 ++---
...3-change-scaling-when-toggling-fullscreen.patch | 20 ++--
debian/patches/0004-add-pve-style.patch | 4 +-
debian/patches/0005-remove-vnc-logos.patch | 4 +-
...-change-src-directory-for-images-js-files.patch | 40 +++-----
debian/patches/0007-add-pve-vnc-commands.patch | 21 ++--
...0008-add-replaceable-snippets-in-vnc.html.patch | 4 +-
debian/patches/0009-decrease-animation-time.patch | 2 +-
debian/patches/0010-use-only-app.js.patch | 4 +-
10 files changed, 132 insertions(+), 105 deletions(-)
diff --git a/debian/patches/0001-add-pve-specific-js-code.patch b/debian/patches/0001-add-pve-specific-js-code.patch
index bae6bf6..c03901b 100644
--- a/debian/patches/0001-add-pve-specific-js-code.patch
+++ b/debian/patches/0001-add-pve-specific-js-code.patch
@@ -1,4 +1,4 @@
-From e9e4fe2eab135507fd6574b2f12ddc5c9d0a532b Mon Sep 17 00:00:00 2001
+From 9607c6496f643fde5435fa799702961dd22bf81a Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak at proxmox.com>
Date: Tue, 13 Dec 2016 16:11:35 +0100
Subject: [PATCH 01/10] add pve specific js code
@@ -11,17 +11,18 @@ autoresizing, commandstoggle, etc.
Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
- app/pve.js | 414 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- app/ui.js | 75 ++++++++---
- 2 files changed, 475 insertions(+), 14 deletions(-)
+ app/pve.js | 418 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ app/ui.js | 71 +++++++++--
+ vnc.html | 10 +-
+ 3 files changed, 482 insertions(+), 17 deletions(-)
create mode 100644 app/pve.js
diff --git a/app/pve.js b/app/pve.js
new file mode 100644
-index 0000000..37858f5
+index 0000000..e2c37fb
--- /dev/null
+++ b/app/pve.js
-@@ -0,0 +1,414 @@
+@@ -0,0 +1,418 @@
+/*
+ * PVE Utility functions for noVNC
+ * Copyright (C) 2017 Proxmox GmbH
@@ -309,8 +310,6 @@ index 0000000..37858f5
+ .addEventListener('click', me.UI.togglePVECommandPanel);
+
+ // show/hide the buttons
-+ document.getElementById('noVNC_settings_button')
-+ .classList.add('noVNC_hidden');
+ document.getElementById('noVNC_disconnect_button')
+ .classList.add('noVNC_hidden');
+ if (me.consoletype === 'kvm') {
@@ -384,7 +383,7 @@ index 0000000..37858f5
+ });
+
+ document.getElementById('noVNC_password_input').value = result.data.ticket;
-+ me.UI.updateSetting('path', 'api2/json' + me.baseUrl + '/vncwebsocket' + "?" + wsparams);
++ me.UI.forceSetting('path', 'api2/json' + me.baseUrl + '/vncwebsocket' + "?" + wsparams);
+
+ callback();
+ },
@@ -394,7 +393,7 @@ index 0000000..37858f5
+ });
+ },
+
-+ updateFBSize: function(rfb, width, height, clip) {
++ updateFBSize: function(rfb, width, height) {
+ var me = this;
+ try {
+ // Note: window size must be even number for firefox
@@ -404,9 +403,15 @@ index 0000000..37858f5
+ if (me.sizeUpdateTimer !== undefined) {
+ clearInterval(me.sizeUpdateTimer);
+ }
-+ if (clip) return;
+
+ var update_size = function() {
++ var clip = me.UI.getSetting('view_clip');
++ var resize = me.UI.getSetting('resize');
++ var autoresize = me.UI.getSetting('autoresize');
++ if (clip || resize === 'scale' || !autoresize) {
++ return;
++ }
++
+ // we do not want to resize if we are in fullscreen
+ if (document.fullscreenElement || // alternative standard method
+ document.mozFullScreenElement || // currently working methods
@@ -437,26 +442,26 @@ index 0000000..37858f5
+ },
+};
diff --git a/app/ui.js b/app/ui.js
-index 2218d24..143cb60 100644
+index 4fe2a3f..59f7cca 100644
--- a/app/ui.js
+++ b/app/ui.js
-@@ -18,6 +18,7 @@ import Keyboard from "../core/input/keyboard.js";
+@@ -17,6 +17,7 @@ import keysyms from "../core/input/keysymdef.js";
+ import Keyboard from "../core/input/keyboard.js";
import RFB from "../core/rfb.js";
- import Display from "../core/display.js";
import * as WebUtil from "./webutil.js";
+import PVEUI from "./pve.js";
- var UI = {
+ const UI = {
-@@ -59,6 +60,7 @@ var UI = {
+@@ -58,6 +59,7 @@ const UI = {
// Render default UI and initialize settings menu
- start: function(callback) {
+ start(callback) {
+ UI.PVE = new PVEUI(UI);
// Setup global variables first
UI.isSafari = (navigator.userAgent.indexOf('Safari') !== -1 &&
navigator.userAgent.indexOf('Chrome') === -1);
-@@ -90,6 +92,9 @@ var UI = {
+@@ -89,6 +91,9 @@ const UI = {
UI.addConnectionControlHandlers();
UI.addClipboardHandlers();
UI.addSettingsHandlers();
@@ -466,7 +471,7 @@ index 2218d24..143cb60 100644
document.getElementById("noVNC_status")
.addEventListener('click', UI.hideStatus);
-@@ -98,23 +103,19 @@ var UI = {
+@@ -97,23 +102,19 @@ const UI = {
UI.openControlbar();
@@ -476,7 +481,7 @@ index 2218d24..143cb60 100644
document.documentElement.classList.remove("noVNC_loading");
-- var autoconnect = WebUtil.getConfigVar('autoconnect', false);
+- let autoconnect = WebUtil.getConfigVar('autoconnect', false);
- if (autoconnect === 'true' || autoconnect == '1') {
- autoconnect = true;
+ UI.PVE.pveStart(function() {
@@ -496,24 +501,28 @@ index 2218d24..143cb60 100644
+ });
},
- initFullscreen: function() {
-@@ -159,9 +160,13 @@ var UI = {
+ initFullscreen() {
+@@ -156,9 +157,10 @@ const UI = {
/* Populate the controls if defaults are provided in the URL */
UI.initSetting('host', window.location.hostname);
UI.initSetting('port', port);
- UI.initSetting('encrypt', (window.location.protocol === "https:"));
+ UI.initSetting('encrypt', true);
UI.initSetting('view_clip', false);
-- UI.initSetting('resize', 'off');
-+ // we need updateSetting because
-+ // otherwise we load from browser storage
-+ // we want to overwrite the resize mode from url
-+ var resize = WebUtil.getQueryVar('resize');
-+ UI.updateSetting('resize', resize);
+ UI.initSetting('resize', 'off');
++ UI.initSetting('autoresize', true);
UI.initSetting('shared', true);
UI.initSetting('view_only', false);
UI.initSetting('path', 'websockify');
-@@ -393,6 +398,9 @@ var UI = {
+@@ -342,6 +344,7 @@ const UI = {
+ UI.addSettingChangeHandler('resize');
+ UI.addSettingChangeHandler('resize', UI.enableDisableViewClip);
+ UI.addSettingChangeHandler('resize', UI.applyResizeMode);
++ UI.addSettingChangeHandler('autoresize');
+ UI.addSettingChangeHandler('view_clip');
+ UI.addSettingChangeHandler('view_clip', UI.updateViewClip);
+ UI.addSettingChangeHandler('shared');
+@@ -390,6 +393,9 @@ const UI = {
document.documentElement.classList.add("noVNC_connecting");
break;
case 'connected':
@@ -523,7 +532,7 @@ index 2218d24..143cb60 100644
document.documentElement.classList.add("noVNC_connected");
break;
case 'disconnecting':
-@@ -400,6 +408,11 @@ var UI = {
+@@ -397,6 +403,11 @@ const UI = {
document.documentElement.classList.add("noVNC_disconnecting");
break;
case 'disconnected':
@@ -535,7 +544,7 @@ index 2218d24..143cb60 100644
break;
case 'reconnecting':
transition_elem.textContent = _("Reconnecting...");
-@@ -813,6 +826,7 @@ var UI = {
+@@ -818,6 +829,7 @@ const UI = {
UI.closePowerPanel();
UI.closeClipboardPanel();
UI.closeExtraKeys();
@@ -543,7 +552,7 @@ index 2218d24..143cb60 100644
},
/* ------^-------
-@@ -988,6 +1002,12 @@ var UI = {
+@@ -993,6 +1005,12 @@ const UI = {
UI.reconnect_password = password;
}
@@ -556,7 +565,7 @@ index 2218d24..143cb60 100644
if (password === null) {
password = undefined;
}
-@@ -1567,9 +1587,36 @@ var UI = {
+@@ -1567,9 +1585,36 @@ const UI = {
/* ------^-------
* /EXTRA KEYS
* ==============
@@ -591,9 +600,43 @@ index 2218d24..143cb60 100644
+ * ==============
+ * MISC
+ * ------v------*/
- setMouseButton: function(num) {
- var view_only = UI.rfb.viewOnly;
+ setMouseButton(num) {
+ const view_only = UI.rfb.viewOnly;
if (UI.rfb && !view_only) {
+diff --git a/vnc.html b/vnc.html
+index 701714c..6c041b5 100644
+--- a/vnc.html
++++ b/vnc.html
+@@ -200,7 +200,7 @@
+ <li class="noVNC_heading">
+ <img src="app/images/settings.svg"> Settings
+ </li>
+- <li>
++ <li style="display:none;">
+ <label><input id="noVNC_setting_shared" type="checkbox" /> Shared Mode</label>
+ </li>
+ <li>
+@@ -211,15 +211,17 @@
+ <label><input id="noVNC_setting_view_clip" type="checkbox" /> Clip to Window</label>
+ </li>
+ <li>
++ <label><input id="noVNC_setting_autoresize" type="checkbox" /> Autoresize Window</label>
++ </li>
++ <li>
+ <label for="noVNC_setting_resize">Scaling Mode:</label>
+ <select id="noVNC_setting_resize" name="vncResize">
+- <option value="off">None</option>
++ <option value="off">Off</option>
+ <option value="scale">Local Scaling</option>
+- <option value="remote">Remote Resizing</option>
+ </select>
+ </li>
+ <li><hr></li>
+- <li>
++ <li style="display:none;">
+ <div class="noVNC_expander">Advanced</div>
+ <div><ul>
+ <li>
--
2.11.0
diff --git a/debian/patches/0002-add-custom-fbresize-event-on-rfb.patch b/debian/patches/0002-add-custom-fbresize-event-on-rfb.patch
index 86ef08e..e88e974 100644
--- a/debian/patches/0002-add-custom-fbresize-event-on-rfb.patch
+++ b/debian/patches/0002-add-custom-fbresize-event-on-rfb.patch
@@ -1,4 +1,4 @@
-From 5a456e52e6a1c9cb283187505bc09289a9fb3334 Mon Sep 17 00:00:00 2001
+From 4bf525059741e1bb68e355904fb82e8c1639aff9 Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak at proxmox.com>
Date: Wed, 9 May 2018 10:47:53 +0200
Subject: [PATCH 02/10] add custom fbresize event on rfb
@@ -8,15 +8,15 @@ window
Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
- app/ui.js | 16 ++++++++++++++++
+ app/ui.js | 11 +++++++++++
core/rfb.js | 10 ++++++++++
- 2 files changed, 26 insertions(+)
+ 2 files changed, 21 insertions(+)
diff --git a/app/ui.js b/app/ui.js
-index 143cb60..b01fd5d 100644
+index 59f7cca..d960a12 100644
--- a/app/ui.js
+++ b/app/ui.js
-@@ -1047,6 +1047,7 @@ var UI = {
+@@ -1050,6 +1050,7 @@ const UI = {
UI.rfb.addEventListener("clipboard", UI.clipboardReceive);
UI.rfb.addEventListener("bell", UI.bell);
UI.rfb.addEventListener("desktopname", UI.updateDesktopName);
@@ -24,7 +24,7 @@ index 143cb60..b01fd5d 100644
UI.rfb.clipViewport = UI.getSetting('view_clip');
UI.rfb.scaleViewport = UI.getSetting('resize') === 'scale';
UI.rfb.resizeSession = UI.getSetting('resize') === 'remote';
-@@ -1612,6 +1613,21 @@ var UI = {
+@@ -1610,6 +1611,16 @@ const UI = {
document.getElementById('pve_commands_button').classList.remove("noVNC_selected");
},
@@ -32,12 +32,7 @@ index 143cb60..b01fd5d 100644
+ var rfb = e.detail.rfb;
+ var width = e.detail.width;
+ var height = e.detail.height;
-+ var resize = UI.getSetting('resize');
-+
-+ if (resize == 'null') {
-+ var clip = UI.getSetting('view_clip');
-+ UI.PVE.updateFBSize(rfb, width, height, clip);
-+ }
++ UI.PVE.updateFBSize(rfb, width, height);
+
+ UI.applyResizeMode();
+ UI.updateViewClip();
@@ -47,10 +42,10 @@ index 143cb60..b01fd5d 100644
* /PVE
* ==============
diff --git a/core/rfb.js b/core/rfb.js
-index 7c4e0c9..6a1ff85 100644
+index 3433030..3e0f176 100644
--- a/core/rfb.js
+++ b/core/rfb.js
-@@ -1588,6 +1588,16 @@ RFB.prototype = {
+@@ -1593,6 +1593,16 @@ export default class RFB extends EventTargetMixin {
this._updateClip();
this._updateScale();
@@ -66,7 +61,7 @@ index 7c4e0c9..6a1ff85 100644
+
this._timing.fbu_rt_start = (new Date()).getTime();
this._updateContinuousUpdates();
- },
+ }
--
2.11.0
diff --git a/debian/patches/0003-change-scaling-when-toggling-fullscreen.patch b/debian/patches/0003-change-scaling-when-toggling-fullscreen.patch
index dec2248..bb1eac1 100644
--- a/debian/patches/0003-change-scaling-when-toggling-fullscreen.patch
+++ b/debian/patches/0003-change-scaling-when-toggling-fullscreen.patch
@@ -1,4 +1,4 @@
-From 6abc6b0b278717584ff2452cbe8d1f448398a406 Mon Sep 17 00:00:00 2001
+From ce3216300e07c2723dc934c734dda432355a3100 Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak at proxmox.com>
Date: Thu, 11 May 2017 10:34:10 +0200
Subject: [PATCH 03/10] change scaling when toggling fullscreen
@@ -8,32 +8,34 @@ and changing it back when leaving fullscreen
Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
- app/ui.js | 9 +++++++++
- 1 file changed, 9 insertions(+)
+ app/ui.js | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
diff --git a/app/ui.js b/app/ui.js
-index b01fd5d..d35be49 100644
+index d960a12..662352f 100644
--- a/app/ui.js
+++ b/app/ui.js
-@@ -1210,6 +1210,12 @@ var UI = {
+@@ -1212,6 +1212,13 @@ const UI = {
} else if (document.msExitFullscreen) {
document.msExitFullscreen();
}
+
+ // when changing from fullscreen to window,
+ // re enable auto resize
-+ if (WebUtil.getQueryVar('resize') === null) {
-+ UI.updateSetting('resize', null);
++ if (WebUtil.getQueryVar('resize') !== 'scale') {
++ UI.forceSetting('resize', 'off');
++ UI.enableSetting('resize');
+ }
} else {
if (document.documentElement.requestFullscreen) {
document.documentElement.requestFullscreen();
-@@ -1220,7 +1226,10 @@ var UI = {
+@@ -1222,7 +1229,11 @@ const UI = {
} else if (document.body.msRequestFullscreen) {
document.body.msRequestFullscreen();
}
+ // we want scaling in fullscreen mode
-+ UI.updateSetting('resize', 'scale');
++ UI.forceSetting('resize', 'scale');
++ UI.enableSetting('resize');
}
+ UI.applyResizeMode();
UI.enableDisableViewClip();
diff --git a/debian/patches/0004-add-pve-style.patch b/debian/patches/0004-add-pve-style.patch
index a5f2050..61f301b 100644
--- a/debian/patches/0004-add-pve-style.patch
+++ b/debian/patches/0004-add-pve-style.patch
@@ -1,4 +1,4 @@
-From 5d8fb2485e4863d561481ea7d51e36f8e0be1d2b Mon Sep 17 00:00:00 2001
+From ad3490e9908ce0a65ef40576520fb33236b5c102 Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak at proxmox.com>
Date: Tue, 13 Dec 2016 16:03:41 +0100
Subject: [PATCH 04/10] add pve style
@@ -64,7 +64,7 @@ index 0000000..eaeb5cb
+ background: #5BA8DF;
+}
diff --git a/vnc.html b/vnc.html
-index 701714c..63d7181 100644
+index 6c041b5..3110e8b 100644
--- a/vnc.html
+++ b/vnc.html
@@ -55,6 +55,7 @@
diff --git a/debian/patches/0005-remove-vnc-logos.patch b/debian/patches/0005-remove-vnc-logos.patch
index 9a0cc43..a477e01 100644
--- a/debian/patches/0005-remove-vnc-logos.patch
+++ b/debian/patches/0005-remove-vnc-logos.patch
@@ -1,4 +1,4 @@
-From 761e67e803bfcf196cc2229ec451adaee0beb61a Mon Sep 17 00:00:00 2001
+From b093138dedf1c2b8f5b91fe8819092bf8f1371be Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak at proxmox.com>
Date: Fri, 20 Jan 2017 10:35:05 +0100
Subject: [PATCH 05/10] remove vnc logos
@@ -11,7 +11,7 @@ Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
1 file changed, 26 deletions(-)
diff --git a/vnc.html b/vnc.html
-index 63d7181..60727e4 100644
+index 3110e8b..bc1a47d 100644
--- a/vnc.html
+++ b/vnc.html
@@ -23,36 +23,10 @@
diff --git a/debian/patches/0006-change-src-directory-for-images-js-files.patch b/debian/patches/0006-change-src-directory-for-images-js-files.patch
index 60f6ab6..209d6e3 100644
--- a/debian/patches/0006-change-src-directory-for-images-js-files.patch
+++ b/debian/patches/0006-change-src-directory-for-images-js-files.patch
@@ -1,4 +1,4 @@
-From 87486c038db7ddb212f995c70edf13dc1e8783cd Mon Sep 17 00:00:00 2001
+From 127328ecd3996a572d202d9a33da98cad24ecc75 Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak at proxmox.com>
Date: Tue, 17 Jan 2017 17:24:03 +0100
Subject: [PATCH 06/10] change src directory for images/js files
@@ -8,39 +8,25 @@ also change the directory in the build script
Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
- app/ui.js | 2 +-
- utils/use_require_helpers.js | 2 +-
- vnc.html | 56 ++++++++++++++++++++++----------------------
- 3 files changed, 30 insertions(+), 30 deletions(-)
+ app/ui.js | 2 +-
+ vnc.html | 56 ++++++++++++++++++++++++++++----------------------------
+ 2 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/app/ui.js b/app/ui.js
-index d35be49..d64389d 100644
+index 662352f..c523fcd 100644
--- a/app/ui.js
+++ b/app/ui.js
-@@ -1725,7 +1725,7 @@ var UI = {
- var LINGUAS = ["de", "el", "es", "nl", "pl", "sv", "tr", "zh"];
+@@ -1720,7 +1720,7 @@ const UI = {
+ const LINGUAS = ["de", "el", "es", "nl", "pl", "sv", "tr", "zh_CN", "zh_TW"];
l10n.setup(LINGUAS);
if (l10n.language !== "en" && l10n.dictionary === undefined) {
-- WebUtil.fetchJSON('app/locale/' + l10n.language + '.json', function (translations) {
+- WebUtil.fetchJSON('app/locale/' + l10n.language + '.json', (translations) => {
+ WebUtil.fetchJSON('/novnc/app/locale/' + l10n.language + '.json', function (translations) {
l10n.dictionary = translations;
// wait for translations to load before loading the UI
-diff --git a/utils/use_require_helpers.js b/utils/use_require_helpers.js
-index 990fb4d..0f44e1c 100644
---- a/utils/use_require_helpers.js
-+++ b/utils/use_require_helpers.js
-@@ -22,7 +22,7 @@ module.exports = {
- var browserify = require('browserify');
- var b = browserify(path.join(base_out_path, 'app/ui.js'), {});
- b.bundle().pipe(fs.createWriteStream(out_path));
-- return `<script src="${path.relative(base_out_path, out_path)}"></script>`;
-+ return `<script src="/novnc/${path.relative(base_out_path, out_path)}"></script>`;
- },
- noCopyOverride: () => {},
- },
diff --git a/vnc.html b/vnc.html
-index 60727e4..fa66d6f 100644
+index bc1a47d..d17ee81 100644
--- a/vnc.html
+++ b/vnc.html
@@ -28,7 +28,7 @@
@@ -196,9 +182,9 @@ index 60727e4..fa66d6f 100644
- <img src="app/images/settings.svg"> Settings
+ <img src="/novnc/app/images/settings.svg"> Settings
</li>
- <li>
+ <li style="display:none;">
<label><input id="noVNC_setting_shared" type="checkbox" /> Shared Mode</label>
-@@ -244,7 +244,7 @@
+@@ -246,7 +246,7 @@
</div>
<!-- Connection Controls -->
@@ -207,7 +193,7 @@ index 60727e4..fa66d6f 100644
id="noVNC_disconnect_button" class="noVNC_button"
title="Disconnect" />
-@@ -263,7 +263,7 @@
+@@ -265,7 +265,7 @@
<div id="noVNC_connect_dlg">
<div class="noVNC_logo" translate="no"><span>no</span>VNC</div>
<div id="noVNC_connect_button"><div>
@@ -216,7 +202,7 @@ index 60727e4..fa66d6f 100644
</div></div>
</div>
</div>
-@@ -304,8 +304,8 @@
+@@ -306,8 +306,8 @@
</div>
<audio id="noVNC_bell">
diff --git a/debian/patches/0007-add-pve-vnc-commands.patch b/debian/patches/0007-add-pve-vnc-commands.patch
index b81852a..a062647 100644
--- a/debian/patches/0007-add-pve-vnc-commands.patch
+++ b/debian/patches/0007-add-pve-vnc-commands.patch
@@ -1,20 +1,20 @@
-From d83521eab33ef32d35f4ea8ada73585bad4265a4 Mon Sep 17 00:00:00 2001
+From 67da56922c2edea81ee98198db125d9fc8abd8b4 Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak at proxmox.com>
Date: Fri, 20 Jan 2017 10:35:43 +0100
Subject: [PATCH 07/10] add pve vnc commands
Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
- vnc.html | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
+ vnc.html | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
diff --git a/vnc.html b/vnc.html
-index fa66d6f..8c3d9d9 100644
+index d17ee81..eca9a54 100644
--- a/vnc.html
+++ b/vnc.html
-@@ -165,6 +165,26 @@
- id="noVNC_fullscreen_button" class="noVNC_button noVNC_hidden"
- title="Fullscreen" />
+@@ -245,6 +245,27 @@
+ </div>
+ </div>
+ <!-- PVE Commands -->
+ <input type="image" alt="Commands" src="/novnc/app/images/power.svg"
@@ -36,9 +36,10 @@ index fa66d6f..8c3d9d9 100644
+ </div>
+ </div>
+
- <!-- Settings -->
- <input type="image" alt="Settings" src="/novnc/app/images/settings.svg"
- id="noVNC_settings_button" class="noVNC_button"
++
+ <!-- Connection Controls -->
+ <input type="image" alt="Disconnect" src="/novnc/app/images/disconnect.svg"
+ id="noVNC_disconnect_button" class="noVNC_button"
--
2.11.0
diff --git a/debian/patches/0008-add-replaceable-snippets-in-vnc.html.patch b/debian/patches/0008-add-replaceable-snippets-in-vnc.html.patch
index 41b3ee2..6b1cceb 100644
--- a/debian/patches/0008-add-replaceable-snippets-in-vnc.html.patch
+++ b/debian/patches/0008-add-replaceable-snippets-in-vnc.html.patch
@@ -1,4 +1,4 @@
-From f56b6fe825b776c30e445d2319488bec63551b8f Mon Sep 17 00:00:00 2001
+From 492c7d299d770dca563f806eadb6458a24d97b2d Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak at proxmox.com>
Date: Fri, 20 Jan 2017 10:16:09 +0100
Subject: [PATCH 08/10] add replaceable snippets in vnc.html
@@ -11,7 +11,7 @@ Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/vnc.html b/vnc.html
-index 8c3d9d9..a139e26 100644
+index eca9a54..f63aaa7 100644
--- a/vnc.html
+++ b/vnc.html
@@ -15,7 +15,7 @@
diff --git a/debian/patches/0009-decrease-animation-time.patch b/debian/patches/0009-decrease-animation-time.patch
index 95d94a3..34c9d8e 100644
--- a/debian/patches/0009-decrease-animation-time.patch
+++ b/debian/patches/0009-decrease-animation-time.patch
@@ -1,4 +1,4 @@
-From d98b4392c64493316f3b7b899772e4411b346ee0 Mon Sep 17 00:00:00 2001
+From 60e19c4a22688d0e13dedbed1808e6b4576946e8 Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak at proxmox.com>
Date: Fri, 20 Jan 2017 10:55:49 +0100
Subject: [PATCH 09/10] decrease animation time
diff --git a/debian/patches/0010-use-only-app.js.patch b/debian/patches/0010-use-only-app.js.patch
index bbba831..edcddba 100644
--- a/debian/patches/0010-use-only-app.js.patch
+++ b/debian/patches/0010-use-only-app.js.patch
@@ -1,4 +1,4 @@
-From 821a87411fd75bc1137e99250689f21d820e49ed Mon Sep 17 00:00:00 2001
+From e78d6d49ae2c4986ce283ddb2b36601f498d5015 Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak at proxmox.com>
Date: Tue, 16 May 2017 10:36:15 +0200
Subject: [PATCH 10/10] use only app.js
@@ -12,7 +12,7 @@ Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/vnc.html b/vnc.html
-index a139e26..46d09d7 100644
+index f63aaa7..83825eb 100644
--- a/vnc.html
+++ b/vnc.html
@@ -46,22 +46,7 @@
--
2.11.0
More information about the pve-devel
mailing list