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/sshkeys.js | 2 | ||||
| -rw-r--r-- | modules/luci-mod-system/htdocs/luci-static/resources/view/system/uhttpd.js | 22 |
2 files changed, 23 insertions, 1 deletions
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 1e38a620fa..ae2c2b3de3 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 @@ -95,7 +95,7 @@ var SSHPubkeyDecoder = baseclass.singleton({ return { type: 'DSA', bits: len1 * 8, comment: comment, options: options, fprint: fprint, src: s }; case 'ssh-ed25519': - return { type: 'ECDH', curve: 'Curve25519', comment: comment, options: options, fprint: fprint, src: s }; + return { type: 'EdDSA', curve: 'Curve25519', comment: comment, options: options, fprint: fprint, src: s }; case 'ecdsa-sha2': return { type: 'ECDSA', curve: curve, comment: comment, options: options, fprint: fprint, src: s }; diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/uhttpd.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/uhttpd.js new file mode 100644 index 0000000000..d02e18505a --- /dev/null +++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/uhttpd.js @@ -0,0 +1,22 @@ +'use strict'; +'require view'; +'require form'; + +return view.extend({ + render: function() { + var m, s, o; + + m = new form.Map('uhttpd', _('HTTP(S) Access'), _('uHTTPd offers <abbr title="Hypertext Transfer Protocol">HTTP</abbr> or <abbr title="Hypertext Transfer Protocol Secure">HTTPS</abbr> network access.')); + + s = m.section(form.NamedSection, 'main', 'uhttpd', _('Settings')); + s.addremove = false; + + o = s.option(form.Flag, 'redirect_https', _('Redirect to HTTPS'), _('Enable automatic redirection of <abbr title="Hypertext Transfer Protocol">HTTP</abbr> requests to <abbr title="Hypertext Transfer Protocol Secure">HTTPS</abbr> port.')); + o.enabled = 'on'; + o.disabled = 'off'; + o.default = o.disabled; + o.rmempty = false; + + return m.render(); + } +}); |