summaryrefslogtreecommitdiffhomepage
path: root/modules/luci-mod-system
diff options
context:
space:
mode:
Diffstat (limited to 'modules/luci-mod-system')
-rw-r--r--modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js8
-rw-r--r--modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js14
2 files changed, 11 insertions, 11 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 6ab18a3d32..1207fc63b5 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
@@ -251,11 +251,9 @@ return view.extend({
if ((!is_valid || is_too_big) && is_forceable)
- body.push(E('p', {}, E('label', { 'class': 'btn alert-message danger' }, [
- force, ' ', _('Force upgrade'),
- E('br'), E('br'),
- _('Select \'Force upgrade\' to flash the image even if the image format check fails. Use only if you are sure that the firmware is correct and meant for your device!')
- ])));
+ body.push(E('p', { 'class': 'alert-message danger' }, [
+ force, ' ', _('Force upgrade: Select \'Force upgrade\' to flash the image even if the image format check fails. Use only if you are sure that the firmware is correct and meant for your device!')
+ ]));
var cntbtn = E('button', {
'class': 'btn cbi-button-action important',
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 2e087f5f4c..1c2aa46c52 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
@@ -121,6 +121,13 @@ return view.extend({
o = s.taboption('general', form.Value, 'hostname', _('Hostname'));
o.datatype = 'hostname';
+ /* could be used also as a default for LLDP, SNMP "system description" in the future */
+ o = s.taboption('general', form.Value, 'description', _('Description'), _('An optional, short description for this device'));
+ o.optional = true;
+
+ o = s.taboption('general', form.TextValue, 'notes', _('Notes'), _('Optional, free-form notes about this device'));
+ o.optional = true;
+
o = s.taboption('general', form.ListValue, 'zonename', _('Timezone'));
o.value('UTC');
@@ -194,12 +201,7 @@ return view.extend({
o.default = 'lzo';
o.value('lzo', 'lzo');
o.value('lz4', 'lz4');
- o.value('deflate', 'deflate');
-
- o = s.taboption('zram', form.Value, 'zram_comp_streams', _('ZRam Compression Streams'), _('Number of parallel threads used for compression'));
- o.optional = true;
- o.placeholder = 1;
- o.datatype = 'uinteger';
+ o.value('zstd', 'zstd');
}
/*