mirror
/
openwrt-routing
mirror of https://git.openwrt.org/feed/routing.git
1
0
Fork 0
Code Releases Activity

luci-app-olsrd2: add html table for all LAN prefixes 

Maintainer: patrick@lunatiki.de @stargieg
Compile tested: mips_24kc, arm_cortex-a9_vfpv3-d16, i386_pentium4, x86_64, i386_pentium-mmx, mipsel_24kc
Run tested: Firefox, Safari

Description: add html table for all LAN prefixes instead of a list with the one/first prefix

Signed-off-by: Patrick Grimm <patrick@lunatiki.de>
This commit is contained in:
Patrick Grimm 2023-02-26 12:06:16 +01:00 committed by Nick Hainke
parent 618e80a06a
commit dc5e428ee4
2 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
luci-app-olsrd2/Makefile
View File

@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-olsrd2
PKG_VERSION:=0.2.6
PKG_RELEASE:=14
PKG_RELEASE:=15
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk

60
luci-app-olsrd2/htdocs/luci-static/resources/view/olsrd2/overview.js
View File

@ -15,33 +15,31 @@ var callgetLan = rpc.declare({
function createTable(data) {
let tableData = [];
if ( data && data[0] && data[0].version && data[0].version[0] ) {
if ( data[0].version[0].version_text != undefined ) {
tableData.push([_('Version'),data[0].version[0].version_text]);
if ( data && data.version && data.version[0] ) {
if ( data.version[0].version_text != undefined ) {
tableData.push([_('OLSRd2 Version'),data.version[0].version_text]);
}
if ( data[0].version[0].version_commit != undefined) {
tableData.push([_('GIT commit'),data[0].version[0].version_commit]);
if ( data.version[0].version_commit != undefined) {
tableData.push([_('OLSRd2 GIT commit'),data.version[0].version_commit]);
}
}
if ( data && data[1] && data[1].lan && data[1].lan[0] ) {
if ( data[1].lan[0].lan != undefined ) {
tableData.push([_('LAN IP'),data[1].lan[0].lan]);
}
if ( data[1].lan[0].domain != undefined) {
tableData.push([_('Domain'),data[1].lan[0].domain]);
}
if ( data[1].lan[0].domain_metric != undefined) {
tableData.push([_('Domain metric'),data[1].lan[0].domain_metric]);
}
if ( data[1].lan[0].domain_metric_out != undefined) {
tableData.push([_('Domain metric outgoing'),data[1].lan[0].domain_metric_out]);
}
if ( data[1].lan[0].domain_metric_out_raw != undefined) {
tableData.push([_('domain_metric_out_raw'),data[1].lan[0].domain_metric_out_raw]);
}
if ( data[1].lan[0].domain_distance != undefined) {
tableData.push([_('Domain distance'),data[1].lan[0].domain_distance]);
}
tableData.push(['']);
return tableData;
}
function createTableDomain(data) {
let tableData = [];
if ( data && data.lan && data.lan[0] ) {
data.lan.forEach(row => {
tableData.push([
row.lan,
row.domain,
row.domain_metric,
row.domain_metric_out,
row.domain_metric_out_raw,
row.domain_distance
])
});
}
return tableData;
}
@ -59,16 +57,26 @@ return view.extend({
E('th', { 'class': 'th left' }),
E('th', { 'class': 'th left' })
]));
var trd = E('table', { 'class': 'table' });
trd.appendChild(E('trd', { 'class': 'tr cbi-section-table-titles' }, [
E('th', { 'class': 'th left' }, [ 'LAN IP' ]),
E('th', { 'class': 'th left' }, [ 'Domain' ]),
E('th', { 'class': 'th left' }, [ 'Domain Metric' ]),
E('th', { 'class': 'th left' }, [ 'Domain Metric out' ]),
E('th', { 'class': 'th left' }, [ 'Domain Metric out' ]),
E('th', { 'class': 'th left' }, [ 'Domain distance' ])
]));
poll.add(() => {
Promise.all([
callgetVersion(),
callgetLan()
]).then((results) => {
cbi_update_table(tr, createTable(results));
cbi_update_table(tr, createTable(results[0]));
cbi_update_table(trd, createTableDomain(results[1]));
})
}, 30);
return tr;
return [tr,trd];
}
});