From 7e27f5d1b4d56a4780df7748de893d98f66ade80 Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Wed, 16 Mar 2016 15:58:14 +0100 Subject: [PATCH] ext6migrate: make some (sub)tabs lazy make following (sub)tabs lazy: * ceph * firewall * ha * search * lxc/Resources we have to add layout: 'fit', whereever we make a whole tab lazy and we have to move the title of the search tab to the instantiaton instead of the class definition, because the search grid is now a sub component instead of a tab Signed-off-by: Dominik Csapak --- www/manager6/ceph/Config.js | 89 ++++++++++++++++--------------- www/manager6/ha/Config.js | 5 +- www/manager6/lxc/Config.js | 9 +++- www/manager6/panel/ConfigPanel.js | 12 ++++- www/manager6/panel/Firewall.js | 7 ++- 5 files changed, 73 insertions(+), 49 deletions(-) diff --git a/www/manager6/ceph/Config.js b/www/manager6/ceph/Config.js index 49a03176..2ff60ed7 100644 --- a/www/manager6/ceph/Config.js +++ b/www/manager6/ceph/Config.js @@ -64,49 +64,52 @@ Ext.define('PVE.node.Ceph', { border: false, pveSelNode: me.pveSelNode }, - items: [ - { - xtype: 'pveNodeCephStatus', - title: gettext('Status'), - itemId: 'status' - }, - { - xtype: 'pveNodeCephConfig', - title: gettext('Config'), - itemId: 'config' - }, - { - xtype: 'pveNodeCephMonList', - title: gettext('Monitor'), - itemId: 'monlist' - }, - { - xtype: 'pveNodeCephDiskList', - title: gettext('Disks'), - itemId: 'disklist' - }, - { - xtype: 'pveNodeCephOsdTree', - title: 'OSD', - itemId: 'osdtree' - }, - { - xtype: 'pveNodeCephPoolList', - title: gettext('Pools'), - itemId: 'pools' - }, - { - title: 'Crush', - xtype: 'pveNodeCephCrushMap', - itemId: 'crushmap' - }, - { - title: gettext('Log'), - itemId: 'log', - xtype: 'pveLogView', - url: "/api2/extjs/nodes/" + nodename + "/ceph/log" - } - ], + plugins: { + ptype: 'lazyitems', + items: [ + { + xtype: 'pveNodeCephStatus', + title: gettext('Status'), + itemId: 'status' + }, + { + xtype: 'pveNodeCephConfig', + title: gettext('Config'), + itemId: 'config' + }, + { + xtype: 'pveNodeCephMonList', + title: gettext('Monitor'), + itemId: 'monlist' + }, + { + xtype: 'pveNodeCephDiskList', + title: gettext('Disks'), + itemId: 'disklist' + }, + { + xtype: 'pveNodeCephOsdTree', + title: 'OSD', + itemId: 'osdtree' + }, + { + xtype: 'pveNodeCephPoolList', + title: gettext('Pools'), + itemId: 'pools' + }, + { + title: 'Crush', + xtype: 'pveNodeCephCrushMap', + itemId: 'crushmap' + }, + { + title: gettext('Log'), + itemId: 'log', + xtype: 'pveLogView', + url: "/api2/extjs/nodes/" + nodename + "/ceph/log" + } + ], + } }); me.callParent(); diff --git a/www/manager6/ha/Config.js b/www/manager6/ha/Config.js index c14740df..a00bbfa7 100644 --- a/www/manager6/ha/Config.js +++ b/www/manager6/ha/Config.js @@ -36,7 +36,10 @@ Ext.define('PVE.panel.HA', { border: false, pveSelNode: me.pveSelNode }, - items: items + plugins: [{ + ptype: 'lazyitems', + items: items + }], }); me.callParent(); diff --git a/www/manager6/lxc/Config.js b/www/manager6/lxc/Config.js index 3ac8722d..ea0ca13c 100644 --- a/www/manager6/lxc/Config.js +++ b/www/manager6/lxc/Config.js @@ -128,7 +128,14 @@ Ext.define('PVE.lxc.Config', { { title: gettext('Resources'), itemId: 'resources', - xtype: 'pveLxcRessourceView' + layout: 'fit', + plugins: { + ptype: 'lazyitems', + items: { + xtype: 'pveLxcRessourceView', + pveSelNode: me.pveSelNode + } + } }, { title: gettext('Network'), diff --git a/www/manager6/panel/ConfigPanel.js b/www/manager6/panel/ConfigPanel.js index d78cd152..4e27b63a 100644 --- a/www/manager6/panel/ConfigPanel.js +++ b/www/manager6/panel/ConfigPanel.js @@ -49,8 +49,16 @@ Ext.define('PVE.panel.Config', { if (me.showSearch) { items.unshift({ - itemId: 'search', - xtype: 'pveResourceGrid' + itemId: 'search', + title: gettext('Search'), + layout: 'fit', + plugins: { + ptype: 'lazyitems', + items: { + xtype: 'pveResourceGrid', + pveSelNode: me.pveSelNode + } + } }); } diff --git a/www/manager6/panel/Firewall.js b/www/manager6/panel/Firewall.js index 4e7efd39..f11fdb97 100644 --- a/www/manager6/panel/Firewall.js +++ b/www/manager6/panel/Firewall.js @@ -89,9 +89,12 @@ Ext.define('PVE.panel.Firewall', { border: false, pveSelNode: me.pveSelNode }, - items: items + plugins: [{ + ptype: 'lazyitems', + items: items + }], }); me.callParent(); } -}); \ No newline at end of file +});