projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5d426cf
)
modules/admin-full: rework wifi status templates
author
Jo-Philipp Wich
<jow@openwrt.org>
Thu, 20 Jan 2011 23:27:48 +0000
(23:27 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Thu, 20 Jan 2011 23:27:48 +0000
(23:27 +0000)
modules/admin-full/luasrc/view/admin_network/wifi_join.htm
patch
|
blob
|
history
modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
patch
|
blob
|
history
modules/admin-full/luasrc/view/admin_network/wifi_status.htm
patch
|
blob
|
history
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
4dea9ba
..
a1959a4
100644
(file)
--- 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 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>
</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
615e766
..
29de11c
100644
(file)
--- 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(
{
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',
'<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
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');
}
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
01a49c4
..
ba99acf
100644
(file)
--- 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 | ' +
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) | ' +
'<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)
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);
}
window.setTimeout(update_status, 5000);