From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 1ECFDAE27 for ; Thu, 28 Apr 2022 09:04:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 159B12DC7A for ; Thu, 28 Apr 2022 09:04:23 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 75B992DC6E for ; Thu, 28 Apr 2022 09:04:22 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 4C7DC42EEE for ; Thu, 28 Apr 2022 09:04:16 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 28 Apr 2022 09:04:08 +0200 Message-Id: <20220428070409.16418-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.081 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH manager 1/2] ui: restore: group override settings in a fieldset X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Apr 2022 07:04:53 -0000 Signed-off-by: Fabian Ebner --- www/manager6/window/Restore.js | 86 ++++++++++++++++++---------------- 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/www/manager6/window/Restore.js b/www/manager6/window/Restore.js index 2d78eb56..9f52c872 100644 --- a/www/manager6/window/Restore.js +++ b/www/manager6/window/Restore.js @@ -293,48 +293,52 @@ Ext.define('PVE.window.Restore', { }); } - items.push( - { - xtype: 'displayfield', - value: `${gettext('Override Settings')}:`, - }, - { - xtype: 'textfield', - fieldLabel: gettext('Name'), - name: 'name', - reference: 'nameField', - allowBlank: true, - }, - { - xtype: 'pveMemoryField', - fieldLabel: gettext('Memory'), - name: 'memory', - reference: 'memoryField', - value: '', - allowBlank: true, + items.push({ + xtype: 'fieldset', + title: `${gettext('Override Settings')}:`, + layout: 'column', + defaults: { + width: '45%', + margin: '0 0 5 10', }, - { - xtype: 'proxmoxintegerfield', - fieldLabel: gettext('Cores'), - name: 'cores', - reference: 'coresField', - minValue: 1, - maxValue: 128, - allowBlank: true, - }, - ); - - if (me.vmtype === 'qemu') { - items.push({ - xtype: 'proxmoxintegerfield', - fieldLabel: gettext('Sockets'), - name: 'sockets', - reference: 'socketsField', - minValue: 1, - maxValue: 4, - allowBlank: true, - }); - } + items: [ + { + xtype: 'textfield', + fieldLabel: gettext('Name'), + name: 'name', + reference: 'nameField', + allowBlank: true, + }, + { + xtype: 'pveMemoryField', + fieldLabel: gettext('Memory'), + name: 'memory', + reference: 'memoryField', + value: '', + allowBlank: true, + }, + { + xtype: 'proxmoxintegerfield', + fieldLabel: gettext('Cores'), + name: 'cores', + reference: 'coresField', + minValue: 1, + maxValue: 128, + allowBlank: true, + }, + { + xtype: 'proxmoxintegerfield', + fieldLabel: gettext('Sockets'), + name: 'sockets', + reference: 'socketsField', + minValue: 1, + maxValue: 4, + allowBlank: true, + hidden: me.vmtype !== 'qemu', + disabled: me.vmtype !== 'qemu', + }, + ], + }); let title = gettext('Restore') + ": " + (me.vmtype === 'lxc' ? 'CT' : 'VM'); if (me.vmid) { -- 2.30.2