reorganize qemu items

use new tree functionality of configpanel

move options,monitor,console under hardware (now system)
move firewall subpanels into tree

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2016-08-22 17:13:37 +02:00 committed by Dietmar Maurer
parent e62ebded82
commit c284be32bd

View File

@ -138,15 +138,20 @@ Ext.define('PVE.qemu.Config', {
{ {
title: gettext('Summary'), title: gettext('Summary'),
xtype: 'pveQemuSummary', xtype: 'pveQemuSummary',
iconCls: 'fa fa-book',
itemId: 'summary' itemId: 'summary'
}, },
{ {
title: gettext('Hardware'), title: gettext('System'),
itemId: 'hardware', itemId: 'system',
expandedOnInit: true,
iconCls: 'fa fa-desktop',
xtype: 'PVE.qemu.HardwareView' xtype: 'PVE.qemu.HardwareView'
}, },
{ {
title: gettext('Options'), title: gettext('Options'),
groups: ['system'],
iconCls: 'fa fa-gear',
itemId: 'options', itemId: 'options',
xtype: 'PVE.qemu.Options' xtype: 'PVE.qemu.Options'
}, },
@ -154,6 +159,7 @@ Ext.define('PVE.qemu.Config', {
title: gettext('Task History'), title: gettext('Task History'),
itemId: 'tasks', itemId: 'tasks',
xtype: 'pveNodeTasks', xtype: 'pveNodeTasks',
iconCls: 'fa fa-list',
vmidFilter: vmid vmidFilter: vmid
} }
] ]
@ -162,6 +168,8 @@ Ext.define('PVE.qemu.Config', {
if (caps.vms['VM.Monitor'] && !template) { if (caps.vms['VM.Monitor'] && !template) {
me.items.push({ me.items.push({
title: gettext('Monitor'), title: gettext('Monitor'),
groups: ['system'],
iconCls: 'fa fa-eye',
itemId: 'monitor', itemId: 'monitor',
xtype: 'pveQemuMonitor' xtype: 'pveQemuMonitor'
}); });
@ -170,6 +178,7 @@ Ext.define('PVE.qemu.Config', {
if (caps.vms['VM.Backup']) { if (caps.vms['VM.Backup']) {
me.items.push({ me.items.push({
title: gettext('Backup'), title: gettext('Backup'),
iconCls: 'fa fa-floppy-o',
xtype: 'pveBackupView', xtype: 'pveBackupView',
itemId: 'backup' itemId: 'backup'
}); });
@ -178,6 +187,7 @@ Ext.define('PVE.qemu.Config', {
if (caps.vms['VM.Snapshot'] && !template) { if (caps.vms['VM.Snapshot'] && !template) {
me.items.push({ me.items.push({
title: gettext('Snapshots'), title: gettext('Snapshots'),
iconCls: 'fa fa-history',
xtype: 'pveQemuSnapshotTree', xtype: 'pveQemuSnapshotTree',
itemId: 'snapshot' itemId: 'snapshot'
}); });
@ -187,6 +197,8 @@ Ext.define('PVE.qemu.Config', {
me.items.push({ me.items.push({
title: gettext('Console'), title: gettext('Console'),
itemId: 'console', itemId: 'console',
iconCls: 'fa fa-terminal',
groups: ['system'],
xtype: 'pveNoVncConsole', xtype: 'pveNoVncConsole',
vmid: vmid, vmid: vmid,
consoleType: 'kvm', consoleType: 'kvm',
@ -197,12 +209,47 @@ Ext.define('PVE.qemu.Config', {
if (caps.vms['VM.Console']) { if (caps.vms['VM.Console']) {
me.items.push( me.items.push(
{ {
xtype: 'pveFirewallPanel', xtype: 'pveFirewallRules',
title: gettext('Firewall'), title: gettext('Firewall'),
base_url: base_url + '/firewall', iconCls: 'fa fa-shield',
fwtype: 'vm', allow_iface: true,
phstateid: me.hstateid, base_url: base_url + '/firewall/rules',
list_refs_url: base_url + '/refs',
itemId: 'firewall' itemId: 'firewall'
},
{
xtype: 'pveFirewallOptions',
groups: ['firewall'],
iconCls: 'fa fa-gear',
title: gettext('Options'),
base_url: base_url + '/firewall/options',
fwtype: 'vm',
itemId: 'firewall-options'
},
{
xtype: 'pveFirewallAliases',
title: gettext('Alias'),
groups: ['firewall'],
iconCls: 'fa fa-external-link',
base_url: base_url + '/firewall/aliases',
itemId: 'firewall-aliases'
},
{
xtype: 'pveIPSet',
title: gettext('IPSet'),
groups: ['firewall'],
iconCls: 'fa fa-list-ol',
base_url: base_url + '/firewall/ipset',
list_refs_url: base_url + '/refs',
itemId: 'firewall-ipset'
},
{
title: gettext('Log'),
groups: ['firewall'],
iconCls: 'fa fa-list',
itemId: 'firewall-fwlog',
xtype: 'pveLogView',
url: '/api2/extjs' + base_url + '/firewall/log'
} }
); );
} }
@ -211,6 +258,7 @@ Ext.define('PVE.qemu.Config', {
me.items.push({ me.items.push({
xtype: 'pveACLView', xtype: 'pveACLView',
title: gettext('Permissions'), title: gettext('Permissions'),
iconCls: 'fa fa-unlock',
itemId: 'permissions', itemId: 'permissions',
path: '/vms/' + vmid path: '/vms/' + vmid
}); });