modules/admin-full: properly handle disabled radios in live overview

[project/luci.git] / modules / admin-full / luasrc / view / admin_status / routes.htm

diff --git a/modules/admin-full/luasrc/view/admin_status/routes.htm b/modules/admin-full/luasrc/view/admin_status/routes.htm
index bfee622..c3a0fb3 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_status/routes.htm
+++ b/modules/admin-full/luasrc/view/admin_status/routes.htm
@@ -1,7 +1,7 @@
 <%#
 LuCI - Lua Configuration Interface
-Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2008-2009 Steven Barth <steven@midlink.org>
+Copyright 2008-2009 Jo-Philipp Wich <xm@subsignal.org>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -12,31 +12,73 @@ You may obtain a copy of the License at
 $Id$
 
 -%>
+
+<%-
+       require "bit"
+       require "luci.sys"
+       require "luci.tools.webadmin"
+       require "nixio.fs"
+
+       local style = true
+-%>
+
 <%+header%>
-<h1><%:routes%></h1>
-
-<br />
-<table cellspacing="0" cellpadding="6" class="smalltext">
-<tr>
-<th><%:target%></th>
-<th><%:routes_netmask%></th>
-<th><%:routes_gateway%></th>
-<th><%:routes_metric%></th>
-<th><%:interface%></th>
-</tr>
-<%
-local routes = luci.sys.net.routes()
-
-for i, r in pairs(routes) do
-%>
-<tr>
-<td><%=luci.ip.Hex(r.Destination, 32):string()%></td>
-<td><%=luci.ip.Hex(r.Mask, 32):string()%></td>
-<td><%=luci.ip.Hex(r.Gateway, 32):string()%></td>
-<td><%=r.Metric%></td>
-<td><%=r.Iface%></td>
-</tr>
-<% end %>
-</table>
-<br />
-<%+footer%>
\ No newline at end of file
+
+<div class="cbi-map" id="cbi-network">
+       <h2><a id="content" name="content"><%:Routes%></a></h2>
+       <div class="cbi-map-descr"><%:The following rules are currently active on this system.%></div>
+
+       <fieldset class="cbi-section" id="cbi-table-table">
+               <legend><%_Active <abbr title="Internet Protocol Version 4">IPv4</abbr>-Routes%></legend>
+
+               <div class="cbi-section-node">
+                       <table class="cbi-section-table">
+                               <tr class="cbi-section-table-titles">
+                                       <th class="cbi-section-table-cell"><%:Network%></th>
+                                       <th class="cbi-section-table-cell"><%:Target%></th>
+                                       <th class="cbi-section-table-cell"><%_<abbr title="Internet Protocol Version 4">IPv4</abbr>-Netmask%></th>
+                                       <th class="cbi-section-table-cell"><%_<abbr title="Internet Protocol Version 4">IPv4</abbr>-Gateway%></th>
+                                       <th class="cbi-section-table-cell"><%:Metric%></th>
+                               </tr>
+                               <% luci.sys.net.routes(function(rt) %>
+                               <tr class="cbi-section-table-row cbi-rowstyle-<%=(style and 1 or 2)%>">
+                                       <td class="cbi-value-field"><%=luci.tools.webadmin.iface_get_network(rt.device) or rt.device%></td>
+                                       <td class="cbi-value-field"><%=rt.dest:network():string()%></td>
+                                       <td class="cbi-value-field"><%=rt.dest:mask():string()%></td>
+                                       <td class="cbi-value-field"><%=rt.gateway:string()%></td>
+                                       <td class="cbi-value-field"><%=rt.metric%></td>
+                               </tr>
+                               <% style = not style; end) %>
+                       </table>
+               </div>
+       </fieldset>
+       <br />
+
+       <% if nixio.fs.access("/proc/net/ipv6_route") then style = true %>
+       <fieldset class="cbi-section" id="cbi-table-table">
+               <legend><%_Active <abbr title="Internet Protocol Version 6">IPv6</abbr>-Routes%></legend>
+
+               <div class="cbi-section-node">
+                       <table class="cbi-section-table">
+                               <tr class="cbi-section-table-titles">
+                                       <th class="cbi-section-table-cell"><%:Network%></th>
+                                       <th class="cbi-section-table-cell"><%:Target%></th>
+                                       <th class="cbi-section-table-cell"><%_<abbr title="Internet Protocol Version 6">IPv6</abbr>-Gateway%></th>
+                                       <th class="cbi-section-table-cell"><%:Metric%></th>
+                               </tr>
+                               <% luci.sys.net.routes6(function(rt) %>
+                               <tr class="cbi-section-table-row cbi-rowstyle-<%=(style and 1 or 2)%>">
+                                       <td class="cbi-value-field"><%=luci.tools.webadmin.iface_get_network(rt.device) or '(' .. rt.device .. ')'%></td>
+                                       <td class="cbi-value-field"><%=rt.dest:string()%></td>
+                                       <td class="cbi-value-field"><%=rt.source:string()%></td>
+                                       <td class="cbi-value-field"><%=rt.metric_raw:upper()%></td>
+                               </tr>
+                               <% style = not style; end) %>
+                       </table>
+               </div>
+       </fieldset>
+       <br />
+       <% end %>
+</div>
+
+<%+footer%>