diff options
| author | Manuel Munz <freifunk@somakoma.de> | 2013-03-16 18:08:13 +0000 |
|---|---|---|
| committer | Manuel Munz <freifunk@somakoma.de> | 2013-03-16 18:08:13 +0000 |
| commit | 97f0cf2996be5ce5ad58e22c35ea81336727db08 (patch) | |
| tree | 0b7921d2986695ca3366d2e15684cfac0a9b4c4f /applications/luci-olsr/luasrc/view/status-olsr/topology.htm | |
| parent | a0183b2f75a772366336671a818707df3dc04e79 (diff) | |
applications/luci-olsr: Use jsoninfo instead of txtinfo as data source.
Diffstat (limited to 'applications/luci-olsr/luasrc/view/status-olsr/topology.htm')
| -rw-r--r-- | applications/luci-olsr/luasrc/view/status-olsr/topology.htm | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/topology.htm b/applications/luci-olsr/luasrc/view/status-olsr/topology.htm index d0e85280e2..eb3df5ff51 100644 --- a/applications/luci-olsr/luasrc/view/status-olsr/topology.htm +++ b/applications/luci-olsr/luasrc/view/status-olsr/topology.htm @@ -10,8 +10,6 @@ You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 -$Id$ - -%> <% local i = 1 @@ -21,6 +19,8 @@ local olsrtools = require "luci.tools.olsr" <%+header%> <h2><a id="content" name="content"><%:Active OLSR nodes%></a></h2> +<div id="togglebuttons"></div> + <fieldset class="cbi-section"> <legend><%:Overview of currently known OLSR nodes%></legend> <table class="cbi-section-table"> @@ -33,21 +33,36 @@ local olsrtools = require "luci.tools.olsr" </tr> <% for k, route in ipairs(routes) do - local cost = string.format("%.3f", tonumber(route.Cost) or 0) + local cost = string.format("%.3f", tonumber(route.tcEdgeCost/1024) or 0) local color = olsrtools.etx_color(tonumber(cost)) + local lq = string.format("%.3f", tonumber(route.linkQuality) or 0) + local nlq = string.format("%.3f", tonumber(route.neighborLinkQuality) or 0) %> - <tr class="cbi-section-table-row cbi-rowstyle-<%=i%>"> - <td class="cbi-section-table-cell"><a href="http://<%=route["Dest. IP"]%>/cgi-bin-status.html"><%=route["Dest. IP"]%></a></td> - <td class="cbi-section-table-cell"><a href="http://<%=route["Last hop IP"]%>/cgi-bin-status.html"><%=route["Last hop IP"]%></a></td> - <td class="cbi-section-table-cell"><%=route.LQ%></td> - <td class="cbi-section-table-cell"><%=route.NLQ%></td> + <tr class="cbi-section-table-row cbi-rowstyle-<%=i%> proto-<%=route.proto%>"> + + <% if route.proto == "6" then %> + + <td class="cbi-section-table-cell"><a href="http://[<%=route.destinationIP%>]/cgi-bin-status.html"><%=route.destinationIP%></a></td> + <td class="cbi-section-table-cell"><a href="http://[<%=route.lastHopIP%>]/cgi-bin-status.html"><%=route.lastHopIP%></a></td> + + <% else %> + + <td class="cbi-section-table-cell"><a href="http://<%=route.destinationIP%>/cgi-bin-status.html"><%=route.destinationIP%></a></td> + <td class="cbi-section-table-cell"><a href="http://<%=route.lastHopIP%>/cgi-bin-status.html"><%=route.lastHopIP%></a></td> + + <%end%> + + <td class="cbi-section-table-cell"><%=lq%></td> + <td class="cbi-section-table-cell"><%=nlq%></td> <td class="cbi-section-table-cell" style="background-color:<%=color%>"><%=cost%></td> </tr> <% i = ((i % 2) + 1) end %> </table> +<%+status-olsr/legend%> </fieldset> +<%+status-olsr/common_js%> <%+footer%> |