]> git.proxmox.com Git - pve-manager.git/blobdiff - www/manager6/window/Settings.js
ui: eslint: fix various spacing related issues
[pve-manager.git] / www / manager6 / window / Settings.js
index 443a8191f80e141366e96a197575e178956fe571..c92d2a25fc685e252a878534a89c26f3586b08f7 100644 (file)
@@ -12,21 +12,18 @@ Ext.define('PVE.window.Settings', {
        {
            xtype: 'proxmoxHelpButton',
            onlineHelp: 'gui_my_settings',
-           hidden: false
+           hidden: false,
        },
        '->',
        {
            text: gettext('Close'),
            handler: function() {
                this.up('window').close();
-           }
-       }
+           },
+       },
     ],
 
-    layout: {
-       type: 'hbox',
-       align: 'top'
-    },
+    layout: 'hbox',
 
     controller: {
        xclass: 'Ext.app.ViewController',
@@ -36,12 +33,17 @@ Ext.define('PVE.window.Settings', {
            var sp = Ext.state.Manager.getProvider();
 
            var username = sp.get('login-username') || Proxmox.Utils.noneText;
-           me.lookupReference('savedUserName').setValue(username);
+           me.lookupReference('savedUserName').setValue(Ext.String.htmlEncode(username));
            var vncMode = sp.get('novnc-scaling');
            if (vncMode !== undefined) {
-               me.lookupReference('noVNCScalingGroup').setValue(vncMode);
+               me.lookupReference('noVNCScalingGroup').setValue({ noVNCScalingField: vncMode });
            }
 
+           let summarycolumns = sp.get('summarycolumns', 'auto');
+           me.lookup('summarycolumns').setValue(summarycolumns);
+
+           me.lookup('guestNotesCollapse').setValue(sp.get('guest-notes-collapse', 'never'));
+
            var settings = ['fontSize', 'fontFamily', 'letterSpacing', 'lineHeight'];
            settings.forEach(function(setting) {
                var val = localStorage.getItem('pve-xterm-' + setting);
@@ -76,7 +78,7 @@ Ext.define('PVE.window.Settings', {
        control: {
            '#xtermjs form': {
                dirtychange: 'set_button_status',
-               validitychange: 'set_button_status'
+               validitychange: 'set_button_status',
            },
            '#xtermjs button': {
                click: function(button) {
@@ -98,10 +100,10 @@ Ext.define('PVE.window.Settings', {
                        field.resetOriginalValue();
                    });
                    me.set_button_status();
-               }
+               },
            },
            'button[name=reset]': {
-               click: function () {
+               click: function() {
                    var blacklist = ['GuiCap', 'login-username', 'dash-storages'];
                    var sp = Ext.state.Manager.getProvider();
                    var state;
@@ -116,17 +118,17 @@ Ext.define('PVE.window.Settings', {
                    }
 
                    window.location.reload();
-               }
+               },
            },
            'button[name=clear-username]': {
-               click: function () {
+               click: function() {
                    var me = this;
                    var usernamefield = me.lookupReference('savedUserName');
                    var sp = Ext.state.Manager.getProvider();
 
                    usernamefield.setValue(Proxmox.Utils.noneText);
                    sp.clear('login-username');
-               }
+               },
            },
            'grid[reference=dashboard-storages]': {
                selectionchange: function(grid, selected) {
@@ -150,7 +152,7 @@ Ext.define('PVE.window.Settings', {
                    var items = [];
                    me.suspendEvent('selectionchange');
                    var storages = sp.get('dash-storages') || '';
-                   storages.split(',').forEach(function(storage){
+                   storages.split(',').forEach(function(storage) {
                        // we have to get the records
                        // to be able to select them
                        if (storage !== '') {
@@ -162,46 +164,57 @@ Ext.define('PVE.window.Settings', {
                    });
                    me.getSelectionModel().select(items);
                    me.resumeEvent('selectionchange');
-               }
-           }
-       }
+               },
+           },
+           'field[reference=summarycolumns]': {
+               change: function(el, newValue) {
+                   var sp = Ext.state.Manager.getProvider();
+                   sp.set('summarycolumns', newValue);
+               },
+           },
+           'field[reference=guestNotesCollapse]': {
+               change: function(e, v) {
+                   Ext.state.Manager.getProvider().set('guest-notes-collapse', v);
+               },
+           },
+       },
     },
 
     items: [{
        xtype: 'fieldset',
-       width: '50%',
+       flex: 1,
        title: gettext('Webinterface Settings'),
        margin: '5',
        layout: {
            type: 'vbox',
-           align: 'left'
+           align: 'left',
        },
        defaults: {
            width: '100%',
-           margin: '0 0 10 0'
+           margin: '0 0 10 0',
        },
        items: [
            {
                xtype: 'displayfield',
                fieldLabel: gettext('Dashboard Storages'),
                labelAlign: 'left',
-               labelWidth: '50%'
+               labelWidth: '50%',
            },
            {
                xtype: 'grid',
                maxHeight: 150,
                reference: 'dashboard-storages',
                selModel: {
-                   selType: 'checkboxmodel'
+                   selType: 'checkboxmodel',
                },
                columns: [{
                    header: gettext('Name'),
                    dataIndex: 'storage',
-                   flex: 1
-               },{
+                   flex: 1,
+               }, {
                    header: gettext('Node'),
                    dataIndex: 'node',
-                   flex: 1
+                   flex: 1,
                }],
                store: {
                    type: 'diff',
@@ -209,27 +222,27 @@ Ext.define('PVE.window.Settings', {
                    rstore: PVE.data.ResourceStore,
                    filters: [{
                        property: 'type',
-                       value: 'storage'
+                       value: 'storage',
                    }],
-                   sorters: [ 'node','storage']
-               }
+                   sorters: ['node', 'storage'],
+               },
            },
            {
                xtype: 'box',
-               autoEl: { tag: 'hr'}
+               autoEl: { tag: 'hr' },
            },
            {
                xtype: 'container',
-               layout:  'hbox',
+               layout: 'hbox',
                items: [
                    {
                        xtype: 'displayfield',
-                       fieldLabel: gettext('Saved User Name:'),
+                       fieldLabel: gettext('Saved User Name') + ':',
                        labelWidth: '150',
                        stateId: 'login-username',
                        reference: 'savedUserName',
                        flex: 1,
-                       value: ''
+                       value: '',
                    },
                    {
                        xtype: 'button',
@@ -237,11 +250,11 @@ Ext.define('PVE.window.Settings', {
                        text: gettext('Reset'),
                        name: 'clear-username',
                    },
-               ]
+               ],
            },
            {
                xtype: 'box',
-               autoEl: { tag: 'hr'}
+               autoEl: { tag: 'hr' },
            },
            {
                xtype: 'container',
@@ -249,7 +262,7 @@ Ext.define('PVE.window.Settings', {
                items: [
                    {
                        xtype: 'displayfield',
-                       fieldLabel: gettext('Layout:'),
+                       fieldLabel: gettext('Layout') + ':',
                        flex: 1,
                    },
                    {
@@ -259,21 +272,51 @@ Ext.define('PVE.window.Settings', {
                        tooltip: gettext('Reset all layout changes (for example, column widths)'),
                        name: 'reset',
                    },
-               ]
+               ],
+           },
+           {
+               xtype: 'box',
+               autoEl: { tag: 'hr' },
            },
-       ]
-    },{
+           {
+               xtype: 'proxmoxKVComboBox',
+               fieldLabel: gettext('Summary columns') + ':',
+               labelWidth: 150,
+               stateId: 'summarycolumns',
+               reference: 'summarycolumns',
+               comboItems: [
+                   ['auto', 'auto'],
+                   ['1', '1'],
+                   ['2', '2'],
+                   ['3', '3'],
+               ],
+           },
+           {
+               xtype: 'proxmoxKVComboBox',
+               fieldLabel: gettext('Guest Notes') + ':',
+               labelWidth: 150,
+               stateId: 'guest-notes-collapse',
+               reference: 'guestNotesCollapse',
+               comboItems: [
+                   ['never', 'Show by default'],
+                   ['always', 'Collapse by default'],
+                   ['auto', 'auto (Collapse if empty)'],
+               ],
+           },
+       ],
+    },
+    {
        xtype: 'container',
        layout: 'vbox',
-       width: '50%',
+       flex: 1,
        margin: '5',
        defaults: {
            width: '100%',
            // right margin ensures that the right border of the fieldsets
            // is shown
-           margin: '0 2 10 0'
+           margin: '0 2 10 0',
        },
-       items:[
+       items: [
            {
                xtype: 'fieldset',
                itemId: 'xtermjs',
@@ -284,7 +327,7 @@ Ext.define('PVE.window.Settings', {
                    border: false,
                    layout: {
                        type: 'vbox',
-                       algin: 'left'
+                       algin: 'left',
                    },
                    defaults: {
                        width: '100%',
@@ -296,7 +339,7 @@ Ext.define('PVE.window.Settings', {
                            name: 'fontFamily',
                            reference: 'fontFamily',
                            emptyText: Proxmox.Utils.defaultText,
-                           fieldLabel: gettext('Font-Family')
+                           fieldLabel: gettext('Font-Family'),
                        },
                        {
                            xtype: 'proxmoxintegerfield',
@@ -304,14 +347,14 @@ Ext.define('PVE.window.Settings', {
                            name: 'fontSize',
                            reference: 'fontSize',
                            minValue: 1,
-                           fieldLabel: gettext('Font-Size')
+                           fieldLabel: gettext('Font-Size'),
                        },
                        {
                            xtype: 'numberfield',
                            name: 'letterSpacing',
                            reference: 'letterSpacing',
                            emptyText: Proxmox.Utils.defaultText,
-                           fieldLabel: gettext('Letter Spacing')
+                           fieldLabel: gettext('Letter Spacing'),
                        },
                        {
                            xtype: 'numberfield',
@@ -319,13 +362,13 @@ Ext.define('PVE.window.Settings', {
                            minValue: 0.1,
                            reference: 'lineHeight',
                            emptyText: Proxmox.Utils.defaultText,
-                           fieldLabel: gettext('Line Height')
+                           fieldLabel: gettext('Line Height'),
                        },
                        {
                            xtype: 'container',
                            layout: {
                                type: 'hbox',
-                               pack: 'end'
+                               pack: 'end',
                            },
                            defaults: {
                                margin: '0 0 0 5',
@@ -335,19 +378,19 @@ Ext.define('PVE.window.Settings', {
                                    xtype: 'button',
                                    reference: 'xtermreset',
                                    disabled: true,
-                                   text: gettext('Reset')
+                                   text: gettext('Reset'),
                                },
                                {
                                    xtype: 'button',
                                    reference: 'xtermsave',
                                    disabled: true,
-                                   text: gettext('Save')
-                               }
-                           ]
-                       }
-                   ]
-               }]
-           },{
+                                   text: gettext('Save'),
+                               },
+                           ],
+                       },
+                   ],
+               }],
+           }, {
                xtype: 'fieldset',
                title: gettext('noVNC Settings'),
                items: [
@@ -366,28 +409,23 @@ Ext.define('PVE.window.Settings', {
                                inputValue: 'scale',
                                boxLabel: 'Local Scaling',
                                checked: true,
-                           },{
+                           }, {
                                xtype: 'radiofield',
                                name: 'noVNCScalingField',
                                inputValue: 'off',
                                boxLabel: 'Off',
                                margin: '0 0 0 10',
-                           }
+                           },
                        ],
                        listeners: {
                            change: function(el, newValue, undefined) {
                                var sp = Ext.state.Manager.getProvider();
-                               sp.set('novnc-scaling', newValue);
-                           }
+                               sp.set('novnc-scaling', newValue.noVNCScalingField);
+                           },
                        },
                    },
-               ]
+               ],
            },
-       ]
+       ],
     }],
-
-    onShow: function() {
-       var me = this;
-       me.callParent();
-    }
 });