[pve-devel] [PATCH manager 1/2] ui: firewall: Clarify group rule subjects

[pve-devel] [PATCH manager 1/2] ui: firewall: Clarify group rule subjects

[Dominic Jäger]

First, both buttons add a row to the grid, so they should be both "Add" (or both
"Insert").
Secondly, we add a (security group) rule to the grid, not the group itself.
Thirdly, the window title should be different to the regular rule.

Signed-off-by: Dominic Jäger <d.jaeger@proxmox.com>
---
 www/manager6/grid/FirewallRules.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/www/manager6/grid/FirewallRules.js b/www/manager6/grid/FirewallRules.js
index 42035129..08deee2a 100644
--- a/www/manager6/grid/FirewallRules.js
+++ b/www/manager6/grid/FirewallRules.js
@@ -361,7 +361,7 @@ Ext.define('PVE.FirewallGroupRuleEdit', {
 	});
 
 	Ext.apply(me, {
-            subject: gettext('Rule'),
+            subject: gettext('Group rule'),
 	    isAdd: true,
 	    items: [ ipanel ]
 	});
@@ -578,8 +578,7 @@ Ext.define('PVE.FirewallRules', {
 
 	if (me.allow_groups) {
 	    me.groupBtn =  Ext.create('Ext.Button', {
-		text: gettext('Insert') + ': ' + 
-		    gettext('Security Group'),
+		text: gettext('Add') + ': ' + gettext('Group rule'),
 		disabled: true,
 		handler: function() {
 		    var win = Ext.create('PVE.FirewallGroupRuleEdit', {
-- 
2.20.1

[pve-devel] [PATCH manager 2/2] ui: firewall: Clarify text for "Add" button

[Dominic Jäger]

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 <d.jaeger@proxmox.com>
---
 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