[pve-devel] [PATCH manager 07/10] move crushmap into ceph config

[Dominik Csapak]

instead of having 2 panels,
we have now a splitted panel
with both config and crushmap

also drop the not needed [] around the alias

Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
 www/manager6/ceph/Config.js | 31 +++++++++++++++++++++++++++++--
 www/manager6/node/Config.js |  8 +-------
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/www/manager6/ceph/Config.js b/www/manager6/ceph/Config.js
index dd6c956..372c9cf 100644
--- a/www/manager6/ceph/Config.js
+++ b/www/manager6/ceph/Config.js
@@ -1,6 +1,6 @@
 Ext.define('PVE.node.CephConfig', {
     extend: 'Ext.panel.Panel',
-    alias: ['widget.pveNodeCephConfig'],
+    alias: 'widget.pveNodeCephConfig',
 
     bodyStyle: 'white-space:pre',
     bodyPadding: 5,
@@ -44,9 +44,36 @@ Ext.define('PVE.node.CephConfig', {
     }
 });
 
+Ext.define('PVE.node.CephConfigCrush', {
+    extend: 'Ext.panel.Panel',
+    alias: 'widget.pveNodeCephConfigCrush',
+
+    layout: 'border',
+    items: [{
+	    title: gettext('Ceph Config'),
+	    xtype: 'pveNodeCephConfig',
+	    region: 'center'
+	},
+	{
+	    title: gettext('Crush Map'),
+	    xtype: 'pveNodeCephCrushMap',
+	    region: 'east',
+	    split: true,
+	    flex: 1
+    }],
+
+    initComponent: function() {
+	var me = this;
+	me.defaults = {
+	    pveSelNode: me.pveSelNode
+	};
+	me.callParent();
+    }
+});
+
 Ext.define('PVE.node.Ceph', {
     extend: 'PVE.panel.SubConfig',
-    alias: ['widget.pveNodeCeph'],
+    alias: 'widget.pveNodeCeph',
 
     minTabWidth: 80,
     configPrefix: 'ceph',
diff --git a/www/manager6/node/Config.js b/www/manager6/node/Config.js
index 9d5ee79..7a2c26d 100644
--- a/www/manager6/node/Config.js
+++ b/www/manager6/node/Config.js
@@ -232,7 +232,7 @@ Ext.define('PVE.node.Config', {
 		    groups: ['ceph']
 		},
 		{
-		    xtype: 'pveNodeCephConfig',
+		    xtype: 'pveNodeCephConfigCrush',
 		    title: gettext('Config'),
 		    iconCls: 'fa fa-gear',
 		    groups: ['ceph'],
@@ -258,12 +258,6 @@ Ext.define('PVE.node.Config', {
 		    iconCls: 'fa fa-sitemap',
 		    groups: ['ceph'],
 		    itemId: 'ceph-pools'
-		},
-		{
-		    title: 'Crush',
-		    iconCls: 'fa fa-map-o',
-		    xtype: 'pveNodeCephCrushMap',
-		    itemId: 'crushmap'
 		}
 	    );
 	}
-- 
2.1.4