projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
f4a44d9
..
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>
<%#
LuCI - Lua Configuration Interface
Copyright 2008-2009 Steven Barth <steven@midlink.org>
-Copyright 2008-201
0
Jo-Philipp Wich <xm@subsignal.org>
+Copyright 2008-201
1
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.
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 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"
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
elseif name == "ra" then
return "RaLink 802.11%s Wireless Controller" % bands
- --
prism?
+ --
hermes
elseif name == "eth" then
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
-- dunno yet
else
@@
-97,8
+102,8
@@
$Id$
for _, dev in ipairs(devices) do
local net
for _, net in ipairs(dev:get_wifinets()) do
for _, dev in ipairs(devices) do
local net
for _, net in ipairs(dev:get_wifinets()) do
- netlist[#netlist+1] = net:i
fname
()
- netdevs[net:i
fname
()] = dev:name()
+ netlist[#netlist+1] = net:i
d
()
+ netdevs[net:i
d
()] = dev:name()
end
end
-%>
end
end
-%>
@@
-130,12
+135,13
@@
$Id$
assoctable.rows[1].parentNode.removeChild(assoctable.rows[1]);
var devup = { };
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];
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;
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,
'<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(
);
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 : '?',
'<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 = '';
);
else
dev.innerHTML = '';
@@
-212,7
+218,7
@@
$Id$
for( var j = 0; j < assoclist.length; j++ )
{
var tr = assoctable.insertRow(-1);
for( var j = 0; j < assoclist.length; j++ )
{
var tr = assoctable.insertRow(-1);
- tr.className = 'cbi-section-table-row cbi-rowstyle-' +
((j % 2) + (i % 2))
;
+ tr.className = 'cbi-section-table-row cbi-rowstyle-' +
rowstyle
;
var icon;
var q = (-1 * (assoclist[j].noise - assoclist[j].signal)) / 5;
var icon;
var q = (-1 * (assoclist[j].noise - assoclist[j].signal)) / 5;
@@
-240,6
+246,8
@@
$Id$
tr.insertCell(-1).innerHTML = String.format('%d dBm', assoclist[j].signal);
tr.insertCell(-1).innerHTML = String.format('%d dBm', assoclist[j].noise);
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;
}
}
}
}
}
}
@@
-297,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>
<% 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:i
fname
()%>-iw-signal">
+ <td class="cbi-value-field" style="width:16px; padding:3px" id="<%=net:i
d
()%>-iw-signal">
<img src="<%=resource%>/icons/signal-none.png" title="<%:Not associated%>" /><br />
<small>0%</small>
</td>
<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:i
fname
()%>-iw-status">
+ <td class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px" id="<%=net:i
d
()%>-iw-status">
<em><%:Collecting data...%></em>
</td>
<td class="cbi-value-field" style="width:40px">
<em><%:Collecting data...%></em>
</td>
<td class="cbi-value-field" style="width:40px">