diff options
Diffstat (limited to 'modules/luci-mod-system')
5 files changed, 47 insertions, 44 deletions
diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js index 8661181781..2ef096f5f2 100644 --- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js +++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js @@ -170,15 +170,17 @@ return view.extend({ }, handleBlock: function(hostname, ev) { - var mtdblock = dom.parent(ev.target, '.cbi-section').querySelector('[data-name="mtdselect"] select').value; + var mtdblock = dom.parent(ev.target, '.cbi-section').querySelector('[data-name="mtdselect"] select'); + var mtdnumber = mtdblock.value; + var mtdname = mtdblock.selectedOptions[0].text.replace(/([^a-zA-Z0-9]+)/g, '-'); var form = E('form', { 'method': 'post', 'action': L.env.cgi_base + '/cgi-download', 'enctype': 'application/x-www-form-urlencoded' }, [ E('input', { 'type': 'hidden', 'name': 'sessionid', 'value': rpc.getSessionID() }), - E('input', { 'type': 'hidden', 'name': 'path', 'value': '/dev/mtdblock%d'.format(mtdblock) }), - E('input', { 'type': 'hidden', 'name': 'filename', 'value': '%s.mtd%d.bin'.format(hostname, mtdblock) }) + E('input', { 'type': 'hidden', 'name': 'path', 'value': '/dev/mtdblock%d'.format(mtdnumber) }), + E('input', { 'type': 'hidden', 'name': 'filename', 'value': '%s.mtd%d.%s.bin'.format(hostname, mtdnumber, mtdname) }) ]); ev.currentTarget.parentNode.appendChild(form); 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 a1748ad990..ce983c3228 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 @@ -287,7 +287,7 @@ return view.extend({ return E('div', {}, [ E('h2', _('SSH-Keys')), - E('div', { 'class': 'cbi-section-descr' }, _('Public keys allow for the passwordless SSH logins with a higher security compared to the use of plain passwords. In order to upload a new key to the device, paste an OpenSSH compatible public key line or drag a <code>.pub</code> file into the input field.')), + E('div', { 'class': 'cbi-section-descr' }, _('Public keys allow for passwordless SSH logins with higher security than plain passwords. In order to upload a new key to the device, paste an OpenSSH-compatible public key or drag a <code>.pub</code> file into the input field.')), E('div', { 'class': 'cbi-section-node' }, list) ]); }, diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js index d034500713..3fc48197d3 100644 --- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js +++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js @@ -97,6 +97,7 @@ return view.extend({ this.renderEnableDisable(list[i]), E('button', { 'class': 'btn cbi-button-action', 'click': ui.createHandlerFn(this, 'handleAction', list[i].name, 'start'), 'disabled': isReadonlyView }, _('Start')), E('button', { 'class': 'btn cbi-button-action', 'click': ui.createHandlerFn(this, 'handleAction', list[i].name, 'restart'), 'disabled': isReadonlyView }, _('Restart')), + E('button', { 'class': 'btn cbi-button-action', 'click': ui.createHandlerFn(this, 'handleAction', list[i].name, 'reload'), 'disabled': isReadonlyView }, _('Reload')), E('button', { 'class': 'btn cbi-button-action', 'click': ui.createHandlerFn(this, 'handleAction', list[i].name, 'stop'), 'disabled': isReadonlyView }, _('Stop')) ]) ]); @@ -108,7 +109,7 @@ return view.extend({ E('h2', _('Startup')), E('div', {}, [ E('div', { 'data-tab': 'init', 'data-tab-title': _('Initscripts') }, [ - E('p', {}, _('You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like "network", your device might become inaccessible!</strong>')), + E('p', {}, _('You can enable or disable installed init scripts here. Changes will be applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like "network", your device might become inaccessible!</strong>')), table ]), E('div', { 'data-tab': 'rc', 'data-tab-title': _('Local Startup') }, [ 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 f7c1346783..2ed2b1fedb 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 @@ -159,44 +159,44 @@ return view.extend({ * Logging */ - o = s.taboption('logging', form.Value, 'log_size', _('System log buffer size'), "kiB") - o.optional = true - o.placeholder = 16 - o.datatype = 'uinteger' - - o = s.taboption('logging', form.Value, 'log_ip', _('External system log server')) - o.optional = true - o.placeholder = '0.0.0.0' - o.datatype = 'host' - - o = s.taboption('logging', form.Value, 'log_port', _('External system log server port')) - o.optional = true - o.placeholder = 514 - o.datatype = 'port' - - o = s.taboption('logging', form.ListValue, 'log_proto', _('External system log server protocol')) - o.value('udp', 'UDP') - o.value('tcp', 'TCP') - - o = s.taboption('logging', form.Value, 'log_file', _('Write system log to file')) - o.optional = true - o.placeholder = '/tmp/system.log' - - o = s.taboption('logging', form.ListValue, 'conloglevel', _('Log output level')) - o.value(8, _('Debug')) - o.value(7, _('Info')) - o.value(6, _('Notice')) - o.value(5, _('Warning')) - o.value(4, _('Error')) - o.value(3, _('Critical')) - o.value(2, _('Alert')) - o.value(1, _('Emergency')) - - o = s.taboption('logging', form.ListValue, 'cronloglevel', _('Cron Log Level')) - o.default = 8 - o.value(5, _('Debug')) - o.value(8, _('Normal')) - o.value(9, _('Warning')) + o = s.taboption('logging', form.Value, 'log_size', _('System log buffer size'), "kiB"); + o.optional = true; + o.placeholder = 128; + o.datatype = 'uinteger'; + + o = s.taboption('logging', form.Value, 'log_ip', _('External system log server')); + o.optional = true; + o.placeholder = '0.0.0.0'; + o.datatype = 'host'; + + o = s.taboption('logging', form.Value, 'log_port', _('External system log server port')); + o.optional = true; + o.placeholder = 514; + o.datatype = 'port'; + + o = s.taboption('logging', form.ListValue, 'log_proto', _('External system log server protocol')); + o.value('udp', 'UDP'); + o.value('tcp', 'TCP'); + + o = s.taboption('logging', form.Value, 'log_file', _('Write system log to file')); + o.optional = true; + o.placeholder = '/tmp/system.log'; + + o = s.taboption('logging', form.ListValue, 'conloglevel', _('Log output level'), _('Only affects dmesg kernel log')); + o.value(8, _('Debug')); + o.value(7, _('Info')); + o.value(6, _('Notice')); + o.value(5, _('Warning')); + o.value(4, _('Error')); + o.value(3, _('Critical')); + o.value(2, _('Alert')); + o.value(1, _('Emergency')); + + o = s.taboption('logging', form.ListValue, 'cronloglevel', _('Cron Log Level')); + o.default = 7; + o.value(7, _('Normal')); + o.value(9, _('Disabled')); + o.value(5, _('Debug')); /* * Zram Properties diff --git a/modules/luci-mod-system/root/usr/share/rpcd/acl.d/luci-mod-system.json b/modules/luci-mod-system/root/usr/share/rpcd/acl.d/luci-mod-system.json index 0852816244..b096d870a7 100644 --- a/modules/luci-mod-system/root/usr/share/rpcd/acl.d/luci-mod-system.json +++ b/modules/luci-mod-system/root/usr/share/rpcd/acl.d/luci-mod-system.json @@ -12,7 +12,7 @@ "write": { "ubus": { "luci": [ "setLocaltime", "setPassword" ], - "rc": [ "init" ], + "rc": [ "init" ] }, "uci": [ "luci", "system" ] } |