From 1939a0069efe28f2008e75c04e5a77f2d08065df Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Thu, 1 Sep 2016 11:19:09 +0200 Subject: [PATCH] partially rever qemu gui structure this restores the structure of the qemu options and moves the console to the second position Signed-off-by: Dominik Csapak --- www/manager6/qemu/Config.js | 69 ++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/www/manager6/qemu/Config.js b/www/manager6/qemu/Config.js index 32ace7af..9a20fe33 100644 --- a/www/manager6/qemu/Config.js +++ b/www/manager6/qemu/Config.js @@ -140,35 +140,47 @@ Ext.define('PVE.qemu.Config', { xtype: 'pveQemuSummary', iconCls: 'fa fa-book', itemId: 'summary' - }, - { - title: gettext('System'), - itemId: 'system', - expandedOnInit: true, - iconCls: 'fa fa-desktop', - xtype: 'PVE.qemu.HardwareView' - }, - { - title: gettext('Options'), - groups: ['system'], - iconCls: 'fa fa-gear', - itemId: 'options', - xtype: 'PVE.qemu.Options' - }, - { - title: gettext('Task History'), - itemId: 'tasks', - xtype: 'pveNodeTasks', - iconCls: 'fa fa-list', - vmidFilter: vmid } ] }); + if (caps.vms['VM.Console'] && !template) { + me.items.push({ + title: gettext('Console'), + itemId: 'console', + iconCls: 'fa fa-terminal', + xtype: 'pveNoVncConsole', + vmid: vmid, + consoleType: 'kvm', + nodename: nodename + }); + } + + me.items.push( + { + title: gettext('Hardware'), + itemId: 'hardware', + iconCls: 'fa fa-desktop', + xtype: 'PVE.qemu.HardwareView' + }, + { + title: gettext('Options'), + iconCls: 'fa fa-gear', + itemId: 'options', + xtype: 'PVE.qemu.Options' + }, + { + title: gettext('Task History'), + itemId: 'tasks', + xtype: 'pveNodeTasks', + iconCls: 'fa fa-list', + vmidFilter: vmid + } + ); + if (caps.vms['VM.Monitor'] && !template) { me.items.push({ title: gettext('Monitor'), - groups: ['system'], iconCls: 'fa fa-eye', itemId: 'monitor', xtype: 'pveQemuMonitor' @@ -193,19 +205,6 @@ Ext.define('PVE.qemu.Config', { }); } - if (caps.vms['VM.Console'] && !template) { - me.items.push({ - title: gettext('Console'), - itemId: 'console', - iconCls: 'fa fa-terminal', - groups: ['system'], - xtype: 'pveNoVncConsole', - vmid: vmid, - consoleType: 'kvm', - nodename: nodename - }); - } - if (caps.vms['VM.Console']) { me.items.push( {