luci-app-upnp: Complete plugin wording/UI revision

Signed-off-by: Self-Hosting-Group <[email protected]>

Author: Self-Hosting-Group

applications/luci-app-upnp/Makefile

@@ -6,7 +6,7 @@
 
 include $(TOPDIR)/rules.mk
 
-LUCI_TITLE:=Universal Plug and Play (UPnP IGD) & PCP/NAT-PMP configuration module
+LUCI_TITLE:=UPnP IGD & PCP/NAT-PMP configuration module | Universal Plug and Play
 LUCI_DEPENDS:=+luci-base +miniupnpd +rpcd-mod-ucode
 
 PKG_LICENSE:=Apache-2.0

applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js

@@ -28,7 +28,7 @@ handleDelRule = function(num, ev) {
 };
 
 return baseclass.extend({
-	title: _('Active Port Forwards'),
+	title: _('Active UPnP IGD & PCP/NAT-PMP Port Forwards'),
 
 	load: function() {
 		return Promise.all([
@@ -40,11 +40,11 @@ return baseclass.extend({
 
 		var table = E('table', { 'class': 'table', 'id': 'upnp_status_table' }, [
 			E('tr', { 'class': 'tr table-titles' }, [
-				E('th', { 'class': 'th' }, _('Protocol')),
 				E('th', { 'class': 'th' }, _('External Port')),
 				E('th', { 'class': 'th' }, _('Client Address')),
 				E('th', { 'class': 'th' }, _('Host')),
 				E('th', { 'class': 'th' }, _('Client Port')),
+				E('th', { 'class': 'th' }, _('Protocol')),
 				E('th', { 'class': 'th' }, _('Description')),
 				E('th', { 'class': 'th cbi-section-actions' }, '')
 			])
@@ -54,11 +54,11 @@ return baseclass.extend({
 
 		var rows = rules.map(function(rule) {
 			return [
-				rule.proto,
 				rule.extport,
 				rule.intaddr,
 				rule.host_hint || _('Unknown'),
 				rule.intport,
+				rule.proto,
 				rule.descr,
 				E('button', {
 					'class': 'btn cbi-button-remove',

applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js

@@ -50,11 +50,11 @@ return view.extend({
 
 		var rows = rules.map(function(rule) {
 			return [
-				rule.proto,
 				rule.extport,
 				rule.intaddr,
 				rule.host_hint || _('Unknown'),
 				rule.intport,
+				rule.proto,
 				rule.descr,
 				E('button', {
 					'class': 'btn cbi-button-remove',
@@ -73,18 +73,18 @@ return view.extend({
 		var m, s, o;
 
 		m = new form.Map('upnpd', [_('UPnP IGD & PCP/NAT-PMP Service')],
-			_('UPnP IGD & PCP/NAT-PMP allows clients on the local network to automatically configure port forwards on the router. Also called Universal Plug and Play.'));
+			_('%s & %s/%s protocols allow clients on the local network to automatically configure port forwards on the router.', '%s (%s = UPnP IGD) & %s (s = PCP)/s% (s% = NAT-PMP) protocols allow clients on the local network to automatically configure port forwards on the router.').format('<a href="https://en.wikipedia.org/wiki/Internet_Gateway_Device_Protocol" target="_blank" rel="noreferrer"><abbr title="UPnP Internet Gateway Device (Control Protocol)">UPnP IGD</abbr></a>', '<a href="https://en.wikipedia.org/wiki/Port_Control_Protocol" target="_blank" rel="noreferrer"><abbr title="Port Control Protocol">PCP</abbr></a>', '<a href="https://en.wikipedia.org/wiki/NAT_Port_Mapping_Protocol" target="_blank" rel="noreferrer"><abbr title="NAT Port Mapping Protocol">NAT-PMP</abbr></a>'));
 
 		s = m.section(form.GridSection, '_active_rules');
 
 		s.render = L.bind(function(view, section_id) {
 			var table = E('table', { 'class': 'table cbi-section-table', 'id': 'upnp_status_table' }, [
 				E('tr', { 'class': 'tr table-titles' }, [
-					E('th', { 'class': 'th' }, _('Protocol')),
 					E('th', { 'class': 'th' }, _('External Port')),
 					E('th', { 'class': 'th' }, _('Client Address')),
 					E('th', { 'class': 'th' }, _('Host')),
 					E('th', { 'class': 'th' }, _('Client Port')),
+					E('th', { 'class': 'th' }, _('Protocol')),
 					E('th', { 'class': 'th' }, _('Description')),
 					E('th', { 'class': 'th cbi-section-actions' }, '')
 				])
@@ -94,11 +94,11 @@ return view.extend({
 
 			var rows = rules.map(function(rule) {
 				return [
-					rule.proto,
 					rule.extport,
 					rule.intaddr,
 					rule.host_hint || _('Unknown'),
 					rule.intport,
+					rule.proto,
 					rule.descr,
 					E('button', {
 						'class': 'btn cbi-button-remove',
@@ -110,25 +110,25 @@ return view.extend({
 			cbi_update_table(table, rows, E('em', _('There are no active port forwards.')));
 
 			return E('div', { 'class': 'cbi-section cbi-tblsection' }, [
-					E('h3', _('Active Port Forwards')), table ]);
+					E('h3', _('Active Service Port Forwards')), table ]);
 		}, o, this);
 
 		s = m.section(form.NamedSection, 'config', 'upnpd', _('Service Settings'));
 		s.addremove = false;
 		s.tab('general',  _('General Settings'));
 		s.tab('advanced', _('Advanced Settings'));
 
-		o = s.taboption('general', form.Flag, 'enabled', _('Start service'));
+		o = s.taboption('general', form.Flag, 'enabled', _('Start service'), _('Start automatic port forwarding service'));
 		o.rmempty  = false;
 
 		s.taboption('general', form.Flag, 'enable_upnp', _('Enable UPnP IGD protocol')).default = '1'
-		s.taboption('general', form.Flag, 'enable_natpmp', _('Enable PCP/NAT-PMP protocol')).default = '1'
+		s.taboption('general', form.Flag, 'enable_natpmp', _('Enable PCP/NAT-PMP protocols')).default = '1'
 
 		s.taboption('general', form.Flag, 'secure_mode', _('Enable secure mode'),
 			_('Allow adding port forwards only to requesting IP addresses')).default = '1'
 
 		s.taboption('general', form.Flag, 'igdv1', _('Enable UPnP IGDv1 mode'),
-			_('Advertise as UPnP IGDv1 device (no IPv6) instead of IGDv2')).default = '0'
+			_('Advertise as UPnP IGDv1 device (no IPv6) instead of IGDv2')).default = '1'
 
 		s.taboption('general', form.Flag, 'log_output', _('Enable additional logging'),
 			_('Puts extra debugging information into the system log'))
@@ -149,17 +149,17 @@ return view.extend({
 		s.taboption('advanced', form.Value, 'serial_number', _('Announced serial number'))
 		s.taboption('advanced', form.Value, 'model_number', _('Announced model number'))
 
-		o = s.taboption('advanced', form.Value, 'notify_interval', _('Notify interval'))
+		o = s.taboption('advanced', form.Value, 'notify_interval', _('Notify interval'), _('A 900s interval will result in %s notifications with the minimum max-age of 1800s', 'A 900s interval will result in %s (s = SSDP) notifications with the minimum max-age of 1800s').format('<abbr title="Simple Service Discovery Protocol">SSDP</abbr>'))
 		o.datatype    = 'uinteger'
-		o.placeholder = 30
+		o.placeholder = 900
 
-		o = s.taboption('advanced', form.Value, 'clean_ruleset_threshold', _('Clean rules threshold'))
+		o = s.taboption('advanced', form.Value, 'clean_ruleset_interval', _('Clean interval'), _('Interval that defines how often unexpired port forwards with no traffic are removed, expired always removed'))
 		o.datatype    = 'uinteger'
-		o.placeholder = 20
+		o.placeholder = '0 (disabled)'
 
-		o = s.taboption('advanced', form.Value, 'clean_ruleset_interval', _('Clean rules interval'))
+		o = s.taboption('advanced', form.Value, 'clean_ruleset_threshold', _('Clean threshold'), _('Threshold of ??? port forwards ???'))
 		o.datatype    = 'uinteger'
-		o.placeholder = 600
+		o.placeholder = 20
 
 		o = s.taboption('advanced', form.Value, 'presentation_url', _('Presentation URL'))
 		o.placeholder = 'http://192.168.1.1/'
@@ -176,7 +176,7 @@ return view.extend({
 		o = s.taboption('advanced', form.Value, 'stun_port', _('STUN Port'))
 		o.depends('use_stun', '1');
 		o.datatype    = 'port'
-		o.placeholder = '0-65535'
+		o.placeholder = '3478'
 
 		s = m.section(form.GridSection, 'perm_rule', _('Service ACLs'),
 			_('ACLs specify which external ports can be forwarded to which client addresses and ports, IPv6 always allowed.'))
@@ -189,15 +189,15 @@ return view.extend({
 
 		o = s.option(form.Value, 'ext_ports', _('External Port'))
 		o.datatype    = 'portrange'
-		o.placeholder = '0-65535'
+		o.placeholder = '1-65535'
 
 		o = s.option(form.Value, 'int_addr', _('Client Address'))
 		o.datatype    = 'ip4addr'
 		o.placeholder = '0.0.0.0/0'
 
 		o = s.option(form.Value, 'int_ports', _('Client Port'))
 		o.datatype    = 'portrange'
-		o.placeholder = '0-65535'
+		o.placeholder = '1-65535'
 
 		o = s.option(form.ListValue, 'action', _('Action'))
 		o.value('allow', _('Allow'));

applications/luci-app-upnp/root/usr/share/luci/menu.d/luci-app-upnp.json

@@ -1,6 +1,6 @@
 {
 	"admin/services/upnp": {
-		"title": "UPnP IGD & PCP/NAT-PMP",
+		"title": "UPnP IGD & PCP",
 		"action": {
 			"type": "view",
 			"path": "upnp/upnp"