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 7bde82b..c3a0fb3 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_status/routes.htm
+++ b/modules/admin-full/luasrc/view/admin_status/routes.htm
@@ -15,9 +15,9 @@ $Id$
 
 <%-
        require "bit"
-       require "luci.fs"
        require "luci.sys"
        require "luci.tools.webadmin"
+       require "nixio.fs"
 
        local style = true
 -%>
@@ -25,20 +25,20 @@ $Id$
 <%+header%>
 
 <div class="cbi-map" id="cbi-network">
-       <h2><a id="content" name="content"><%:a_n_routes%></a></h2>
-       <div class="cbi-map-descr"><%:a_n_routes1%></div>
+       <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><%:a_n_routes_kernel4%></legend>
+               <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"><%:netmask%></th>
-                                       <th class="cbi-section-table-cell"><%:gateway%></th>
-                                       <th class="cbi-section-table-cell"><%:metric%></th>
+                                       <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)%>">
@@ -54,29 +54,24 @@ $Id$
        </fieldset>
        <br />
 
-       <% if luci.fs.access("/proc/net/ipv6_route") then style = true %>
+       <% if nixio.fs.access("/proc/net/ipv6_route") then style = true %>
        <fieldset class="cbi-section" id="cbi-table-table">
-               <legend><%:a_n_routes_kernel6%></legend>
+               <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"><%:gateway6%></th>
-                                       <th class="cbi-section-table-cell"><%:metric%></th>
+                                       <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"><%=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"><%- 
-                                               local metr   = rt.metric
-                                               local lower  = bit.band(metr, 0xffff)
-                                               local higher = bit.rshift(bit.band(metr, 0xffff0000), 16)
-                                               write(string.format("%04X%04X", higher, lower))
-                                       -%></td>
+                                       <td class="cbi-value-field"><%=rt.metric_raw:upper()%></td>
                                </tr>
                                <% style = not style; end) %>
                        </table>