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

[luci-app-bmx6]: fix status page

Browse source
This commit is contained in:
Roger Pueyo Centelles 2014-05-22 19:02:50 +02:00
parent 819d045ce3
commit 986cb12646
2 changed files with 20 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
luci-app-bmx6/files/usr/lib/lua/luci/view/bmx6/status_j.htm
View file

@ -47,39 +47,15 @@ Visit <a href="http://bmx6.net">bmx6.net</a> for more info.
<table class="cbi-section-table" id="status_table">
<tr class="cbi-section-table-titles">
<th class="cbi-section-table-cell"><%:Version%></th>
<th class="cbi-section-table-cell"><%:Compat%></th>
<th class="cbi-section-table-cell"><%:Code Version%></th>
<th class="cbi-section-table-cell"><%:Global ID%></th>
<th class="cbi-section-table-cell"><%:Primary IP%></th>
<th class="cbi-section-table-cell"><%:Tun6Address%></th>
<th class="cbi-section-table-cell"><%:Tun4Address%></th>
<th class="cbi-section-table-cell"><%:Local ID%></th>
<th class="cbi-section-table-cell"><%:Uptime%></th>
<th class="cbi-section-table-cell"><%:Cpu load%></th>
<th class="cbi-section-table-cell"><%:Nodes seen%></th>
</tr>
<tr class="cbi-section-table-row">
<td colspan="11"><em><br /><%:Collecting data...%></em></td>
</tr>
</table>
</fieldset>
<fieldset class="cbi-section">
<legend><%:Network devices%></legend>
<table class="cbi-section-table" id="ifaces_table">
<tr class="cbi-section-table-titles">
<th class="cbi-section-table-cell"><%:Name%></th>
<th class="cbi-section-table-cell"><%:State%></th>
<th class="cbi-section-table-cell"><%:Type%></th>
<th class="cbi-section-table-cell"><%:Rate%></th>
<th class="cbi-section-table-cell"><%:Local IP%></th>
<th class="cbi-section-table-cell"><%:Global IP%></th>
<th class="cbi-section-table-cell"><%:Multicast IP%></th>
<th class="cbi-section-table-cell"><%:is Primary%></th>
</tr>
<tr class="cbi-section-table-row">
<td colspan="8"><em><br /><%:Collecting data...%></em></td>
<td colspan="7"><em><br /><%:Collecting data...%></em></td>
</tr>
</table>
</fieldset>
@ -87,26 +63,23 @@ Visit <a href="http://bmx6.net">bmx6.net</a> for more info.
</div>
<script type="text/javascript">//<![CDATA[
new TablePooler(5,"/cgi-bin/bmx6-info", {'status':''}, "status_table", function(st){
new TablePooler(5,"/cgi-bin/bmx6-info", {'$info':''}, "status_table", function(st){
var res = Array();
var sta = st.status;
var sta = st.info[0].status;
var ifaces = st.info[1].interfaces;
res.push([sta.version,sta.compat,sta.revision,sta.globalId,sta.primaryIp,sta.tun6Address,
sta.tun4Address,sta.myLocalId,sta.uptime,sta.cpu,sta.nodes]);
return res;
});
//]]></script>
<script type="text/javascript">//<![CDATA[
new TablePooler(5,"/cgi-bin/bmx6-info", {'interfaces':''}, "ifaces_table", function(st){
var res = Array();
var ifaces = st.interfaces;
res.push([sta.version+'/'+sta.compat,sta.primaryIp,sta.tun6Address,
sta.tun4Address,sta.uptime,sta.cpu,sta.nodes]);
res.push(['<br/>','','','','','','',''])
res.push(['','','','','','','',''])
res.push(['<b>Interface Name</b>','<b>State</b>','<b>Type</b>','<b>Rate</b>','<b>Local IP</b>','<b>Global IP</b>','<b>is Primary</b>'])
for ( var i = 0; i < ifaces.length; i++)
{
res.push([ifaces[i].devName,ifaces[i].state,ifaces[i].type,ifaces[i].rateMin+"/"+ifaces[i].rateMax,
ifaces[i].llocalIp,ifaces[i].globalIp,ifaces[i].multicastIp,ifaces[i].primary]);
ifaces[i].llocalIp,ifaces[i].globalIp,ifaces[i].primary],'');
}
return res;
});
//]]></script>

9
luci-app-bmx6/files/www/cgi-bin/bmx6-info
View file

@ -76,7 +76,7 @@ print_query() {
}
# If the query is a file, just printing the file
[ -f "$BMX6_DIR/$QUERY" ] && cat "$BMX6_DIR/$QUERY";
[ -f "$BMX6_DIR/$1" ] && cat "$BMX6_DIR/$1";
}
if [ "${QUERY##*/}" == "all" ]; then
@ -84,6 +84,13 @@ if [ "${QUERY##*/}" == "all" ]; then
QALL=1
fi
if [ "$QUERY" == '$info' ]; then
echo '{ "info": [ '
print_query status
echo -n ","
print_query interfaces
echo "] }"
fi
if [ "$QUERY" == '$neighbours' ]; then
QALL=1