modules/admin-full: fix formatting quirk on wifi overview page

[project/luci.git] / modules / admin-full / luasrc / view / admin_network / wifi_overview.htm

diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
index 29de11c..8e64d14 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
@@ -1,7 +1,7 @@
 <%#
 LuCI - Lua Configuration Interface
 Copyright 2008-2009 Steven Barth <steven@midlink.org>
-Copyright 2008-2010 Jo-Philipp Wich <xm@subsignal.org>
+Copyright 2008-2011 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.
@@ -16,6 +16,7 @@ $Id$
 <%-
 
        local sys = require "luci.sys"
+       local fs = require "luci.fs"
        local utl = require "luci.util"
        local uci = require "luci.model.uci".cursor()
        local ntm = require "luci.model.network"
@@ -76,9 +77,13 @@ $Id$
                elseif name == "ra" then
                        return "RaLink 802.11%s Wireless Controller" % bands
 
-               -- prism?
+               -- hermes
                elseif name == "eth" then
-                       return "Prism 802.11%s Wireless Controller" % bands
+                       return "Hermes 802.11b Wireless Controller"
+
+               -- hostap
+               elseif name == "wlan" and fs.isdirectory("/proc/net/hostap/" .. ifname) then
+                       return "Prism2/2.5/3 802.11b Wireless Controller"
 
                -- dunno yet
                else
@@ -97,8 +102,8 @@ $Id$
        for _, dev in ipairs(devices) do
                local net
                for _, net in ipairs(dev:get_wifinets()) do
-                       netlist[#netlist+1] = net:ifname()
-                       netdevs[net:ifname()] = dev:name()
+                       netlist[#netlist+1] = net:id()
+                       netdevs[net:id()] = dev:name()
                end
        end
 -%>
@@ -130,12 +135,13 @@ $Id$
                                                        assoctable.rows[1].parentNode.removeChild(assoctable.rows[1]);
 
                                        var devup = { };
+                                       var rowstyle = 1;
 
                                        for( var i = 0; i < st.length; i++ )
                                        {
                                                var iw = st[i];
-                                               var is_assoc = (iw.bssid && iw.channel);
-                                               var p = (100 / iw.quality_max * iw.quality);
+                                               var is_assoc = (iw.bssid && iw.bssid != '00:00:00:00:00:00' && iw.channel);
+                                               var p = iw.quality;
                                                var q = is_assoc ? p : -1;
 
                                                var icon;
@@ -172,7 +178,7 @@ $Id$
                                                                        '<strong><%:BSSID%>:</strong> %s | ' +
                                                                        '<strong><%:Encryption%>:</strong> %s',
                                                                                iw.ssid, iw.mode, iw.bssid,
-                                                                               iw.encryption ? iw.encryption.description : '<%:None%>'
+                                                                               iw.encryption ? iw.encryption : '<%:None%>'
                                                                );
                                                        else
                                                                info.innerHTML = String.format(
@@ -191,8 +197,8 @@ $Id$
                                                                        '<strong><%:Channel%>:</strong> %s (%s GHz) | ' +
                                                                        '<strong><%:Bitrate%>:</strong> %s Mb/s',
                                                                                iw.channel ? iw.channel : '?',
-                                                                               iw.frequency ? iw.frequency / 1000 : '?',
-                                                                               iw.bitrate ? iw.bitrate / 1000 : '?'
+                                                                               iw.frequency ? iw.frequency : '?',
+                                                                               iw.bitrate ? iw.bitrate : '?'
                                                                );
                                                        else
                                                                dev.innerHTML = '';
@@ -211,8 +217,8 @@ $Id$
 
                                                        for( var j = 0; j < assoclist.length; j++ )
                                                        {
-                                                               var tr = document.createElement('tr');
-                                                                       tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((j % 2) + (i % 2));
+                                                               var tr = assoctable.insertRow(-1);
+                                                                   tr.className = 'cbi-section-table-row cbi-rowstyle-' + rowstyle;
 
                                                                var icon;
                                                                var q = (-1 * (assoclist[j].noise - assoclist[j].signal)) / 5;
@@ -227,37 +233,33 @@ $Id$
                                                                else
                                                                        icon = "<%=resource%>/icons/signal-75-100.png";
 
-                                                               tr.innerHTML = String.format(
-                                                                       '<td class="cbi-value-field">' +
-                                                                               '<img src="%s" title="<%:Signal%>: %d dBm / <%:Noise%>: %d dBm" />' +
-                                                                       '</td>' +
-                                                                       '<td class="cbi-value-field">%s</td>' +
-                                                                       '<td class="cbi-value-field">%s</td>' +
-                                                                       '<td class="cbi-value-field">%s</td>' +
-                                                                       '<td class="cbi-value-field">%d dBm</td>' +
-                                                                       '<td class="cbi-value-field">%d dBm</td>',
-                                                                               icon,
-                                                                               assoclist[j].signal, assoclist[j].noise,
-                                                                               iw.ssid ? iw.ssid : '?',
-                                                                               assoclist[j].bssid,
-                                                                               arptable[assoclist[j].bssid]
-                                                                                       ? arptable[assoclist[j].bssid] : '?',
-                                                                               assoclist[j].signal, assoclist[j].noise
+                                                               tr.insertCell(-1).innerHTML = String.format(
+                                                                       '<img src="%s" title="<%:Signal%>: %d dBm / <%:Noise%>: %d dBm" />',
+                                                                       icon, assoclist[j].signal, assoclist[j].noise
                                                                );
 
-                                                               assoctable.rows[0].parentNode.appendChild(tr);
+                                                               tr.insertCell(-1).innerHTML = iw.ssid ? iw.ssid : '?';
+                                                               tr.insertCell(-1).innerHTML = assoclist[j].bssid;
+
+                                                               tr.insertCell(-1).innerHTML = arptable[assoclist[j].bssid]
+                                                                       ? arptable[assoclist[j].bssid] : '?';
+
+                                                               tr.insertCell(-1).innerHTML = String.format('%d dBm', assoclist[j].signal);
+                                                               tr.insertCell(-1).innerHTML = String.format('%d dBm', assoclist[j].noise);
+
+                                                               rowstyle = (rowstyle == 1) ? 2 : 1;
                                                        }
                                                }
                                        }
 
                                        if (assoctable && assoctable.rows.length == 1)
                                        {
-                                               var tr = document.createElement('tr');
-                                                       tr.className = 'cbi-section-table-row';
-
-                                               tr.innerHTML = '<td class="cbi-value-field" colspan="6"><br /><em><%:No information available%></em></td>';
+                                               var tr = assoctable.insertRow(-1);
+                                                   tr.className = 'cbi-section-table-row';
 
-                                               assoctable.rows[0].parentNode.appendChild(tr);
+                                               var td = tr.insertCell(-1);
+                                                   td.colSpan = 6;
+                                                   td.innerHTML = '<br /><em><%:No information available%></em>';
                                        }
 
                                        for (var dev in devup)
@@ -303,11 +305,11 @@ $Id$
                                <% for i, net in ipairs(nets) do %>
                                <tr class="cbi-section-table-row cbi-rowstyle-<%=1 + ((i-1) % 2)%>">
                                        <td></td>
-                                       <td class="cbi-value-field" style="width:16px; padding:3px" id="<%=net:ifname()%>-iw-signal">
+                                       <td class="cbi-value-field" style="width:16px; padding:3px" id="<%=net:id()%>-iw-signal">
                                                <img src="<%=resource%>/icons/signal-none.png" title="<%:Not associated%>" /><br />
                                                <small>0%</small>
                                        </td>
-                                       <td class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px" id="<%=net:ifname()%>-iw-status">
+                                       <td class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px" id="<%=net:id()%>-iw-status">
                                                <em><%:Collecting data...%></em>
                                        </td>
                                        <td class="cbi-value-field" style="width:40px">