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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 46E6A660CD for ; Tue, 5 Jan 2021 12:00:40 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 408A4276A3 for ; Tue, 5 Jan 2021 12:00:40 +0100 (CET) Received: from dev.dominic.proxmox.com (212-186-127-178.static.upcbusiness.at [212.186.127.178]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2C7AF2768F for ; Tue, 5 Jan 2021 12:00:39 +0100 (CET) Received: by dev.dominic.proxmox.com (Postfix, from userid 0) id 0BEB7205EE; Tue, 5 Jan 2021 12:00:39 +0100 (CET) From: =?UTF-8?q?Dominic=20J=C3=A4ger?= To: pve-devel@lists.proxmox.com Date: Tue, 5 Jan 2021 12:00:33 +0100 Message-Id: <20210105110033.37620-2-d.jaeger@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210105110033.37620-1-d.jaeger@proxmox.com> References: <20210105110033.37620-1-d.jaeger@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.329 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods KHOP_HELO_FCRDNS 0.287 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pve-devel] [PATCH manager 2/2] ui: firewall: Clarify text for "Add" button 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: Tue, 05 Jan 2021 11:00:40 -0000 The regular button is titled "Add". If groups are allowed, then the group button is titled "Add: Group rule". In this case, changing the regular button title to "Add: Rule" makes the difference a little more clear and also both buttons then look the same. Signed-off-by: Dominic Jäger --- www/manager6/grid/FirewallRules.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/www/manager6/grid/FirewallRules.js b/www/manager6/grid/FirewallRules.js index 08deee2a..3ad41b10 100644 --- a/www/manager6/grid/FirewallRules.js +++ b/www/manager6/grid/FirewallRules.js @@ -529,7 +529,9 @@ Ext.define('PVE.FirewallRules', { }); me.addBtn = Ext.create('Ext.Button', { - text: gettext('Add'), + // Make difference between regular rule and group rule clear + text: gettext('Add') + + (me.allow_groups ? ": " + gettext('Rule') : ""), disabled: true, handler: function() { var win = Ext.create('PVE.FirewallRuleEdit', { -- 2.20.1