]> git.proxmox.com Git - pve-manager.git/commitdiff
ui: bulk actions: reorder fields and drop local-storage warning
authorDominik Csapak <d.csapak@proxmox.com>
Thu, 9 Nov 2023 10:47:58 +0000 (11:47 +0100)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Thu, 9 Nov 2023 11:10:19 +0000 (12:10 +0100)
For a better screen-space utilization use two columns and remove the
local-storage warning, since this is rather obvious anyway.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
 [ TL: slight commit message rewording ]
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
www/manager6/window/BulkAction.js

index 949e167e257d5c91c91c67c7d36efe1b22bf41e2..950b454da16e9bed2648ca3b28db5bc12c4572b9 100644 (file)
@@ -55,51 +55,52 @@ Ext.define('PVE.window.BulkAction', {
        if (me.action === 'migrateall') {
            items.push(
                {
-                   xtype: 'pveNodeSelector',
-                   name: 'target',
-                   disallowedNodes: [me.nodename],
-                   fieldLabel: gettext('Target node'),
-                   allowBlank: false,
-                   onlineValidator: true,
-               },
-               {
-                   xtype: 'proxmoxintegerfield',
-                   name: 'maxworkers',
-                   minValue: 1,
-                   maxValue: 100,
-                   value: 1,
-                   fieldLabel: gettext('Parallel jobs'),
-                   allowBlank: false,
+                   xtype: 'fieldcontainer',
+                   layout: 'hbox',
+                   items: [{
+                       flex: 1,
+                       xtype: 'pveNodeSelector',
+                       name: 'target',
+                       disallowedNodes: [me.nodename],
+                       fieldLabel: gettext('Target node'),
+                       labelWidth: 200,
+                       allowBlank: false,
+                       onlineValidator: true,
+                       padding: '0 10 0 0',
+                   },
+                   {
+                       xtype: 'proxmoxintegerfield',
+                       name: 'maxworkers',
+                       minValue: 1,
+                       maxValue: 100,
+                       value: 1,
+                       fieldLabel: gettext('Parallel jobs'),
+                       allowBlank: false,
+                       flex: 1,
+                   }],
                },
                {
                    xtype: 'fieldcontainer',
-                   fieldLabel: gettext('Allow local disk migration'),
                    layout: 'hbox',
                    items: [{
                        xtype: 'proxmoxcheckbox',
+                       fieldLabel: gettext('Allow local disk migration'),
                        name: 'with-local-disks',
+                       labelWidth: 200,
                        checked: true,
                        uncheckedValue: 0,
-                       listeners: {
-                           change: (cb, val) => me.down('#localdiskwarning').setVisible(val),
-                       },
+                       flex: 1,
+                       padding: '0 10 0 0',
                    },
                    {
-                       itemId: 'localdiskwarning',
+                       itemId: 'lxcwarning',
                        xtype: 'displayfield',
-                       flex: 1,
-                       padding: '0 0 0 10',
                        userCls: 'pmx-hint',
-                       value: 'Note: Migration with local disks might take long.',
+                       value: 'Warning: Running CTs will be migrated in Restart Mode.',
+                       hidden: true, // only visible if running container chosen
+                       flex: 1,
                    }],
                },
-               {
-                   itemId: 'lxcwarning',
-                   xtype: 'displayfield',
-                   userCls: 'pmx-hint',
-                   value: 'Warning: Running CTs will be migrated in Restart Mode.',
-                   hidden: true, // only visible if running container chosen
-               },
            );
        } else if (me.action === 'startall') {
            items.push({
@@ -108,25 +109,31 @@ Ext.define('PVE.window.BulkAction', {
                value: 1,
            });
        } else if (me.action === 'stopall') {
-           items.push(
-               {
+           items.push({
+               xtype: 'fieldcontainer',
+               layout: 'hbox',
+               items: [{
                    xtype: 'proxmoxcheckbox',
                    name: 'force-stop',
+                   labelWidth: 120,
                    fieldLabel: gettext('Force Stop'),
                    boxLabel: gettext('Force stop guest if shutdown times out.'),
                    checked: true,
                    uncheckedValue: 0,
+                   flex: 1,
                },
                {
                    xtype: 'proxmoxintegerfield',
                    name: 'timeout',
                    fieldLabel: gettext('Timeout (s)'),
+                   labelWidth: 120,
                    emptyText: '180',
                    minValue: 0,
                    maxValue: 7200,
                    allowBlank: true,
-               },
-           );
+                   flex: 1,
+               }],
+           });
        }
 
        items.push({