diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2011-01-20 23:27:48 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-01-20 23:27:48 +0000 |
commit | 6942e4ab1b5f465caab9ad95ed938f75fa05cd1a (patch) | |
tree | a43274393e98dc6c0fff031393c4201b4cff6355 /modules/admin-full/luasrc/view | |
parent | 5d426cf4acd3c2fb70cd9939d3171d560e588c61 (diff) |
modules/admin-full: rework wifi status templates
Diffstat (limited to 'modules/admin-full/luasrc/view')
3 files changed, 15 insertions, 5 deletions
diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_join.htm b/modules/admin-full/luasrc/view/admin_network/wifi_join.htm index 4dea9bacc8..a1959a4ee2 100644 --- a/modules/admin-full/luasrc/view/admin_network/wifi_join.htm +++ b/modules/admin-full/luasrc/view/admin_network/wifi_join.htm @@ -114,7 +114,7 @@ $Id$ <input type="hidden" name="clbridge" value="<%=iw.type == "wl" and 1 or 0%>" /> - <input class="cbi-button-apply" type="submit" value="<%:Join Network%>" /> + <input class="cbi-button-apply" type="submit" value="Join Network" /> </form> </td> </tr> 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 615e766074..29de11cabc 100644 --- a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm +++ b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm @@ -167,7 +167,7 @@ $Id$ { if (is_assoc) info.innerHTML = String.format( - '<strong><%:SSID%>:</strong> %s | ' + + '<strong><%:SSID%>:</strong> %h | ' + '<strong><%:Mode%>:</strong> %s<br />' + '<strong><%:BSSID%>:</strong> %s | ' + '<strong><%:Encryption%>:</strong> %s', @@ -175,7 +175,12 @@ $Id$ iw.encryption ? iw.encryption.description : '<%:None%>' ); else - info.innerHTML = '<em><%:Wireless is disabled or not associated%></em>'; + info.innerHTML = String.format( + '<strong><%:SSID%>:</strong> %h | ' + + '<strong><%:Mode%>:</strong> %s<br />' + + '<em><%:Wireless is disabled or not associated%></em>', + iw.ssid || '?', iw.mode + ); } var dev = document.getElementById(wifidevs[iw.id] + '-iw-devinfo'); diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_status.htm b/modules/admin-full/luasrc/view/admin_network/wifi_status.htm index 01a49c43eb..ba99acf199 100644 --- a/modules/admin-full/luasrc/view/admin_network/wifi_status.htm +++ b/modules/admin-full/luasrc/view/admin_network/wifi_status.htm @@ -37,7 +37,7 @@ if (d && is_assoc) d.innerHTML = String.format( '<strong><%:Mode%>:</strong> %s | ' + - '<strong><%:SSID%>:</strong> %s<br />' + + '<strong><%:SSID%>:</strong> %h<br />' + '<strong><%:BSSID%>:</strong> %s | ' + '<strong><%:Encryption%>:</strong> %s<br />' + '<strong><%:Channel%>:</strong> %d (%.3f GHz) | ' + @@ -53,7 +53,12 @@ iw.bitrate ? (iw.bitrate / 1000) : 0, iw.country ); else if (d) - d.innerHTML = '<%:Wireless is disabled or not associated%>'; + d.innerHTML = String.format( + '<strong><%:SSID%>:</strong> %h | ' + + '<strong><%:Mode%>:</strong> %s<br />' + + '<em><%:Wireless is disabled or not associated%></em>', + iw.ssid || '?', iw.mode + ); } window.setTimeout(update_status, 5000); |