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 82FE3DD5B for ; Fri, 22 Sep 2023 16:37:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5DAFBBCBA for ; Fri, 22 Sep 2023 16:37:05 +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 for ; Fri, 22 Sep 2023 16:37:04 +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 DCBB24884C for ; Fri, 22 Sep 2023 16:37:03 +0200 (CEST) From: Philipp Hufnagl To: pve-devel@lists.proxmox.com Date: Fri, 22 Sep 2023 16:36:58 +0200 Message-Id: <20230922143658.1639173-5-p.hufnagl@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230922143658.1639173-1-p.hufnagl@proxmox.com> References: <20230922143658.1639173-1-p.hufnagl@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.144 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 POISEN_SPAM_PILL 0.1 Meta: its spam POISEN_SPAM_PILL_1 0.1 random spam to be learned in bayes POISEN_SPAM_PILL_3 0.1 random spam to be learned in bayes 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 proxmox-widget-toolkit v1 2/2] fix #4546: utils: save expiring date of user account for UI 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: Fri, 22 Sep 2023 14:37:05 -0000 When an user experation date is send with the /accesss/tickets POST API call, it will be stored in a global variable like the username Signed-off-by: Philipp Hufnagl --- src/Utils.js | 3 +++ src/proxmox-dark/scss/abstracts/_variables.scss | 1 + src/proxmox-dark/scss/extjs/_menu.scss | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/src/Utils.js b/src/Utils.js index a7ded2a..5481a32 100644 --- a/src/Utils.js +++ b/src/Utils.js @@ -309,6 +309,9 @@ utilities: { setAuthData: function(data) { Proxmox.UserName = data.username; + if (data.user_expieres !== '') { + Proxmox.UserExpires = data.user_expieres; + } Proxmox.LoggedOut = data.LoggedOut; // creates a session cookie (expire = null) // that way the cookie gets deleted after the browser window is closed diff --git a/src/proxmox-dark/scss/abstracts/_variables.scss b/src/proxmox-dark/scss/abstracts/_variables.scss index 8bcae09..b079654 100644 --- a/src/proxmox-dark/scss/abstracts/_variables.scss +++ b/src/proxmox-dark/scss/abstracts/_variables.scss @@ -13,6 +13,7 @@ $text-color: hsl(0deg, 0%, 95%); $text-color-inactive: hsl(0deg, 0%, 60%); $icon-color: hsl(0deg, 0%, 90%); $icon-color-alt: hsl(0deg, 0%, 55%); +$text-color-warning: hsl(48deg, 100%, 50%); // Borders $border-color: hsl(0deg, 0%, 40%); diff --git a/src/proxmox-dark/scss/extjs/_menu.scss b/src/proxmox-dark/scss/extjs/_menu.scss index 2983f60..aa51260 100644 --- a/src/proxmox-dark/scss/extjs/_menu.scss +++ b/src/proxmox-dark/scss/extjs/_menu.scss @@ -33,6 +33,10 @@ color: $icon-color; } +.x-menu-item-icon-default.warning { + color: $text-color-warning; +} + // Vertical divider (e.g. in UserInfo between icons and text) .x-menu-icon-separator-default { background-color: $background-dark; -- 2.39.2