[pve-devel] [PATCH pve-manager 1/2] Refer to SDN subnets as 'Subnet' not as ID

[pve-devel] [PATCH pve-manager 1/2] Refer to SDN subnets as 'Subnet' not as ID

[Stefan Lendl]

The Subnet's CIDR in the Edit view is called 'Subnet'.
Also refer to it as Subnet in the list view.

Signed-off-by: Stefan Lendl <s.lendl@proxmox.com>
---
 www/manager6/sdn/SubnetView.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/manager6/sdn/SubnetView.js b/www/manager6/sdn/SubnetView.js
index 4a8b0754..851583d1 100644
--- a/www/manager6/sdn/SubnetView.js
+++ b/www/manager6/sdn/SubnetView.js
@@ -101,7 +101,7 @@ Ext.define('PVE.sdn.SubnetView', {
 	    ],
 	    columns: [
 		{
-		    header: 'ID',
+		    header: gettext('Subnet'),
 		    flex: 2,
 		    dataIndex: 'cidr',
 		    renderer: function(value, metaData, rec) {
-- 
2.41.0

[pve-devel] [PATCH pve-manager 2/2] Homogenize UI naming

[Stefan Lendl]

use title case or upper case appreviations everywhere

Signed-off-by: Stefan Lendl <s.lendl@proxmox.com>
---
 www/manager6/sdn/OptionsPanel.js      |  2 +-
 www/manager6/sdn/SubnetEdit.js        |  2 +-
 www/manager6/sdn/SubnetView.js        |  2 +-
 www/manager6/sdn/dns/PowerdnsEdit.js  |  6 +++---
 www/manager6/sdn/ipams/NetboxEdit.js  |  2 +-
 www/manager6/sdn/ipams/PhpIpamEdit.js |  2 +-
 www/manager6/sdn/zones/Base.js        |  8 ++++----
 www/manager6/sdn/zones/EvpnEdit.js    | 10 +++++-----
 www/manager6/sdn/zones/QinQEdit.js    |  2 +-
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/www/manager6/sdn/OptionsPanel.js b/www/manager6/sdn/OptionsPanel.js
index 2cc2cff6..58cb0772 100644
--- a/www/manager6/sdn/OptionsPanel.js
+++ b/www/manager6/sdn/OptionsPanel.js
@@ -21,7 +21,7 @@ Ext.define('PVE.sdn.Options', {
 	},
 	{
 	    xtype: 'pveSDNIpamView',
-	    title: 'IPAMs',
+	    title: 'IPAM',
 	    flex: 1,
 	    padding: '0 0 20 0',
 	    border: 0,
diff --git a/www/manager6/sdn/SubnetEdit.js b/www/manager6/sdn/SubnetEdit.js
index 154de8ef..b9825d2a 100644
--- a/www/manager6/sdn/SubnetEdit.js
+++ b/www/manager6/sdn/SubnetEdit.js
@@ -50,7 +50,7 @@ Ext.define('PVE.sdn.SubnetInputPanel', {
 	    xtype: 'proxmoxtextfield',
 	    name: 'dnszoneprefix',
 	    skipEmptyText: true,
-	    fieldLabel: gettext('DNS zone prefix'),
+	    fieldLabel: gettext('DNS Zone Prefix'),
 	    allowBlank: true,
 	},
     ],
diff --git a/www/manager6/sdn/SubnetView.js b/www/manager6/sdn/SubnetView.js
index 851583d1..d342f0ba 100644
--- a/www/manager6/sdn/SubnetView.js
+++ b/www/manager6/sdn/SubnetView.js
@@ -125,7 +125,7 @@ Ext.define('PVE.sdn.SubnetView', {
 		    },
 		},
 		{
-		    header: gettext('Dns prefix'),
+		    header: gettext('DNS Prefix'),
 		    flex: 1,
 		    dataIndex: 'dnszoneprefix',
                     renderer: function(value, metaData, rec) {
diff --git a/www/manager6/sdn/dns/PowerdnsEdit.js b/www/manager6/sdn/dns/PowerdnsEdit.js
index f35b89af..8d5d8872 100644
--- a/www/manager6/sdn/dns/PowerdnsEdit.js
+++ b/www/manager6/sdn/dns/PowerdnsEdit.js
@@ -30,19 +30,19 @@ Ext.define('PVE.sdn.dns.PowerdnsInputPanel', {
 	    {
 		xtype: 'textfield',
 		name: 'url',
-		fieldLabel: 'url',
+		fieldLabel: 'URL',
 		allowBlank: false,
 	    },
 	    {
 		xtype: 'textfield',
 		name: 'key',
-		fieldLabel: gettext('api key'),
+		fieldLabel: gettext('API Key'),
 		allowBlank: false,
 	    },
 	    {
 		xtype: 'proxmoxintegerfield',
 		name: 'ttl',
-		fieldLabel: 'ttl',
+		fieldLabel: 'TTL',
 		allowBlank: true,
 	    },
 	];
diff --git a/www/manager6/sdn/ipams/NetboxEdit.js b/www/manager6/sdn/ipams/NetboxEdit.js
index 2133b48c..b85043fe 100644
--- a/www/manager6/sdn/ipams/NetboxEdit.js
+++ b/www/manager6/sdn/ipams/NetboxEdit.js
@@ -30,7 +30,7 @@ Ext.define('PVE.sdn.ipams.NetboxInputPanel', {
 	    {
 		xtype: 'textfield',
 		name: 'url',
-		fieldLabel: gettext('Url'),
+		fieldLabel: gettext('URL'),
 		allowBlank: false,
 	    },
 	    {
diff --git a/www/manager6/sdn/ipams/PhpIpamEdit.js b/www/manager6/sdn/ipams/PhpIpamEdit.js
index 8726e0c8..a4848578 100644
--- a/www/manager6/sdn/ipams/PhpIpamEdit.js
+++ b/www/manager6/sdn/ipams/PhpIpamEdit.js
@@ -30,7 +30,7 @@ Ext.define('PVE.sdn.ipams.PhpIpamInputPanel', {
 	    {
 		xtype: 'textfield',
 		name: 'url',
-		fieldLabel: gettext('Url'),
+		fieldLabel: gettext('URL'),
 		allowBlank: false,
 	    },
 	    {
diff --git a/www/manager6/sdn/zones/Base.js b/www/manager6/sdn/zones/Base.js
index 655352a8..602e4c16 100644
--- a/www/manager6/sdn/zones/Base.js
+++ b/www/manager6/sdn/zones/Base.js
@@ -48,7 +48,7 @@ Ext.define('PVE.panel.SDNZoneBase', {
             },
 	    {
 		xtype: 'pveSDNIpamSelector',
-		fieldLabel: gettext('Ipam'),
+		fieldLabel: gettext('IPAM'),
 		name: 'ipam',
 		value: me.ipam || 'pve',
 		allowBlank: false,
@@ -58,14 +58,14 @@ Ext.define('PVE.panel.SDNZoneBase', {
 	me.advancedItems = [
 	    {
 		xtype: 'pveSDNDnsSelector',
-		fieldLabel: gettext('Dns server'),
+		fieldLabel: gettext('DNS Server'),
 		name: 'dns',
 		value: '',
 		allowBlank: true,
 	    },
 	    {
 		xtype: 'pveSDNDnsSelector',
-		fieldLabel: gettext('Reverse Dns server'),
+		fieldLabel: gettext('Reverse DNS Server'),
 		name: 'reversedns',
 		value: '',
 		allowBlank: true,
@@ -74,7 +74,7 @@ Ext.define('PVE.panel.SDNZoneBase', {
 		xtype: 'proxmoxtextfield',
 		name: 'dnszone',
 		skipEmptyText: true,
-		fieldLabel: gettext('DNS zone'),
+		fieldLabel: gettext('DNS Zone'),
 		allowBlank: true,
 	    },
 	];
diff --git a/www/manager6/sdn/zones/EvpnEdit.js b/www/manager6/sdn/zones/EvpnEdit.js
index 1d13976c..cac1ef4d 100644
--- a/www/manager6/sdn/zones/EvpnEdit.js
+++ b/www/manager6/sdn/zones/EvpnEdit.js
@@ -57,7 +57,7 @@ Ext.define('PVE.sdn.zones.EvpnInputPanel', {
 	    {
 		xtype: 'textfield',
 		name: 'mac',
-		fieldLabel: gettext('Vnet MAC address'),
+		fieldLabel: gettext('VNet MAC Address'),
 		vtype: 'MacAddress',
 		allowBlank: true,
 		emptyText: 'auto',
@@ -81,26 +81,26 @@ Ext.define('PVE.sdn.zones.EvpnInputPanel', {
 		name: 'exitnodes-local-routing',
 		uncheckedValue: 0,
 		checked: false,
-		fieldLabel: gettext('Exit Nodes local routing'),
+		fieldLabel: gettext('Exit Nodes Local Routing'),
 	    },
 	    {
 		xtype: 'proxmoxcheckbox',
 		name: 'advertise-subnets',
 		uncheckedValue: 0,
 		checked: false,
-		fieldLabel: gettext('Advertise subnets'),
+		fieldLabel: gettext('Advertise Subnets'),
 	    },
 	    {
 		xtype: 'proxmoxcheckbox',
 		name: 'disable-arp-nd-suppression',
 		uncheckedValue: 0,
 		checked: false,
-		fieldLabel: gettext('Disable arp-nd suppression'),
+		fieldLabel: gettext('Disable ARP-nd Suppression'),
 	    },
 	    {
 		xtype: 'textfield',
 		name: 'rt-import',
-		fieldLabel: gettext('Route-target import'),
+		fieldLabel: gettext('Route Target Import'),
 		allowBlank: true,
 	    },
 	];
diff --git a/www/manager6/sdn/zones/QinQEdit.js b/www/manager6/sdn/zones/QinQEdit.js
index c059a7a2..795ff9df 100644
--- a/www/manager6/sdn/zones/QinQEdit.js
+++ b/www/manager6/sdn/zones/QinQEdit.js
@@ -36,7 +36,7 @@ Ext.define('PVE.sdn.zones.QinQInputPanel', {
 	    {
 		xtype: 'proxmoxKVComboBox',
 		name: 'vlan-protocol',
-		fieldLabel: gettext('Service-VLAN Protocol'),
+		fieldLabel: gettext('Service VLAN Protocol'),
 		allowBlank: true,
 		value: '802.1q',
 		comboItems: [
-- 
2.41.0

[pve-devel] applied: [PATCH pve-manager 1/2] Refer to SDN subnets as 'Subnet' not as ID

[Thomas Lamprecht]

Am 10/10/2023 um 15:30 schrieb Stefan Lendl:
> The Subnet's CIDR in the Edit view is called 'Subnet'.
> Also refer to it as Subnet in the list view.
> 
> Signed-off-by: Stefan Lendl <s.lendl@proxmox.com>
> ---
>  www/manager6/sdn/SubnetView.js | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
>

applied both patches, with minor style adaptions of the commit subjects,
thanks!