diff options
Diffstat (limited to 'modules/luci-mod-system/htdocs')
5 files changed, 26 insertions, 5 deletions
diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/heartbeat.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/heartbeat.js index 49744ed42a..4a093ffed5 100644 --- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/heartbeat.js +++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/heartbeat.js @@ -1,10 +1,19 @@ 'use strict'; 'require baseclass'; +'require form'; return baseclass.extend({ trigger: _('Heartbeat interval (kernel: heartbeat)'), description: _('The LED flashes to simulate actual heart beat.') + _('The frequency is in direct proportion to 1-minute average CPU load.'), kernel: true, - addFormOptions: function(s) {} + addFormOptions: function(s) { + var o; + + o = s.option(form.Flag, 'inverted', _('Invert blinking'), + _('When inverted, the LED is continuously lit and flickers instead of it being off by default and blinking on system activity.')); + o.rmempty = true; + o.modalonly = true; + o.depends('trigger', 'heartbeat'); + } }); diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js index c0cbd7a4f1..f34a9360c3 100644 --- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js +++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js @@ -97,7 +97,7 @@ return view.extend({ for (var i = 0; i < plugins.length; i++) { var plugin = plugins[i]; if ( plugin.name === trigger) - this.description = plugin.form.description || ''; + this.description = plugin.form.description || ' '; } return trigger; }; diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js index f8c9dfd129..7c26bf060a 100644 --- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js +++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js @@ -242,6 +242,7 @@ return view.extend({ o = s.taboption('general', form.Flag, 'enabled', _('Enabled')); o.rmempty = false; + o.default = true; o.editable = true; o = s.taboption('general', form.DummyValue, '_device', _('Device')); diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js index ae2c2b3de3..a2f0bef9b4 100644 --- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js +++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js @@ -169,7 +169,7 @@ function addKey(ev) { } else if (!pubkey) { ui.showModal(_('Add key'), [ - E('div', { class: 'alert-message warning' }, _('The given SSH public key is invalid. Please supply proper public RSA or ECDSA keys.')), + E('div', { class: 'alert-message warning' }, _('The given SSH public key is invalid. Please supply proper public RSA, ED25519 or ECDSA keys.')), E('div', { class: 'right' }, E('div', { class: 'btn', click: L.hideModal }, _('Close'))) ]); } diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js index d207a5c994..767bc8c619 100644 --- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js +++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js @@ -5,6 +5,7 @@ 'require uci'; 'require rpc'; 'require form'; +'require tools.widgets as widgets'; var callInitList, callInitAction, callTimezone, callGetLocaltime, callSetLocaltime, CBILocalTime; @@ -227,10 +228,11 @@ return view.extend({ o.ucioption = 'lang'; o.value('auto'); - var k = Object.keys(uci.get('luci', 'languages') || {}).sort(); + var l = Object.assign({ en: 'English' }, uci.get('luci', 'languages')), + k = Object.keys(l).sort(); for (var i = 0; i < k.length; i++) if (k[i].charAt(0) != '.') - o.value(k[i], uci.get('luci', 'languages', k[i])); + o.value(k[i], l[k[i]]); o = s.taboption('language', form.ListValue, '_mediaurlbase', _('Design')) o.uciconfig = 'luci'; @@ -281,6 +283,15 @@ return view.extend({ o.ucisection = 'ntp'; o.depends('enabled', '1'); + o = s.taboption('timesync', widgets.NetworkSelect, 'interface', + _('Bind NTP server'), + _('Provide the NTP server to the selected interface or, if unspecified, to all interfaces')); + o.ucisection = 'ntp'; + o.depends('enable_server', '1'); + o.multiple = false; + o.nocreate = true; + o.optional = true; + o = s.taboption('timesync', form.Flag, 'use_dhcp', _('Use DHCP advertised servers')); o.ucisection = 'ntp'; o.default = o.enabled; |