From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager] ui: manual backup: list possible template variables directly
Date: Fri, 6 May 2022 09:00:48 +0200 [thread overview]
Message-ID: <20220506070048.10342-1-f.ebner@proxmox.com> (raw)
rather than as a tooltip.
Suggested-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
www/manager6/Utils.js | 2 ++
www/manager6/dc/Backup.js | 2 +-
www/manager6/window/Backup.js | 16 ++++++++++------
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index b4e2df79..20e9182e 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -1801,6 +1801,8 @@ Ext.define('PVE.Utils', {
};
return value.replace(/(\\\\|\\n)/g, match => replace[match]);
},
+
+ notesTemplateVars: ['cluster', 'guestname', 'node', 'vmid'],
},
singleton: true,
diff --git a/www/manager6/dc/Backup.js b/www/manager6/dc/Backup.js
index b081be8c..3494aa54 100644
--- a/www/manager6/dc/Backup.js
+++ b/www/manager6/dc/Backup.js
@@ -411,7 +411,7 @@ Ext.define('PVE.dc.BackupEdit', {
+ '<br>'
+ Ext.String.format(
gettext('Possible template variables are: {0}'),
- ['cluster', 'guestname', 'node', 'vmid'].map(v => `<code>{{${v}}}</code>`).join(', '),
+ PVE.Utils.notesTemplateVars.map(v => `<code>{{${v}}}</code>`).join(', '),
),
},
],
diff --git a/www/manager6/window/Backup.js b/www/manager6/window/Backup.js
index f77e9ffa..f768aee3 100644
--- a/www/manager6/window/Backup.js
+++ b/www/manager6/window/Backup.js
@@ -181,13 +181,17 @@ Ext.define('PVE.window.Backup', {
fieldLabel: gettext('Notes'),
anchor: '100%',
value: '{{guestname}}',
- autoEl: {
- tag: 'div',
- 'data-qtip': Ext.String.format(
- gettext('Notes added to the backup. Possible variables are {0}'),
- '{{cluster}}, {{guestname}}, {{node}}, {{vmid}}',
- ),
+ },
+ {
+ xtype: 'box',
+ style: {
+ margin: '8px 0px',
+ 'line-height': '1.5em',
},
+ html: Ext.String.format(
+ gettext('Possible template variables are: {0}'),
+ PVE.Utils.notesTemplateVars.map(v => `<code>{{${v}}}</code>`).join(', '),
+ ),
},
{
xtype: 'label',
--
2.30.2
reply other threads:[~2022-05-06 7:00 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20220506070048.10342-1-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