Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5137 from TDT-AG/pr/20210621-luci-base

Browse source 
luci-base: minor fixes and improvments
This commit is contained in:
Florian Eckert 2021-07-01 13:12:33 +02:00 committed by GitHub
commit 3358516e1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
modules/luci-base/htdocs/luci-static/resources/form.js
View file

@ -603,7 +603,7 @@ var CBIMap = CBIAbstractElement.extend(/** @lends LuCI.form.Map.prototype */ {
E('p', {}, [ _('An error occurred while saving the form:') ]), E('p', {}, [ _('An error occurred while saving the form:') ]),
E('p', {}, [ E('em', { 'style': 'white-space:pre' }, [ e.message ]) ]), E('p', {}, [ E('em', { 'style': 'white-space:pre' }, [ e.message ]) ]),
E('div', { 'class': 'right' }, [ E('div', { 'class': 'right' }, [
E('button', { 'class': 'btn', 'click': ui.hideModal }, [ _('Dismiss') ]) E('button', { 'class': 'cbi-button', 'click': ui.hideModal }, [ _('Dismiss') ])
]) ])
]); ]);
} }
@ -2203,10 +2203,8 @@ var CBITypedSection = CBIAbstractSection.extend(/** @lends LuCI.form.TypedSectio
dom.append(createEl, [ dom.append(createEl, [
E('div', {}, nameEl), E('div', {}, nameEl),
E('input', { E('button', {
'class': 'cbi-button cbi-button-add', 'class': 'cbi-button cbi-button-add',
'type': 'submit',
'value': btn_title || _('Add'),
'title': btn_title || _('Add'), 'title': btn_title || _('Add'),
'click': ui.createHandlerFn(this, function(ev) { 'click': ui.createHandlerFn(this, function(ev) {
if (nameEl.classList.contains('cbi-input-invalid')) if (nameEl.classList.contains('cbi-input-invalid'))
@ -2214,11 +2212,21 @@ var CBITypedSection = CBIAbstractSection.extend(/** @lends LuCI.form.TypedSectio
return this.handleAdd(ev, nameEl.value); return this.handleAdd(ev, nameEl.value);
}), }),
'disabled': this.map.readonly || null 'disabled': true
}) }, [ btn_title || _('Add') ])
]); ]);
ui.addValidator(nameEl, 'uciname', true, 'blur', 'keyup'); ui.addValidator(nameEl, 'uciname', true, function(v) {
var button = document.querySelector('.cbi-section-create > .cbi-button-add');
if (v !== '') {
button.disabled = false;
return true;
}
else {
button.disabled = true;
return _('Expecting: %s').format(_('non-empty value'));
}
}, 'blur', 'keyup');
} }
return createEl; return createEl;
@ -2641,9 +2649,9 @@ var CBITableSection = CBITypedSection.extend(/** @lends LuCI.form.TableSection.p
if (this.sortable) { if (this.sortable) {
dom.append(tdEl.lastElementChild, [ dom.append(tdEl.lastElementChild, [
E('div', { E('button', {
'title': _('Drag to reorder'), 'title': _('Drag to reorder'),
'class': 'btn cbi-button drag-handle center', 'class': 'cbi-button drag-handle center',
'style': 'cursor:move', 'style': 'cursor:move',
'disabled': this.map.readonly || null 'disabled': this.map.readonly || null
}, '☰') }, '☰')
@ -2881,7 +2889,7 @@ var CBITableSection = CBITypedSection.extend(/** @lends LuCI.form.TableSection.p
nodes, nodes,
E('div', { 'class': 'right' }, [ E('div', { 'class': 'right' }, [
E('button', { E('button', {
'class': 'btn', 'class': 'cbi-button',
'click': ui.createHandlerFn(this, 'handleModalCancel', m) 'click': ui.createHandlerFn(this, 'handleModalCancel', m)
}, [ _('Dismiss') ]), ' ', }, [ _('Dismiss') ]), ' ',
E('button', { E('button', {