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 11DC5A95A for ; Wed, 27 Apr 2022 17:41:52 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0808628D4A for ; Wed, 27 Apr 2022 17:41:22 +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 0285228D27 for ; Wed, 27 Apr 2022 17:41:20 +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 D089C42E8F for ; Wed, 27 Apr 2022 17:41:19 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Wed, 27 Apr 2022 17:41:14 +0200 Message-Id: <20220427154116.115071-6-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220427154116.115071-1-f.ebner@proxmox.com> References: <20220427154116.115071-1-f.ebner@proxmox.com> 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 v4 manager 5/7] ui: dc/backup: move note template to own tab and adapt 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: Wed, 27 Apr 2022 15:41:52 -0000 From: Thomas Lamprecht Signed-off-by: Thomas Lamprecht --- www/manager6/dc/Backup.js | 49 +++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/www/manager6/dc/Backup.js b/www/manager6/dc/Backup.js index 9b129266..df4a70fd 100644 --- a/www/manager6/dc/Backup.js +++ b/www/manager6/dc/Backup.js @@ -229,27 +229,13 @@ Ext.define('PVE.dc.BackupEdit', { { xtype: 'proxmoxtextfield', name: 'comment', - fieldLabel: gettext('Comment'), + fieldLabel: gettext('Job Comment'), deleteEmpty: !me.isCreate, autoEl: { tag: 'div', 'data-qtip': gettext('Description of the job'), }, }, - { - xtype: 'proxmoxtextfield', - name: 'notes-template', - fieldLabel: gettext('Notes'), - deleteEmpty: !me.isCreate, - value: me.isCreate ? '{{guestname}}' : undefined, - autoEl: { - tag: 'div', - 'data-qtip': Ext.String.format( - gettext('Notes added to the backup. Possible variables are {0}'), - '{{cluster}}, {{guestname}}, {{node}}, {{vmid}}', - ), - }, - }, ], onGetValues: function(values) { if (!values.node) { @@ -390,6 +376,39 @@ Ext.define('PVE.dc.BackupEdit', { showPBSHint: false, fallbackHintHtml: gettext('Without any keep option, the storage\'s configuration or node\'s vzdump.conf is used as fallback'), }, + { + xtype: 'inputpanel', + title: gettext('Note Template'), + region: 'center', + layout: { + type: 'vbox', + align: 'stretch', + }, + items: [ + { + xtype: 'textarea', + name: 'notes-template', + fieldLabel: gettext('Backup Notes'), + height: 100, + maxLength: 512, + deleteEmpty: !me.isCreate, + value: me.isCreate ? '{{guestname}}' : undefined, + }, + { + xtype: 'box', + style: { + margin: '8px 0px', + 'line-height': '1.5em', + }, + html: gettext('The notes are added to each backup created by this job.') + + '
' + + Ext.String.format( + gettext('Possible template variables are: {0}'), + ['cluster', 'guestname', 'node', 'vmid'].map(v => `{{${v}}}`).join(', '), + ), + }, + ], + }, ], }, ], -- 2.30.2