summaryrefslogtreecommitdiffhomepage
path: root/modules/admin-full/luasrc/view
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2009-09-27 03:04:36 +0000
committerJo-Philipp Wich <jow@openwrt.org>2009-09-27 03:04:36 +0000
commiteed55531107c6642efc0dc93211325d9b7318022 (patch)
treea4a2ace6021799695c1c706e636b53f984c660ad /modules/admin-full/luasrc/view
parent37b3416c5d3eb6d3f9e3ca776e8d7afb2caf33e2 (diff)
modules/admin-full: fix some problems with b43
Diffstat (limited to 'modules/admin-full/luasrc/view')
-rw-r--r--modules/admin-full/luasrc/view/admin_network/wifi_overview.htm12
1 files changed, 7 insertions, 5 deletions
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 580fe9abec..72fe39ea3e 100644
--- a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
@@ -65,7 +65,7 @@ $Id$
-- dunno yet
else
- return "Unkown 802.11 Wireless Controller"
+ return "Generic 802.11 Wireless Controller"
end
end
@@ -160,8 +160,10 @@ $Id$
<td style="width:34px"><img src="<%=resource%>/icons/wifi<%=state.active and "" or "_disabled"%>.png" style="float:left; margin-right:10px" /></td>
<td colspan="2" style="text-align:left">
<big><strong><%=state.hwname%> (<%=dev%>)</strong></big><br />
- <strong>Channel:</strong> <%=find_wifi_frequency(state)%> |
- <strong>Bitrate:</strong> <%=(state and state.networks[1]) and (state.networks[1].info.bitrate / 1000) .. " Mb/s" or "n/a"%>
+ <% if state.networks[1] and state.networks[1].info then %>
+ <strong>Channel:</strong> <%=find_wifi_frequency(state)%> |
+ <strong>Bitrate:</strong> <%=state.networks[1].info.bitrate and (state.networks[1].info.bitrate / 1000) .. " Mb/s" or "n/a"%>
+ <% end %>
</td>
<td style="width:40px">
<a href="<%=luci.dispatcher.build_url("admin/network/wireless_join?device="..dev)%>"><img style="border:none" src="<%=resource%>/cbi/find.gif" alt="Find and join network" title="Find and join network" /></a>
@@ -176,14 +178,14 @@ $Id$
<tr class="cbi-section-table-row cbi-rowstyle-<%=1 + ((i-1) % 2)%>">
<td></td>
<td class="cbi-value-field" style="width:16px; padding:3px">
- <img src="<%=guess_wifi_signal(net.info)%>" title="Signal: <%=net.info.signal%> dBm / Noise: <%=net.info.noise%> dBm" /><br />
+ <img src="<%=guess_wifi_signal(net.info)%>" title="Signal: <%=net.info.signal or 0%> dBm / Noise: <%=net.info.noise or 0%> dBm" /><br />
<small><%=percent_wifi_signal(net.info)%>%</small>
</td>
<td class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px">
<strong>SSID:</strong> <%=utl.pcdata(net.info.ssid)%> |
<strong>Mode:</strong> <%=net.info.mode%><br />
<strong>BSSID:</strong> <%=net.info.bssid%> |
- <strong>Encryption:</strong> <%=net.info.enctype%>
+ <strong>Encryption:</strong> <%=net.info.enctype or "None"%>
</td>
<td class="cbi-value-field" style="width:40px">
<a href="<%=REQUEST_URI%>/<%=dev%>"><img style="border:none" src="<%=resource%>/cbi/edit.gif" alt="Edit this network" title="Edit this network" /></a>