cleanup embeded console code, add console for lxc containers

www/manager/Makefile

@@ -115,7 +115,6 @@ JSSRC= 				                 	\
 	window/Migrate.js				\
 	window/MigrateAll.js				\
 	qemu/Monitor.js					\
-	qemu/Console.js					\
 	qemu/Summary.js					\
 	qemu/OSTypeEdit.js				\
 	qemu/ProcessorEdit.js				\

www/manager/VNCConsole.js

+Ext.define('PVE.noVncConsole', {
+    extend: 'Ext.panel.Panel',
+    alias: 'widget.pveNoVncConsole',
+
+    nodename: undefined,
+
+    vmid: undefined,
+
+    consoleType: undefined, // lxc or kvm
+    
+    initComponent : function() {
+	var me = this;
+
+	if (!me.nodename) {
+	    throw "no node name specified";
+	}
+
+	if (!me.vmid) {
+	    throw "no VM ID specified";
+	}
+	
+	if (!me.consoleType) {
+	    throw "no console type specified";
+	}
+
+	// always use same iframe, to avoid running several noVnc clients
+	// at same time (to avoid performance problems)
+	var box = Ext.create('widget.uxiframe', { id: "vncconsole" });
+
+	Ext.apply(me, {
+	    layout: { type: 'fit' },
+	    border: false,
+	    items: box,
+	    listeners: {
+		show: function() {
+		    box.load('/?console=' + me.consoleType + '&novnc=1&vmid='+ me.vmid +
+			     '&node=' + me.nodename + '&resize=scale');
+		}
+	    }
+	});		
+
+	me.callParent();
+    }
+});
+
 PVE_vnc_console_event = function(appletid, action, err) {
     //console.log("TESTINIT param1 " + appletid + " action " + action);
 

www/manager/lxc/Config.js

@@ -162,6 +162,18 @@ Ext.define('PVE.lxc.Config', {
 	    });
 	}
 
+	if (caps.vms['VM.Console']) {
+	    me.items.push({
+		title: gettext('Console'),
+		itemId: 'console',
+		xtype: 'pveNoVncConsole',
+		vmid: vmid,
+		consoleType: 'lxc',
+		nodename: nodename
+	    });
+	}
+
+
 	if (caps.vms['VM.Console']) {
 	    me.items.push([
 		{

www/manager/qemu/Config.js

@@ -181,7 +181,10 @@ Ext.define('PVE.qemu.Config', {
 	    me.items.push({
 		title: gettext('Console'),
 		itemId: 'console',
-		xtype: 'pveQemuConsole'
+		xtype: 'pveNoVncConsole',
+		vmid: vmid,
+		consoleType: 'kvm',
+		nodename: nodename
 	    });
 	}
 

www/manager/qemu/Console.js

-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();
-    }
-});