Mirror/luci-app-internet-detector
1
0
Fork 0
mirror of https://github.com/gSpotx2f/luci-app-internet-detector.git synced 2025-12-31 11:56:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

JS improvements

Browse Source
This commit is contained in:
gSpot
2021-12-21 17:12:48 +03:00
parent 4a46ac1f4c
commit 97496366a7
1 changed files with 90 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

188
luci-app-internet-detector/htdocs/luci-static/resources/view/internet-detector.js
View File

@@ -218,92 +218,6 @@ return view.extend({
}, },
}), }),
CBIBlockService: form.DummyValue.extend({
ctx: null,
renderWidget: function(section_id, option_index, cfgvalue) {
this.title = this.description = null;
this.ctx.serviceButton = E('button', {
'class': btnStyleApply,
'click': ui.createHandlerFn(this.ctx, this.ctx.serviceRestart),
}, _('Restart'));
this.ctx.initButton = E('button', {
'class': (!this.ctx.initStatus) ? btnStyleDisabled : btnStyleEnabled,
'click': ui.createHandlerFn(this, () => {
return this.ctx.handleServiceAction(
(!this.ctx.initStatus) ? 'enable' : 'disable'
).then(success => {
if(!success) {
return;
};
if(!this.ctx.initStatus) {
this.ctx.initButton.textContent = _('Enabled');
this.ctx.initButton.className = btnStyleEnabled;
this.ctx.initStatus = true;
}
else {
this.ctx.initButton.textContent = _('Disabled');
this.ctx.initButton.className = btnStyleDisabled;
this.ctx.initStatus = false;
};
});
}),
}, (!this.ctx.initStatus) ? _('Disabled') : _('Enabled'));
this.ctx.setInternetStatus(true);
let serviceItems = '';
if(this.ctx.currentAppMode === '2') {
serviceItems = E([
E('div', { 'class': 'cbi-value' }, [
E('label', { 'class': 'cbi-value-title' },
_('Service')
),
E('div', { 'class': 'cbi-value-field' },
this.ctx.serviceStatusLabel
),
]),
E('div', { 'class': 'cbi-value' }, [
E('label', { 'class': 'cbi-value-title' },
_('Restart service')
),
E('div', { 'class': 'cbi-value-field' },
this.ctx.serviceButton
),
]),
E('div', { 'class': 'cbi-value' }, [
E('label', { 'class': 'cbi-value-title' },
_('Run service at startup')
),
E('div', { 'class': 'cbi-value-field' },
this.ctx.initButton
),
]),
]);
};
let internetStatus = (this.ctx.currentAppMode !== '0') ?
E('div', { 'class': 'cbi-value' }, [
E('label', { 'class': 'cbi-value-title' },
_('Internet status')
),
E('div', { 'class': 'cbi-value-field' }, [
this.ctx.inetStatusLabel,
(!this.ctx.inetStatus) ? this.ctx.inetStatusSpinner : '',
]),
])
: '';
return E('div', { 'class': 'cbi-section fade-in' },
E('div', { 'class': 'cbi-section-node' }, [
internetStatus,
serviceItems,
])
);
},
}),
servicePoll: function() { servicePoll: function() {
return Promise.all([ return Promise.all([
fs.exec(this.execPath, [ 'status' ]), fs.exec(this.execPath, [ 'status' ]),
@@ -351,6 +265,86 @@ return view.extend({
}); });
}, },
serviceControlWidget: function() {
this.serviceButton = E('button', {
'class': btnStyleApply,
'click': ui.createHandlerFn(this, this.serviceRestart),
}, _('Restart'));
this.initButton = E('button', {
'class': (!this.initStatus) ? btnStyleDisabled : btnStyleEnabled,
'click': ui.createHandlerFn(this, () => {
return this.handleServiceAction(
(!this.initStatus) ? 'enable' : 'disable'
).then(success => {
if(!success) {
return;
};
if(!this.initStatus) {
this.initButton.textContent = _('Enabled');
this.initButton.className = btnStyleEnabled;
this.initStatus = true;
}
else {
this.initButton.textContent = _('Disabled');
this.initButton.className = btnStyleDisabled;
this.initStatus = false;
};
});
}),
}, (!this.initStatus) ? _('Disabled') : _('Enabled'));
this.setInternetStatus(true);
let serviceItems = '';
if(this.currentAppMode === '2') {
serviceItems = E([
E('div', { 'class': 'cbi-value' }, [
E('label', { 'class': 'cbi-value-title' },
_('Service')
),
E('div', { 'class': 'cbi-value-field' },
this.serviceStatusLabel
),
]),
E('div', { 'class': 'cbi-value' }, [
E('label', { 'class': 'cbi-value-title' },
_('Restart service')
),
E('div', { 'class': 'cbi-value-field' },
this.serviceButton
),
]),
E('div', { 'class': 'cbi-value' }, [
E('label', { 'class': 'cbi-value-title' },
_('Run service at startup')
),
E('div', { 'class': 'cbi-value-field' },
this.initButton
),
]),
]);
};
let internetStatus = (this.currentAppMode !== '0') ?
E('div', { 'class': 'cbi-value' }, [
E('label', { 'class': 'cbi-value-title' },
_('Internet status')
),
E('div', { 'class': 'cbi-value-field' }, [
this.inetStatusLabel,
(!this.inetStatus) ? this.inetStatusSpinner : '',
]),
])
: '';
return E('div', { 'class': 'cbi-section fade-in' },
E('div', { 'class': 'cbi-section-node' }, [
internetStatus,
serviceItems,
])
);
},
load: function() { load: function() {
return Promise.all([ return Promise.all([
fs.exec(this.execPath, [ 'status' ]), fs.exec(this.execPath, [ 'status' ]),
@@ -399,10 +393,6 @@ return view.extend({
let mMain = new form.Map('internet-detector'); let mMain = new form.Map('internet-detector');
s = mMain.section(form.NamedSection, 'config'); s = mMain.section(form.NamedSection, 'config');
// service widget
o = s.option(this.CBIBlockService, '_dummy_service');
o.ctx = this;
// mode // mode
o = s.option(form.ListValue, o = s.option(form.ListValue,
'mode', _('Internet detector mode')); 'mode', _('Internet detector mode'));
@@ -630,15 +620,18 @@ return view.extend({
mService.render(), mService.render(),
mLed.render(), mLed.render(),
]).then(maps => { ]).then(maps => {
let settingsTabs = E('div', { 'class': 'cbi-section fade-in' }); let settingsTabs = E('div', { 'class': 'fade-in' });
let tabsContainer = E('div', { 'class': 'cbi-section-node cbi-section-node-tabbed' }); let tabsContainer = E('div', { 'class': 'cbi-section cbi-section-node-tabbed' });
settingsTabs.append(tabsContainer); settingsTabs.append(tabsContainer);
// Main settings tab // Main settings tab
let mainTab = E('div', { let mainTab = E('div', {
'data-tab' : 0, 'data-tab' : 0,
'data-tab-title': _('Main settings'), 'data-tab-title': _('Main settings'),
}, maps[0]); }, [
this.serviceControlWidget(),
maps[0],
]);
tabsContainer.append(mainTab); tabsContainer.append(mainTab);
// UI detector configuration tab // UI detector configuration tab
@@ -652,11 +645,10 @@ return view.extend({
let serviceTab = E('div', { let serviceTab = E('div', {
'data-tab' : 2, 'data-tab' : 2,
'data-tab-title': _('Service configuration'), 'data-tab-title': _('Service configuration'),
}, maps[2]); }, [
maps[2],
// LED control maps[3],
serviceTab.append(maps[3]); ]);
tabsContainer.append(serviceTab); tabsContainer.append(serviceTab);
ui.tabs.initTabGroup(tabsContainer.children); ui.tabs.initTabGroup(tabsContainer.children);