From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 006C51FF166 for ; Fri, 13 Sep 2024 15:10:38 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 238CE13423; Fri, 13 Sep 2024 15:10:40 +0200 (CEST) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Fri, 13 Sep 2024 15:10:32 +0200 Message-Id: <20240913131033.396324-7-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240913131033.396324-1-g.goller@proxmox.com> References: <20240913131033.396324-1-g.goller@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.044 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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: [pbs-devel] [PATCH proxmox-backup v4 6/7] ui: show consent banner before login X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" 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 --- www/LoginView.js | 12 ++++++++++++ www/config/NodeOptionView.js | 6 ++++++ www/index.hbs | 1 + 3 files changed, 19 insertions(+) diff --git a/www/LoginView.js b/www/LoginView.js index d4d8e73e65bb..b3475015c4d8 100644 --- a/www/LoginView.js +++ b/www/LoginView.js @@ -20,6 +20,18 @@ Ext.define('PBS.LoginView', { controller: { xclass: 'Ext.app.ViewController', + init: async function() { + if (Proxmox.consentText !== "") { + Ext.create('Proxmox.window.ConsentModal', { + autoShow: true, + consent: Proxmox.Markdown.parse( + Ext.htmlEncode( + Proxmox.Utils.base64ToUtf8( + 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 ae6453febef4..35938f9a3781 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 824268e389c3..b8c6e55a98d7 100644 --- a/www/index.hbs +++ b/www/index.hbs @@ -38,6 +38,7 @@ UserName: "{{ UserName }}", defaultLang: "{{ language }}", CSRFPreventionToken: "{{ CSRFPreventionToken }}", + consentText: "{{ consentText }}", }; -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel