diff options
Diffstat (limited to 'modules/luci-mod-system/htdocs/luci-static/resources/view')
| -rw-r--r-- | modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js | 8 | ||||
| -rw-r--r-- | modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js | 2 |
2 files changed, 9 insertions, 1 deletions
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 b571032efc..edd4a24e06 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 @@ -53,6 +53,14 @@ return L.view.extend({ o = s.option(form.Flag, 'default', _('Default state')); o.rmempty = false; + o.textvalue = function(section_id) { + var cval = this.cfgvalue(section_id); + + if (cval == null) + cval = this.default; + + return (cval == this.enabled) ? _('On') : _('Off'); + }; o = s.option(form.ListValue, 'trigger', _('Trigger')); if (usb.devices && usb.devices.length) 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 8b9673ae11..ce3bac9612 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 @@ -217,7 +217,7 @@ return L.view.extend({ load: function() { return fs.lines('/etc/dropbear/authorized_keys').then(function(lines) { return lines.filter(function(line) { - return line.match(/^ssh-/) != null; + return line.match(/^(ssh-rsa|ssh-dss|ssh-ed25519|ecdsa-sha2)\b/) != null; }); }); }, |