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

luci-app-travelmate: sync with travelmate 2.1.0

Browse source 
* expose new options to LuCI
* cosmetics

Signed-off-by: Dirk Brenken dev@brenken.org
Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
Dirk Brenken 2022-08-20 18:56:02 +02:00
parent f34839c7a6
commit bcb046c488
No known key found for this signature in database
GPG key ID: 9D71CD547BFAE684
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-travelmate/Makefile
View file

@ -1,4 +1,4 @@
# Copyright 2017-2020 Dirk Brenken (dev@brenken.org) # Copyright 2017-2022 Dirk Brenken (dev@brenken.org)
# This is free software, licensed under the Apache License, Version 2.0 # This is free software, licensed under the Apache License, Version 2.0
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk

21
applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/overview.js
View file

@ -185,9 +185,9 @@ return view.extend({
if (station_mac && info) { if (station_mac && info) {
station_mac.textContent = info.data.station_mac || '-'; station_mac.textContent = info.data.station_mac || '-';
} }
var station_interface = document.getElementById('station_interface'); var station_interfaces = document.getElementById('station_interfaces');
if (station_interface && info) { if (station_interfaces && info) {
station_interface.textContent = info.data.station_interface || '-'; station_interfaces.textContent = info.data.station_interfaces || '-';
} }
var wpa_flags = document.getElementById('wpa_flags'); var wpa_flags = document.getElementById('wpa_flags');
if (wpa_flags && info) { if (wpa_flags && info) {
@ -236,8 +236,8 @@ return view.extend({
E('div', { 'class': 'cbi-value-field', 'id': 'station_mac', 'style': 'color:#37c' }, '-') E('div', { 'class': 'cbi-value-field', 'id': 'station_mac', 'style': 'color:#37c' }, '-')
]), ]),
E('div', { 'class': 'cbi-value' }, [ E('div', { 'class': 'cbi-value' }, [
E('label', { 'class': 'cbi-value-title', 'style': 'padding-top:0rem' }, _('Station Interface')), E('label', { 'class': 'cbi-value-title', 'style': 'padding-top:0rem' }, _('Station Interfaces')),
E('div', { 'class': 'cbi-value-field', 'id': 'station_interface', 'style': 'color:#37c' }, '-') E('div', { 'class': 'cbi-value-field', 'id': 'station_interfaces', 'style': 'color:#37c' }, '-')
]), ]),
E('div', { 'class': 'cbi-value' }, [ E('div', { 'class': 'cbi-value' }, [
E('label', { 'class': 'cbi-value-title', 'style': 'padding-top:0rem' }, _('WPA Flags')), E('label', { 'class': 'cbi-value-title', 'style': 'padding-top:0rem' }, _('WPA Flags')),
@ -316,6 +316,17 @@ return view.extend({
o.default = 1; o.default = 1;
o.rmempty = false; o.rmempty = false;
o = s.taboption('general', form.Flag, 'trm_vpn', _('VPN processing'), _('VPN connections will be managed by travelmate.'));
o.default = 1;
o.rmempty = false;
o = s.taboption('general', widgets.NetworkSelect, 'trm_vpnifacelist', _('Limit VPN processing'), _('Limit VPN processing to certain interfaces.'));
o.depends('trm_vpn', '1');
o.unspecified = true;
o.multiple = true;
o.nocreate = true;
o.rmempty = true;
o = s.taboption('general', form.Flag, 'trm_netcheck', _('Net Error Check'), _('Treat missing internet availability as an error.')); o = s.taboption('general', form.Flag, 'trm_netcheck', _('Net Error Check'), _('Treat missing internet availability as an error.'));
o.depends('trm_captive', '1'); o.depends('trm_captive', '1');
o.default = 0; o.default = 0;

2
applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/stations.js
View file

@ -698,7 +698,7 @@ return view.extend({
return handleSectionsVal('set', section_id, 'vpnservice', value); return handleSectionsVal('set', section_id, 'vpnservice', value);
} }
o = s.taboption('vpn', widgets.NetworkSelect, '_vpniface', _('VPN Interface'), _('The logical vpn network interface, e.g. \'wg0\' or \'tun0\'.')); o = s.taboption('vpn', widgets.NetworkSelect, '_vpniface', _('VPN Interface'), _('The logical vpn network interface like \'wg0\'.'));
o.unspecified = false; o.unspecified = false;
o.nocreate = true; o.nocreate = true;
o.optional = true; o.optional = true;