add embedded qemu novnc console

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>

diff --git a/www/manager/Makefile b/www/manager/Makefile
index 05eee8945ca655f29c211b3c7abb7584599431e2..7f2acde3f69cbdc14ce4a8f7f932fdb2ba32bd29 100644 (file)
--- a/www/manager/Makefile
+++ b/www/manager/Makefile
@@ -115,6 +115,7 @@ JSSRC=                                                      \
        window/Migrate.js                               \
        window/MigrateAll.js                            \
        qemu/Monitor.js                                 \
+       qemu/Console.js                                 \
        qemu/Summary.js                                 \
        qemu/OSTypeEdit.js                              \
        qemu/ProcessorEdit.js                           \

diff --git a/www/manager/qemu/Config.js b/www/manager/qemu/Config.js
index 1d1c8a2054fe18d1cc255c047519835689cbb13e..f3882bfddcd3ad502dcbd7d8c43c0ce445b3bee5 100644 (file)
--- a/www/manager/qemu/Config.js
+++ b/www/manager/qemu/Config.js
@@ -177,6 +177,14 @@ Ext.define('PVE.qemu.Config', {
            });
        }
 
+       if (caps.vms['VM.Console']) {
+           me.items.push({
+               title: gettext('Console'),
+               itemId: 'console',
+               xtype: 'pveQemuConsole'
+           });
+       }
+
        if (caps.vms['VM.Console']) {
            me.items.push([
                {

diff --git a/www/manager/qemu/Console.js b/www/manager/qemu/Console.js
new file mode 100644 (file)
index 0000000..376e3fa
--- /dev/null
+++ b/www/manager/qemu/Console.js
@@ -0,0 +1,38 @@
+Ext.define('PVE.qemu.Console', {
+    extend: 'Ext.panel.Panel',
+
+    alias: 'widget.pveQemuConsole',
+
+    initComponent : function() {
+       var me = this;
+
+       var nodename = me.pveSelNode.data.node;
+       if (!nodename) {
+           throw "no node name specified";
+       }
+
+       var vmid = me.pveSelNode.data.vmid;
+       if (!vmid) {
+           throw "no VM ID specified";
+       }
+
+       var myid = "vncconsole";
+
+       var box = Ext.create('widget.uxiframe', {
+                   id: myid
+               });
+
+       Ext.apply(me, {
+           layout: { type: 'fit' },
+           border: false,
+           items: box,
+           listeners: {
+               show: function() {
+                   box.load('/?console=kvm&novnc=1&vmid='+ vmid + '&node=' + nodename + '&resize=scale');
+               }
+           }
+       });             
+
+       me.callParent();
+    }
+});