Merge pull request #278 from nmav/ocserv

[project/luci.git] / applications / luci-olsr / luasrc / view / status-olsr / topology.htm

diff --git a/applications/luci-olsr/luasrc/view/status-olsr/topology.htm b/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
index bc699b2..eb3df5f 100644 (file)
--- a/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
@@ -2,6 +2,7 @@
 LuCI - Lua Configuration Interface
 Copyright 2008 Steven Barth <steven@midlink.org>
 Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -9,33 +10,59 @@ You may obtain a copy of the License at
 
        http://www.apache.org/licenses/LICENSE-2.0
 
-$Id$
-
 -%>
-<%+header%>
-<h1><%:olsr_topology%></h1>
-<br />
-<table class="smalltext" cellspacing="0" cellpadding="6">
-<tr>
-<th><%:destination%></th>
-<th><%:olsr_lasthop%></th>
-<th>LQ</th>
-<th>ILQ</th>
-<th>ETX</th>
-</tr>
-<% for k, route in ipairs(routes) do 
-       if route.Linkcost then
-               route.LQ, route.ILQ, route.ETX = route.Linkcost:match("(.*)/(.*)\t(.*)")
-       end
+<%
+local i = 1
+local olsrtools = require "luci.tools.olsr"
 %>
-<tr>
-<td><a href="http://<%=route["Destination IP"]%>"><%=route["Destination IP"]%></a></td>
-<td><a href="http://<%=route["Last hop IP"]%>"><%=route["Last hop IP"]%></a></td>
-<td><%=route.LQ%></td>
-<td><%=route.ILQ%></td>
-<td><%=string.format("%%.3f", tonumber(route.ETX) or 0)%></td>
-</tr>
-<% end %>
-</table>
-<br />
-<%+footer%>
\ No newline at end of file
+
+<%+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">
+               <tr class="cbi-section-table-titles">
+                       <th class="cbi-section-table-cell"><%:OLSR node%></th>
+                       <th class="cbi-section-table-cell"><%:Last hop%></th>
+                       <th class="cbi-section-table-cell"><%:LQ%></th>
+                       <th class="cbi-section-table-cell"><%:NLQ%></th>
+                       <th class="cbi-section-table-cell"><%:ETX%></th>
+               </tr>
+
+               <% for k, route in ipairs(routes) do 
+                       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%> 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%>