X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=modules%2Fluci-mod-admin-full%2Fluasrc%2Fview%2Fadmin_status%2Findex.htm;h=206f9ef82af90f6508f7cfc705efd4734e3d92cb;hb=c69622e5afb31490044e975c760daf81debd390e;hp=8c3e01e603ba79a4d58025c39e43eefc8ae45231;hpb=219e52ee8e737afbd9b924e9516aa59d0d1a852e;p=project%2Fluci.git
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
index 8c3e01e60..206f9ef82 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
@@ -76,12 +76,14 @@
if wan6 then
rv.wan6 = {
- ip6addr = wan6:ip6addr(),
- gw6addr = wan6:gw6addr(),
- dns = wan6:dns6addrs(),
- uptime = wan6:uptime(),
- ifname = wan6:ifname(),
- link = wan6:adminlink()
+ ip6addr = wan6:ip6addr(),
+ gw6addr = wan6:gw6addr(),
+ dns = wan6:dns6addrs(),
+ ip6prefix = wan6:ip6prefix(),
+ uptime = wan6:uptime(),
+ proto = wan6:proto(),
+ ifname = wan6:ifname(),
+ link = wan6:adminlink()
}
end
@@ -233,9 +235,34 @@
if (ifc6 && ifc6.ifname && ifc6.proto != 'none')
{
var s = String.format(
- '<%:Address%>: %s
' +
+ '<%:Type%>: %s%s
',
+ ifc6.proto, (ifc6.ip6prefix) ? '-pd' : ''
+ );
+
+ if (!ifc6.ip6prefix)
+ {
+ s += String.format(
+ '<%:Address%>: %s
',
+ (ifc6.ip6addr) ? ifc6.ip6addr : '::'
+ );
+ }
+ else
+ {
+ s += String.format(
+ '<%:Prefix Delegated%>: %s
',
+ ifc6.ip6prefix
+ );
+ if (ifc6.ip6addr)
+ {
+ s += String.format(
+ '<%:Address%>: %s
',
+ ifc6.ip6addr
+ );
+ }
+ }
+
+ s += String.format(
'<%:Gateway%>: %s
',
- (ifc6.ip6addr) ? ifc6.ip6addr : '::',
(ifc6.gw6addr) ? ifc6.gw6addr : '::'
);
@@ -341,7 +368,9 @@
{
var timestr;
- if (info.leases[i].expires <= 0)
+ if (info.leases[i].expires === false)
+ timestr = '<%:unlimited%>';
+ else if (info.leases[i].expires <= 0)
timestr = '<%:expired%>';
else
timestr = String.format('%t', info.leases[i].expires);
@@ -379,7 +408,9 @@
{
var timestr;
- if (info.leases6[i].expires <= 0)
+ if (info.leases6[i].expires === false)
+ timestr = '<%:unlimited%>';
+ else if (info.leases6[i].expires <= 0)
timestr = '<%:expired%>';
else
timestr = String.format('%t', info.leases6[i].expires);
@@ -471,7 +502,7 @@
'<%:Bitrate%>: %s <%:Mbit/s%>
',
icon, net.signal, net.noise,
net.quality,
- net.link, net.ssid,
+ net.link, net.ssid || '?',
net.mode,
net.channel, net.frequency,
net.bitrate || '?'
@@ -482,7 +513,7 @@
s += String.format(
'<%:BSSID%>: %s
' +
'<%:Encryption%>: %s',
- net.bssid,
+ net.bssid || '?',
net.encryption
);
}