ui: sys config: merge webauthn and general options into one tab
To much wasted space else. Also rename "Options" to "Others", while it's not _that_ much better it's slightly more intuitive than config -> options (which has some redundancy)... Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
2e02a859cf
commit
50c0840146
|
@ -45,30 +45,9 @@ Ext.define('PBS.SystemConfiguration', {
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: gettext('Authentication'),
|
|
||||||
itemId: 'authentication',
|
|
||||||
xtype: 'panel',
|
|
||||||
layout: {
|
|
||||||
type: 'vbox',
|
|
||||||
align: 'stretch',
|
|
||||||
multi: true,
|
|
||||||
},
|
|
||||||
defaults: {
|
|
||||||
collapsible: true,
|
|
||||||
animCollapse: false,
|
|
||||||
margin: '10 10 0 10',
|
|
||||||
},
|
|
||||||
items: [
|
|
||||||
{
|
|
||||||
title: gettext('Webauthn'),
|
|
||||||
xtype: 'pbsWebauthnConfigView',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: gettext('Options'),
|
|
||||||
itemId: 'options',
|
|
||||||
xtype: 'panel',
|
xtype: 'panel',
|
||||||
|
title: gettext('Other'),
|
||||||
|
itemId: 'other-options',
|
||||||
layout: {
|
layout: {
|
||||||
type: 'vbox',
|
type: 'vbox',
|
||||||
align: 'stretch',
|
align: 'stretch',
|
||||||
|
@ -84,6 +63,10 @@ Ext.define('PBS.SystemConfiguration', {
|
||||||
title: gettext('General'),
|
title: gettext('General'),
|
||||||
xtype: 'pbsNodeOptionView',
|
xtype: 'pbsNodeOptionView',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: gettext('WebAuthn TFA'),
|
||||||
|
xtype: 'pbsWebauthnConfigView',
|
||||||
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
@ -98,12 +81,7 @@ Ext.define('PBS.SystemConfiguration', {
|
||||||
item.relayEvents(networktime, ['activate', 'deactivate', 'destroy']);
|
item.relayEvents(networktime, ['activate', 'deactivate', 'destroy']);
|
||||||
});
|
});
|
||||||
|
|
||||||
let authentication = me.getComponent('authentication');
|
let options = me.getComponent('other-options');
|
||||||
Ext.Array.forEach(authentication.query(), function(item) {
|
|
||||||
item.relayEvents(authentication, ['activate', 'deactivate', 'destroy']);
|
|
||||||
});
|
|
||||||
|
|
||||||
let options = me.getComponent('options');
|
|
||||||
Ext.Array.forEach(options.query(), function(item) {
|
Ext.Array.forEach(options.query(), function(item) {
|
||||||
item.relayEvents(options, ['activate', 'deactivate', 'destroy']);
|
item.relayEvents(options, ['activate', 'deactivate', 'destroy']);
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue