From: Gabriel Goller <g.goller@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v2 4/5] ui: show consent banner before login
Date: Tue, 4 Jun 2024 14:50:07 +0200 [thread overview]
Message-ID: <20240604125014.210321-5-g.goller@proxmox.com> (raw)
In-Reply-To: <20240604125014.210321-1-g.goller@proxmox.com>
Before showing the LoginView, check if we got a non-empty consent text
from the template. If there is a non-empty text, display it in a modal.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
www/LoginView.js | 9 +++++++++
www/config/NodeOptionView.js | 6 ++++++
www/index.hbs | 1 +
3 files changed, 16 insertions(+)
diff --git a/www/LoginView.js b/www/LoginView.js
index d4d8e73e..96f97da7 100644
--- a/www/LoginView.js
+++ b/www/LoginView.js
@@ -20,6 +20,15 @@ Ext.define('PBS.LoginView', {
controller: {
xclass: 'Ext.app.ViewController',
+ init: async function() {
+ if (Proxmox.consentText !== "") {
+ Ext.create('Proxmox.window.ConsentModal', {
+ autoShow: true,
+ consent: Proxmox.consentText,
+ });
+ }
+ },
+
submitForm: async function() {
var me = this;
var loginForm = me.lookupReference('loginForm');
diff --git a/www/config/NodeOptionView.js b/www/config/NodeOptionView.js
index ae6453fe..35938f9a 100644
--- a/www/config/NodeOptionView.js
+++ b/www/config/NodeOptionView.js
@@ -54,5 +54,11 @@ Ext.define('PBS.NodeOptionView', {
deleteEmpty: true,
renderer: Proxmox.Utils.render_language,
},
+ {
+ xtype: 'textareafield',
+ name: 'consent-text',
+ text: gettext('Consent Text'),
+ deleteEmpty: true,
+ },
],
});
diff --git a/www/index.hbs b/www/index.hbs
index 824268e3..f1729cef 100644
--- a/www/index.hbs
+++ b/www/index.hbs
@@ -38,6 +38,7 @@
UserName: "{{ UserName }}",
defaultLang: "{{ language }}",
CSRFPreventionToken: "{{ CSRFPreventionToken }}",
+ consentText: decodeURI("{{ consentText }}"),
};
</script>
<script type="text/javascript" src="/widgettoolkit/proxmoxlib.js"></script>
--
2.43.0
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
next prev parent reply other threads:[~2024-06-04 12:49 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-04 12:50 [pbs-devel] [PATCH widget-toolkit/proxmox-backup v2 0/5] fix #5463: add optional " Gabriel Goller
2024-06-04 12:50 ` [pbs-devel] [PATCH widget-toolkit v2 1/5] window: add consent modal Gabriel Goller
2024-06-04 12:50 ` [pbs-devel] [PATCH widget-toolkit v2 2/5] form: add support for multiline textarea Gabriel Goller
2024-06-04 12:50 ` [pbs-devel] [PATCH proxmox-backup v2 3/5] api: add consent api handler and config option Gabriel Goller
2024-06-04 12:50 ` Gabriel Goller [this message]
2024-06-04 12:50 ` [pbs-devel] [PATCH proxmox-backup v2 5/5] docs: add section about consent banner Gabriel Goller
2024-06-05 13:22 ` [pbs-devel] [PATCH widget-toolkit/proxmox-backup v2 0/5] fix #5463: add optional consent banner before login Dominik Csapak
2024-06-06 10:18 ` Gabriel Goller
2024-06-06 10:30 ` Dominik Csapak
2024-06-06 11:25 ` Gabriel Goller
2024-06-06 12:09 ` Dominik Csapak
2024-06-06 12:56 ` Gabriel Goller
2024-06-06 13:04 ` Thomas Lamprecht
2024-06-07 8:08 ` Gabriel Goller
2024-06-07 11:48 ` Gabriel Goller
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=20240604125014.210321-5-g.goller@proxmox.com \
--to=g.goller@proxmox.com \
--cc=pbs-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