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

luci-app-olsr: reenable the "auto refresh" feature

Browse source 
Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
This commit is contained in:
pmelange 2018-11-18 14:26:23 +01:00
parent 4974ddb1f1
commit d2bda6c34b
5 changed files with 52 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm
View file

@ -126,7 +126,12 @@ end
var tbody = document.getElementById('olsr_services'); var tbody = document.getElementById('olsr_services');
if (tbody) if (tbody)
{ {
var s = ''; var s = '<div class="tr cbi-section-table-titles">' +
'<div class="th cbi-section-table-cell"><%:Url%></div>' +
'<div class="th cbi-section-table-cell"><%:Protocol%></div>' +
'<div class="th cbi-section-table-cell"><%:Source%></div>' +
'</div>';
for (var idx = 0; idx < info.length; idx++) for (var idx = 0; idx < info.length; idx++)
{ {
var service = info[idx]; var service = info[idx];
@ -152,7 +157,7 @@ end
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend><%:Internal services%></legend> <legend><%:Internal services%></legend>
<div class="table cbi-section-table"> <div class="table cbi-section-table" id="olsr_services">
<div class="tr cbi-section-table-titles"> <div class="tr cbi-section-table-titles">
<div class="th cbi-section-table-cell"><%:Url%></div> <div class="th cbi-section-table-cell"><%:Url%></div>
<div class="th cbi-section-table-cell"><%:Protocol%></div> <div class="th cbi-section-table-cell"><%:Protocol%></div>

9
applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm
View file

@ -35,7 +35,12 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
var hnadiv = document.getElementById('olsrd_hna'); var hnadiv = document.getElementById('olsrd_hna');
if (hnadiv) if (hnadiv)
{ {
var s = ''; var s = '<div class="tr cbi-section-table-titles">' +
'<div class="th cbi-section-table-cell"><%:Announced network%></div>' +
'<div class="th cbi-section-table-cell"><%:OLSR gateway%></div>' +
'<div class="th cbi-section-table-cell"><%:Validity Time%></div>' +
'</div>';
for (var idx = 0; idx < info.length; idx++) for (var idx = 0; idx < info.length; idx++)
{ {
var hna = info[idx]; var hna = info[idx];
@ -80,7 +85,7 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend><%:Overview of currently active OLSR host net announcements%></legend> <legend><%:Overview of currently active OLSR host net announcements%></legend>
<div class="table cbi-section-table"> <div class="table cbi-section-table" id="olsrd_hna">
<div class="tr cbi-section-table-titles"> <div class="tr cbi-section-table-titles">
<div class="th cbi-section-table-cell"><%:Announced network%></div> <div class="th cbi-section-table-cell"><%:Announced network%></div>
<div class="th cbi-section-table-cell"><%:OLSR gateway%></div> <div class="th cbi-section-table-cell"><%:OLSR gateway%></div>

16
applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm
View file

@ -56,7 +56,17 @@ end
var nt = document.getElementById('olsr_neigh_table'); var nt = document.getElementById('olsr_neigh_table');
if (nt) if (nt)
{ {
var s = ''; var s = '<div class="tr cbi-section-table-cell">' +
'<div class="th cbi-section-table-cell"><%:Neighbour IP%></div>' +
'<div class="th cbi-section-table-cell"><%:Hostname%></div>' +
'<div class="th cbi-section-table-cell"><%:Interface%></div>' +
'<div class="th cbi-section-table-cell"><%:Local interface IP%></div>' +
'<div class="th cbi-section-table-cell">LQ</div>' +
'<div class="th cbi-section-table-cell">NLQ</div>' +
'<div class="th cbi-section-table-cell">ETX</div>' +
'<div class="th cbi-section-table-cell">SNR</div>' +
'</div>';
for (var idx = 0; idx < info.length; idx++) for (var idx = 0; idx < info.length; idx++)
{ {
var neigh = info[idx]; var neigh = info[idx];
@ -91,7 +101,7 @@ end
'<div class="td cbi-section-table-cell left" style="background-color:%s">%s</div>' + '<div class="td cbi-section-table-cell left" style="background-color:%s">%s</div>' +
'<div class="td cbi-section-table-cell left" style="background-color:%s">%s</div>' + '<div class="td cbi-section-table-cell left" style="background-color:%s">%s</div>' +
'<div class="td cbi-section-table-cell left" style="background-color:%s">%s</div>' + '<div class="td cbi-section-table-cell left" style="background-color:%s">%s</div>' +
'<div class="td cbi-section-table-cell left" style="background-color:%s title="Signal: %s Noise: %s">%s</div>' + '<div class="td cbi-section-table-cell left" style="background-color:%s" title="Signal: %s Noise: %s">%s</div>' +
'</div>', '</div>',
neigh.dfgcolor, neigh.ifn, neigh.dfgcolor, neigh.lip, neigh.dfgcolor, neigh.lq, neigh.dfgcolor, neigh.nlq, neigh.color, neigh.cost, neigh.snr_color, neigh.signal, neigh.noise, neigh.snr || '?' neigh.dfgcolor, neigh.ifn, neigh.dfgcolor, neigh.lip, neigh.dfgcolor, neigh.lq, neigh.dfgcolor, neigh.nlq, neigh.color, neigh.cost, neigh.snr_color, neigh.signal, neigh.noise, neigh.snr || '?'
); );
@ -111,7 +121,7 @@ end
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend><%:Overview of currently established OLSR connections%></legend> <legend><%:Overview of currently established OLSR connections%></legend>
<div class="table cbi-section-table"> <div class="table cbi-section-table" id="olsr_neigh_table">
<div class="tr cbi-section-table-cell"> <div class="tr cbi-section-table-cell">
<div class="th cbi-section-table-cell"><%:Neighbour IP%></div> <div class="th cbi-section-table-cell"><%:Neighbour IP%></div>
<div class="th cbi-section-table-cell"><%:Hostname%></div> <div class="th cbi-section-table-cell"><%:Hostname%></div>

17
applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm
View file

@ -13,7 +13,7 @@ local i = 1
if luci.http.formvalue("status") == "1" then if luci.http.formvalue("status") == "1" then
local rv = {} local rv = {}
for k, route in ipairs(routes) do for k, route in ipairs(routes) do
local ETX = string.format("%.3f", tonumber(route.rtpMetricCost)/1024 or 0) local ETX = string.format("%.3f", tonumber(route.etx) or 0)
rv[#rv+1] = { rv[#rv+1] = {
hostname = route.hostname, hostname = route.hostname,
dest = route.destination, dest = route.destination,
@ -43,7 +43,14 @@ XHR.poll(20, '<%=REQUEST_URI%>', { status: 1 },
var rt = document.getElementById('olsrd_routes'); var rt = document.getElementById('olsrd_routes');
if (rt) if (rt)
{ {
var s = ''; var s = '<div class="tr cbi-section-table-cell">' +
'<div class="th cbi-section-table-cell"><%:Announced network%></div>' +
'<div class="th cbi-section-table-cell"><%:OLSR gateway%></div>' +
'<div class="th cbi-section-table-cell"><%:Interface%></div>' +
'<div class="th cbi-section-table-cell"><%:Metric%></div>' +
'<div class="th cbi-section-table-cell">ETX</div>' +
'</div>';
for (var idx = 0; idx < info.length; idx++) for (var idx = 0; idx < info.length; idx++)
{ {
var route = info[idx]; var route = info[idx];
@ -57,7 +64,7 @@ XHR.poll(20, '<%=REQUEST_URI%>', { status: 1 },
) )
if (route.hostname) { if (route.hostname) {
if (hna.proto == '6') { if (route.proto == '6') {
s += String.format( s += String.format(
' / <a href="http://[%s]/cgi-bin-status.html">%s</a>', ' / <a href="http://[%s]/cgi-bin-status.html">%s</a>',
route.hostname, route.hostname || '?' route.hostname, route.hostname || '?'
@ -95,8 +102,8 @@ XHR.poll(20, '<%=REQUEST_URI%>', { status: 1 },
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend><%:Overview of currently known routes to other OLSR nodes%></legend> <legend><%:Overview of currently known routes to other OLSR nodes%></legend>
<div class="table cbi-section-table"> <div class="table cbi-section-table" id="olsrd_routes">
<div class="tr cbi-section-table-titles"> <div class="tr cbi-section-table-cell">
<div class="th cbi-section-table-cell"><%:Announced network%></div> <div class="th cbi-section-table-cell"><%:Announced network%></div>
<div class="th cbi-section-table-cell"><%:OLSR gateway%></div> <div class="th cbi-section-table-cell"><%:OLSR gateway%></div>
<div class="th cbi-section-table-cell"><%:Interface%></div> <div class="th cbi-section-table-cell"><%:Interface%></div>

16
applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm
View file

@ -51,7 +51,18 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
var smartgwdiv = document.getElementById('olsrd_smartgw'); var smartgwdiv = document.getElementById('olsrd_smartgw');
if (smartgwdiv) if (smartgwdiv)
{ {
var s = ''; var s = '<div class="tr cbi-section-table-titles">' +
'<div class="th cbi-section-table-cell"><%:Gateway%></div>' +
'<div class="th cbi-section-table-cell"><%:Selected%></div>' +
'<div class="th cbi-section-table-cell"><%:ETX%></div>' +
'<div class="th cbi-section-table-cell"><%:Hops%></div>' +
'<div class="th cbi-section-table-cell"><%:Uplink%></div>' +
'<div class="th cbi-section-table-cell"><%:Downlink%></div>' +
'<div class="th cbi-section-table-cell"><%:IPv4%></div>' +
'<div class="th cbi-section-table-cell"><%:IPv6%></div>' +
'<div class="th cbi-section-table-cell"><%:Prefix%></div>' +
'</div>';
for (var idx = 0; idx < info.length; idx++) for (var idx = 0; idx < info.length; idx++)
{ {
var smartgw = info[idx]; var smartgw = info[idx];
@ -91,7 +102,7 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend><%:Overview of smart gateways in this network%></legend> <legend><%:Overview of smart gateways in this network%></legend>
<div class="table cbi-section-table"> <div class="table cbi-section-table" id="olsrd_smartgw">
<div class="tr cbi-section-table-titles"> <div class="tr cbi-section-table-titles">
<div class="th cbi-section-table-cell"><%:Gateway%></div> <div class="th cbi-section-table-cell"><%:Gateway%></div>
<div class="th cbi-section-table-cell"><%:Selected%></div> <div class="th cbi-section-table-cell"><%:Selected%></div>
@ -102,7 +113,6 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
<div class="th cbi-section-table-cell"><%:IPv4%></div> <div class="th cbi-section-table-cell"><%:IPv4%></div>
<div class="th cbi-section-table-cell"><%:IPv6%></div> <div class="th cbi-section-table-cell"><%:IPv6%></div>
<div class="th cbi-section-table-cell"><%:Prefix%></div> <div class="th cbi-section-table-cell"><%:Prefix%></div>
</div> </div>
<% for k, gw in ipairs(gws.ipv4, gws.ipv6) do <% for k, gw in ipairs(gws.ipv4, gws.ipv6) do