[pve-devel] [PATCH manager 4/5] use nodedisk panel and remove ceph disks from navigation

Dominik Csapak d.csapak at proxmox.com
Tue Aug 23 14:49:16 CEST 2016


this makes ceph a subentry of storage, which is
now the disk panel, and remove the ceph disk panel
from the navigation

Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
 www/manager6/node/Config.js | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/www/manager6/node/Config.js b/www/manager6/node/Config.js
index 7a2c26d..f92fc8a 100644
--- a/www/manager6/node/Config.js
+++ b/www/manager6/node/Config.js
@@ -219,44 +219,45 @@ Ext.define('PVE.node.Config', {
 	if (caps.nodes['Sys.Audit']) {
 	    me.items.push(
 		{
+		    title: gettext('Storage'),
+		    itemId: 'storage',
+		    expandedOnInit: true,
+		    iconCls: 'fa fa-hdd-o',
+		    xtype: 'pveNodeDiskList'
+		},
+		{
 		    title: 'Ceph',
 		    itemId: 'ceph',
 		    iconCls: 'fa fa-ceph',
+		    groups: ['storage'],
 		    xtype: 'pveNodeCephStatus'
 		},
 		{
-		    title: gettext('Disks'),
-		    xtype: 'pveNodeCephDiskList',
-		    iconCls: 'fa fa-hdd-o',
-		    itemId: 'disklist',
-		    groups: ['ceph']
-		},
-		{
 		    xtype: 'pveNodeCephConfigCrush',
 		    title: gettext('Config'),
 		    iconCls: 'fa fa-gear',
-		    groups: ['ceph'],
+		    groups: ['storage','ceph'],
 		    itemId: 'ceph-config'
 		},
 		{
 		    xtype: 'pveNodeCephMonList',
 		    title: gettext('Monitor'),
 		    iconCls: 'fa fa-tv',
-		    groups: ['ceph'],
+		    groups: ['storage','ceph'],
 		    itemId: 'ceph-monlist'
 		},
 		{
 		    xtype: 'pveNodeCephOsdTree',
 		    title: 'OSD',
 		    iconCls: 'fa fa-hdd-o',
-		    groups: ['ceph'],
+		    groups: ['storage','ceph'],
 		    itemId: 'ceph-osdtree'
 		},
 		{
 		    xtype: 'pveNodeCephPoolList',
 		    title: gettext('Pools'),
 		    iconCls: 'fa fa-sitemap',
-		    groups: ['ceph'],
+		    groups: ['storage','ceph'],
 		    itemId: 'ceph-pools'
 		}
 	    );
@@ -276,7 +277,7 @@ Ext.define('PVE.node.Config', {
 		    title: gettext('Log'),
 		    itemId: 'ceph-log',
 		    iconCls: 'fa fa-list',
-		    groups: ['ceph'],
+		    groups: ['storage','ceph'],
 		    xtype: 'pveLogView',
 		    url: "/api2/extjs/nodes/" + nodename + "/ceph/log"
 		});
-- 
2.1.4





More information about the pve-devel mailing list