reorganize lxc items

use new tree functionality of configpanel

move options,network,dns,console under resources (now system)
move firewall subpanels into tree

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/www/manager6/StateProvider.js b/www/manager6/StateProvider.js
index 4f2d400dade09f3bd98afced6fd532370befed14..9924cd4a915436f1f7aa41803af6988a08280b76 100644 (file)
--- a/www/manager6/StateProvider.js
+++ b/www/manager6/StateProvider.js
@@ -49,6 +49,7 @@ Ext.define('PVE.StateProvider', {
     hprefix: 'v1',
 
     compDict: {
+       system: 50,
        monitor: 49,
        'ha-fencing': 48,
        'ha-groups': 47,

diff --git a/www/manager6/lxc/Config.js b/www/manager6/lxc/Config.js
index f014ffe190068b25a9b2bf7c60c1a66b59e259c3..25733cc0db2873a25d80cd078b1b7168ffc2fc8b 100644 (file)
--- a/www/manager6/lxc/Config.js
+++ b/www/manager6/lxc/Config.js
@@ -129,38 +129,41 @@ Ext.define('PVE.lxc.Config', {
                {
                    title: gettext('Summary'),
                    xtype: 'pveLxcSummary',
+                   iconCls: 'fa fa-book',
                    itemId: 'summary'
                },
                {
-                   title: gettext('Resources'),
-                   itemId: 'resources',
-                   layout: 'fit',
-                   plugins: {
-                       ptype: 'lazyitems',
-                       items: [{
-                           xtype: 'pveLxcRessourceView',
-                           pveSelNode: me.pveSelNode
-                       }]
-                   }
+                   title: gettext('System'),
+                   itemId: 'system',
+                   expandedOnInit: true,
+                   iconCls: 'fa fa-cube',
+                   xtype: 'pveLxcRessourceView'
+               },
+               {
+                   title: gettext('Options'),
+                   itemId: 'options',
+                   groups: ['system'],
+                   iconCls: 'fa fa-gear',
+                   xtype: 'pveLxcOptions'
                },
                {
                    title: gettext('Network'),
+                   iconCls: 'fa fa-exchange',
                    itemId: 'network',
+                   groups:['system'],
                    xtype: 'pveLxcNetworkView'
                },
                {
                    title: gettext('DNS'),
+                   groups: ['system'],
+                   iconCls: 'fa fa-globe',
                    itemId: 'dns',
                    xtype: 'pveLxcDNS'
                },
-               {
-                   title: gettext('Options'),
-                   itemId: 'options',
-                   xtype: 'pveLxcOptions'
-               },
                {
                    title: gettext('Task History'),
                    itemId: 'tasks',
+                   iconCls: 'fa fa-list',
                    xtype: 'pveNodeTasks',
                    vmidFilter: vmid
                }
@@ -170,6 +173,7 @@ Ext.define('PVE.lxc.Config', {
        if (caps.vms['VM.Backup']) {
            me.items.push({
                title: gettext('Backup'),
+               iconCls: 'fa fa-floppy-o',
                xtype: 'pveBackupView',
                itemId: 'backup'
            });
@@ -179,6 +183,8 @@ Ext.define('PVE.lxc.Config', {
            me.items.push({
                title: gettext('Console'),
                itemId: 'console',
+               groups: ['system'],
+               iconCls: 'fa fa-terminal',
                xtype: 'pveNoVncConsole',
                vmid: vmid,
                consoleType: 'lxc',
@@ -189,6 +195,7 @@ Ext.define('PVE.lxc.Config', {
        if (caps.vms['VM.Snapshot']) {
            me.items.push({
                title: gettext('Snapshots'),
+               iconCls: 'fa fa-history',
                xtype: 'pveLxcSnapshotTree',
                itemId: 'snapshot'
            });
@@ -197,12 +204,47 @@ Ext.define('PVE.lxc.Config', {
        if (caps.vms['VM.Console']) {
            me.items.push(
                {
-                   xtype: 'pveFirewallPanel',
+                   xtype: 'pveFirewallRules',
                    title: gettext('Firewall'),
-                   base_url: base_url + '/firewall',
-                   fwtype: 'vm',
-                   phstateid: me.hstateid,
+                   iconCls: 'fa fa-shield',
+                   allow_iface: true,
+                   base_url: base_url + '/firewall/rules',
+                   list_refs_url: base_url + '/refs',
                    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'
                }
            );
        }
@@ -212,6 +254,7 @@ Ext.define('PVE.lxc.Config', {
                xtype: 'pveACLView',
                title: gettext('Permissions'),
                itemId: 'permissions',
+               iconCls: 'fa fa-unlock',
                path: '/vms/' + vmid
            });
        }