From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v4 manager 5/7] ui: dc/backup: move note template to own tab and adapt
Date: Wed, 27 Apr 2022 17:41:14 +0200 [thread overview]
Message-ID: <20220427154116.115071-6-f.ebner@proxmox.com> (raw)
In-Reply-To: <20220427154116.115071-1-f.ebner@proxmox.com>
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
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.')
+ + '<br>'
+ + Ext.String.format(
+ gettext('Possible template variables are: {0}'),
+ ['cluster', 'guestname', 'node', 'vmid'].map(v => `<code>{{${v}}}</code>`).join(', '),
+ ),
+ },
+ ],
+ },
],
},
],
--
2.30.2
next prev parent reply other threads:[~2022-04-27 15:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-27 15:41 [pve-devel] [PATCH-SERIES v4 manager] add protected and notes-template parameters for vzdump Fabian Ebner
2022-04-27 15:41 ` [pve-devel] [PATCH v4 manager 1/7] partially close #438: vzdump: support setting notes-template Fabian Ebner
2022-04-27 15:41 ` [pve-devel] [PATCH v4 manager 2/7] ui: util: add helpers for (un)escaping notes-template Fabian Ebner
2022-04-27 15:41 ` [pve-devel] [PATCH v4 manager 3/7] ui: backup: allow setting protected and notes-template for manual backup Fabian Ebner
2022-04-27 15:41 ` [pve-devel] [PATCH v4 manager 4/7] close #438: ui: backup job: allow setting a notes-template for a job Fabian Ebner
2022-04-27 15:41 ` Fabian Ebner [this message]
2022-04-27 15:41 ` [pve-devel] [PATCH v4 manager 6/7] ui: dc/backup: (un)escape notes-template Fabian Ebner
2022-04-27 15:41 ` [pve-devel] [PATCH v4 manager 7/7] vzdump: generate notes: die upon unexpected escape character or variable Fabian Ebner
2022-04-28 16:30 ` [pve-devel] applied-series: [PATCH-SERIES v4 manager] add protected and notes-template parameters for vzdump Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220427154116.115071-6-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox