Merge pull request #5589 from systemcrash/multi_to_unicast

[project/luci.git] / modules / luci-mod-network / htdocs / luci-static / resources / view / network / wireless.js

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
index 65d19fd366c7a7a76b3438dd600d62fd9d3f0b99..7570a47ef99207c54c1a4fa9b61842f9ac8783e4 100644 (file)
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
@@ -1090,6 +1090,7 @@ return view.extend({
 
                                        o = ss.taboption('macfilter', form.DynamicList, 'maclist', _('MAC-List'));
                                        o.datatype = 'macaddr';
+                                       o.retain = true;
                                        o.depends('macfilter', 'allow');
                                        o.depends('macfilter', 'deny');
                                        o.load = function(section_id) {
@@ -1160,6 +1161,11 @@ return view.extend({
                                        if (/^radio\d+\.network/.test(o.placeholder))
                                                o.placeholder = '';
 
+                                       o = ss.taboption('advanced', form.Value, 'macaddr', _('MAC address'), _('Override default MAC address - the range of usable addresses might be limited by the driver'));
+                                       o.optional = true;
+                                       o.placeholder = radioNet.getActiveBSSID();
+                                       o.datatype = 'macaddr';
+
                                        o = ss.taboption('advanced', form.Flag, 'short_preamble', _('Short Preamble'));
                                        o.default = o.enabled;
 
@@ -1280,7 +1286,7 @@ return view.extend({
                                        if (has_hostapd || has_supplicant) {
                                                crypto_modes.push(['psk2',      'WPA2-PSK',                    35]);
                                                crypto_modes.push(['psk-mixed', 'WPA-PSK/WPA2-PSK Mixed Mode', 22]);
-                                               crypto_modes.push(['psk',       'WPA-PSK',                     21]);
+                                               crypto_modes.push(['psk',       'WPA-PSK',                     12]);
                                        }
                                        else {
                                                encr.description = _('WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed.');
@@ -1380,7 +1386,7 @@ return view.extend({
                                else if (hwtype == 'broadcom') {
                                        crypto_modes.push(['psk2',     'WPA2-PSK',                    33]);
                                        crypto_modes.push(['psk+psk2', 'WPA-PSK/WPA2-PSK Mixed Mode', 22]);
-                                       crypto_modes.push(['psk',      'WPA-PSK',                     21]);
+                                       crypto_modes.push(['psk',      'WPA-PSK',                     12]);
                                        crypto_modes.push(['wep-open',   _('WEP Open System'),        11]);
                                        crypto_modes.push(['wep-shared', _('WEP Shared Key'),         10]);
                                }
@@ -1398,47 +1404,50 @@ return view.extend({
                                }
 
 
-                               o = ss.taboption('encryption', form.Value, 'auth_server', _('Radius-Authentication-Server'));
+                               o = ss.taboption('encryption', form.Value, 'auth_server', _('RADIUS Authentication Server'));
                                add_dependency_permutations(o, { mode: ['ap', 'ap-wds'], encryption: ['wpa', 'wpa2', 'wpa3', 'wpa3-mixed'] });
                                o.rmempty = true;
                                o.datatype = 'host(0)';
 
-                               o = ss.taboption('encryption', form.Value, 'auth_port', _('Radius-Authentication-Port'), _('Default %d').format(1812));
+                               o = ss.taboption('encryption', form.Value, 'auth_port', _('RADIUS Authentication Port'));
                                add_dependency_permutations(o, { mode: ['ap', 'ap-wds'], encryption: ['wpa', 'wpa2', 'wpa3', 'wpa3-mixed'] });
                                o.rmempty = true;
                                o.datatype = 'port';
+                               o.placeholder = '1812';
 
-                               o = ss.taboption('encryption', form.Value, 'auth_secret', _('Radius-Authentication-Secret'));
+                               o = ss.taboption('encryption', form.Value, 'auth_secret', _('RADIUS Authentication Secret'));
                                add_dependency_permutations(o, { mode: ['ap', 'ap-wds'], encryption: ['wpa', 'wpa2', 'wpa3', 'wpa3-mixed'] });
                                o.rmempty = true;
                                o.password = true;
 
-                               o = ss.taboption('encryption', form.Value, 'acct_server', _('Radius-Accounting-Server'));
+                               o = ss.taboption('encryption', form.Value, 'acct_server', _('RADIUS Accounting Server'));
                                add_dependency_permutations(o, { mode: ['ap', 'ap-wds'], encryption: ['wpa', 'wpa2', 'wpa3', 'wpa3-mixed'] });
                                o.rmempty = true;
                                o.datatype = 'host(0)';
 
-                               o = ss.taboption('encryption', form.Value, 'acct_port', _('Radius-Accounting-Port'), _('Default %d').format(1813));
+                               o = ss.taboption('encryption', form.Value, 'acct_port', _('RADIUS Accounting Port'));
                                add_dependency_permutations(o, { mode: ['ap', 'ap-wds'], encryption: ['wpa', 'wpa2', 'wpa3', 'wpa3-mixed'] });
                                o.rmempty = true;
                                o.datatype = 'port';
+                               o.placeholder = '1813';
 
-                               o = ss.taboption('encryption', form.Value, 'acct_secret', _('Radius-Accounting-Secret'));
+                               o = ss.taboption('encryption', form.Value, 'acct_secret', _('RADIUS Accounting Secret'));
                                add_dependency_permutations(o, { mode: ['ap', 'ap-wds'], encryption: ['wpa', 'wpa2', 'wpa3', 'wpa3-mixed'] });
                                o.rmempty = true;
                                o.password = true;
 
-                               o = ss.taboption('encryption', form.Value, 'dae_client', _('DAE-Client'));
+                               o = ss.taboption('encryption', form.Value, 'dae_client', _('DAE-Client'), _('Dynamic Authorization Extension client.'));
                                add_dependency_permutations(o, { mode: ['ap', 'ap-wds'], encryption: ['wpa', 'wpa2', 'wpa3', 'wpa3-mixed'] });
                                o.rmempty = true;
                                o.datatype = 'host(0)';
 
-                               o = ss.taboption('encryption', form.Value, 'dae_port', _('DAE-Port'), _('Default %d').format(3799));
+                               o = ss.taboption('encryption', form.Value, 'dae_port', _('DAE-Port'), _('Dynamic Authorization Extension port.'));
                                add_dependency_permutations(o, { mode: ['ap', 'ap-wds'], encryption: ['wpa', 'wpa2', 'wpa3', 'wpa3-mixed'] });
                                o.rmempty = true;
                                o.datatype = 'port';
+                               o.placeholder = '3799';
 
-                               o = ss.taboption('encryption', form.Value, 'dae_secret', _('DAE-Secret'));
+                               o = ss.taboption('encryption', form.Value, 'dae_secret', _('DAE-Secret'), _('Dynamic Authorization Extension secret.'));
                                add_dependency_permutations(o, { mode: ['ap', 'ap-wds'], encryption: ['wpa', 'wpa2', 'wpa3', 'wpa3-mixed'] });
                                o.rmempty = true;
                                o.password = true;
@@ -1969,6 +1978,8 @@ return view.extend({
                                        });
                                });
                        }).then(L.bind(function() {
+                               ui.showModal(null, E('p', { 'class': 'spinning' }, [ _('Loading data…') ]));
+
                                return this.renderMoreOptionsModal(section_id);
                        }, this));
                };