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

luci-app-bmx7: fix displaying values

Browse source 
Suggested-by: FreifunkUFO <ufo@rund.freifunk.net>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2020-10-29 17:29:20 +01:00
parent f193364c2c
commit 0169410392
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm
View file

@ -20,7 +20,7 @@
<script type="text/javascript" src="<%=resource%>/bmx7/js/polling.js"></script> <script type="text/javascript" src="<%=resource%>/bmx7/js/polling.js"></script>
<script type="text/javascript">//<![CDATA[ <script type="text/javascript">//<![CDATA[
new TablePooler(10,"/cgi-bin/bmx7-info", {'$originators':''}, "nodes_div", function(st){ new TablePooler(10,"/cgi-bin/bmx7-info", {'originators':''}, "nodes_div", function(st){
var originators = st.originators; var originators = st.originators;
var res = Array(); var res = Array();
originators.forEach(function(originator,i){ originators.forEach(function(originator,i){

2
applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/nodes_j.htm
View file

@ -92,7 +92,7 @@
var displayExtraInfo = function ( id ) { var displayExtraInfo = function ( id ) {
document.getElementById('extra-info').innerHTML = document.getElementById(id).innerHTML; document.getElementById('extra-info').innerHTML = document.getElementById(id).innerHTML;
} }
new TablePooler(5,"/cgi-bin/bmx7-info", {'$originators':''}, "nodes_div", function(st){ new TablePooler(5,"/cgi-bin/bmx7-info", {'originators':''}, "nodes_div", function(st){
var infoicon = "<%=resource%>/bmx7/world_small.png"; var infoicon = "<%=resource%>/bmx7/world_small.png";
var originators = st.originators; var originators = st.originators;
var res = Array(); var res = Array();

8
applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm
View file

@ -88,14 +88,14 @@
</div> </div>
<script type="text/javascript">//<![CDATA[ <script type="text/javascript">//<![CDATA[
new TablePooler(1,"/cgi-bin/bmx7-info", {'$info':''}, "config_div", function(st){ new TablePooler(10,"/cgi-bin/bmx7-info", {'info':''}, "config_div", function(st){
var res = Array(); var res = Array();
var sta = st.info[0].status; var sta = st.info[0].status;
res.push([sta.shortId, sta.name, sta.primaryIp, sta.nodeKey, sta.shortDhash, sta.revision]); res.push([sta.shortId, sta.name, sta.primaryIp, sta.nodeKey, sta.shortDhash, sta.revision]);
return res; return res;
}); });
new TablePooler(1,"/cgi-bin/bmx7-info", {'$info':''}, "status_div", function(st){ new TablePooler(10,"/cgi-bin/bmx7-info", {'info':''}, "status_div", function(st){
var res = Array(); var res = Array();
var sta = st.info[0].status; var sta = st.info[0].status;
var mem = st.info[3].memory.bmx7; var mem = st.info[3].memory.bmx7;
@ -105,7 +105,7 @@
return res; return res;
}); });
new TablePooler(1,"/cgi-bin/bmx7-info", {'$info':''}, "ifaces_div", function(st){ new TablePooler(10,"/cgi-bin/bmx7-info", {'info':''}, "ifaces_div", function(st){
var res = Array(); var res = Array();
var ifaces = st.info[1].interfaces; var ifaces = st.info[1].interfaces;
@ -115,7 +115,7 @@
return res; return res;
}); });
new TablePooler(1,"/cgi-bin/bmx7-info", {'$info':''}, "links_div", function(st){ new TablePooler(10,"/cgi-bin/bmx7-info", {'info':''}, "links_div", function(st){
var res = Array(); var res = Array();
links = st.info[2].links; links = st.info[2].links;

2
applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm
View file

@ -51,7 +51,7 @@
</div> </div>
<script type="text/javascript">//<![CDATA[ <script type="text/javascript">//<![CDATA[
new TablePooler(5,"/cgi-bin/bmx7-info", {'$tunnels':''}, "tunnels_div", function(st){ new TablePooler(5,"/cgi-bin/bmx7-info", {'tunnels':''}, "tunnels_div", function(st){
var tunicon = "<%=resource%>/icons/tunnel.png"; var tunicon = "<%=resource%>/icons/tunnel.png";
var tunicon_dis = "<%=resource%>/icons/tunnel_disabled.png"; var tunicon_dis = "<%=resource%>/icons/tunnel_disabled.png";
var applyicon = "<%=resource%>/cbi/apply.gif"; var applyicon = "<%=resource%>/cbi/apply.gif";

8
applications/luci-app-bmx7/root/www/cgi-bin/bmx7-info
View file

@ -90,7 +90,7 @@ if [ "${QUERY##*/}" == "all" ]; then
QALL=1 QALL=1
fi fi
if [ "$QUERY" == '$info' ]; then if [ "$QUERY" == 'info' ]; then
echo '{ "info": [ ' echo '{ "info": [ '
print_query status print_query status
echo -n "," echo -n ","
@ -100,7 +100,7 @@ if [ "$QUERY" == '$info' ]; then
echo "] }" echo "] }"
fi fi
if [ "$QUERY" == '$neighbours' ]; then if [ "$QUERY" == 'neighbours' ]; then
QALL=1 QALL=1
echo '{ "neighbours": [ ' echo '{ "neighbours": [ '
echo '{ "originators": ' echo '{ "originators": '
@ -111,11 +111,11 @@ if [ "$QUERY" == '$neighbours' ]; then
echo "} ] }" echo "} ] }"
exit 0 exit 0
else if [ "$QUERY" == '$tunnels' ]; then else if [ "$QUERY" == 'tunnels' ]; then
bmx7 -c --jshow tunnels /r=0 bmx7 -c --jshow tunnels /r=0
exit 0 exit 0
else if [ "$QUERY" == '$originators' ]; then else if [ "$QUERY" == 'originators' ]; then
bmx7 -c --jshow originators /r=0 bmx7 -c --jshow originators /r=0
exit 0 exit 0