298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-15 18:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

rollback the stupid offical 18.06 luci to 17.01

Browse Source
This commit is contained in:
coolsnowwolf 2018-09-22 14:26:49 +08:00
parent 7de493a34e
commit 1052c67666
7 changed files with 369 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
feeds.conf.default
View File

@ -1,4 +1,4 @@
src-git packages https://github.com/openwrt/packages.git;openwrt-18.06 src-git packages https://github.com/openwrt/packages.git;openwrt-18.06
src-git luci https://github.com/openwrt/luci.git;openwrt-18.06 src-git luci https://github.com/openwrt/luci.git^80cb4fef8c7db0dadc373fef122d7abb092a7191
src-git routing https://git.openwrt.org/feed/routing.git;openwrt-18.06 src-git routing https://git.openwrt.org/feed/routing.git;openwrt-18.06
#src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-18.06 #src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-18.06

2
package/lean/autocore/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=autocore PKG_NAME:=autocore
PKG_VERSION:=1 PKG_VERSION:=1
PKG_RELEASE:=12 PKG_RELEASE:=11
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

628
package/lean/autocore/files/index.htm
View File

@ -6,7 +6,6 @@
<% <%
local fs = require "nixio.fs" local fs = require "nixio.fs"
local ipc = require "luci.ip"
local util = require "luci.util" local util = require "luci.util"
local stat = require "luci.tools.status" local stat = require "luci.tools.status"
local ver = require "luci.version" local ver = require "luci.version"
@ -59,8 +58,6 @@
} }
if wan then if wan then
local dev = wan:get_interface()
local link = dev and ipc.link(dev:name())
rv.wan = { rv.wan = {
ipaddr = wan:ipaddr(), ipaddr = wan:ipaddr(),
gwaddr = wan:gwaddr(), gwaddr = wan:gwaddr(),
@ -69,19 +66,12 @@
expires = wan:expires(), expires = wan:expires(),
uptime = wan:uptime(), uptime = wan:uptime(),
proto = wan:proto(), proto = wan:proto(),
i18n = wan:get_i18n(),
ifname = wan:ifname(), ifname = wan:ifname(),
link = wan:adminlink(), link = wan:adminlink()
mac = dev and dev:mac(),
type = dev and dev:type(),
name = dev and dev:get_i18n(),
ether = link and link.type == 1
} }
end end
if wan6 then if wan6 then
local dev = wan6:get_interface()
local link = dev and ipc.link(dev:name())
rv.wan6 = { rv.wan6 = {
ip6addr = wan6:ip6addr(), ip6addr = wan6:ip6addr(),
gw6addr = wan6:gw6addr(), gw6addr = wan6:gw6addr(),
@ -89,13 +79,8 @@
ip6prefix = wan6:ip6prefix(), ip6prefix = wan6:ip6prefix(),
uptime = wan6:uptime(), uptime = wan6:uptime(),
proto = wan6:proto(), proto = wan6:proto(),
i18n = wan6:get_i18n(),
ifname = wan6:ifname(), ifname = wan6:ifname(),
link = wan6:adminlink(), link = wan6:adminlink()
mac = dev and dev:mac(),
type = dev and dev:type(),
name = dev and dev:get_i18n(),
ether = link and link.type == 1
} }
end end
@ -121,7 +106,7 @@
<%+header%> <%+header%>
<script type="text/javascript" src="<%=resource%>/cbi.js?v=git-18.163.61042-b5a43cf"></script> <script type="text/javascript" src="<%=resource%>/cbi.js?v=git-18.143.28733-7acacf2"></script>
<script type="text/javascript">//<![CDATA[ <script type="text/javascript">//<![CDATA[
function progressbar(v, m) function progressbar(v, m)
{ {
@ -179,95 +164,133 @@
}); });
} }
function labelList(items, offset) {
var rv = [ ];
for (var i = offset || 0; i < items.length; i += 2) {
var label = items[i],
value = items[i+1];
if (value === undefined || value === null)
continue;
if (label)
rv.push(E('strong', [label, ': ']));
rv.push(value, E('br'));
}
return rv;
}
function renderBox(title, active, childs) {
childs = childs || [];
childs.unshift(E('span', labelList(arguments, 3)));
return E('div', { class: 'ifacebox' }, [
E('div', { class: 'ifacebox-head center ' + (active ? 'active' : '') },
E('strong', title)),
E('div', { class: 'ifacebox-body' }, childs)
]);
}
function renderBadge(icon, title) {
return E('span', { class: 'ifacebadge' }, [
E('img', { src: icon, title: title || '' }),
E('span', labelList(arguments, 2))
]);
}
XHR.poll(5, '<%=REQUEST_URI%>', { status: 1 }, XHR.poll(5, '<%=REQUEST_URI%>', { status: 1 },
function(x, info) function(x, info)
{ {
if (!(npoll++ % 5)) if (!(npoll++ % 5))
updateHosts(); updateHosts();
var us = document.getElementById('upstream_status_table'); var si = document.getElementById('wan4_i');
var ss = document.getElementById('wan4_s');
var ifc = info.wan;
while (us.lastElementChild) if (ifc && ifc.ifname && ifc.proto != 'none')
us.removeChild(us.lastElementChild); {
var s = String.format(
'<strong><%:Type%>: </strong>%s<br />' +
'<strong><%:Address%>: </strong>%s<br />' +
'<strong><%:Netmask%>: </strong>%s<br />' +
'<strong><%:Gateway%>: </strong>%s<br />',
ifc.proto,
(ifc.ipaddr) ? ifc.ipaddr : '0.0.0.0',
(ifc.netmask && ifc.netmask != ifc.ipaddr) ? ifc.netmask : '255.255.255.255',
(ifc.gwaddr) ? ifc.gwaddr : '0.0.0.0'
);
var ifc = info.wan || {}; for (var i = 0; i < ifc.dns.length; i++)
{
s += String.format(
'<strong><%:DNS%> %d: </strong>%s<br />',
i + 1, ifc.dns[i]
);
}
us.appendChild(renderBox( if (ifc.expires > -1)
'<%:IPv4 Upstream%>', {
(ifc.ifname && ifc.proto != 'none'), s += String.format(
[ E('div', {}, renderBadge( '<strong><%:Expires%>: </strong>%t<br />',
'<%=resource%>/icons/%s.png'.format((ifc && ifc.type) ? ifc.type : 'ethernet_disabled'), null, ifc.expires
'<%:Device%>', ifc ? (ifc.name || ifc.ifname || '-') : '-', );
'<%:MAC-Address%>', (ifc && ifc.ether) ? ifc.mac : null)) ], }
'<%:Protocol%>', ifc.i18n || E('em', '<%:Not connected%>'),
'<%:Address%>', (ifc.ipaddr) ? ifc.ipaddr : '0.0.0.0', if (ifc.uptime > 0)
'<%:Netmask%>', (ifc.netmask && ifc.netmask != ifc.ipaddr) ? ifc.netmask : '255.255.255.255', {
'<%:Gateway%>', (ifc.gwaddr) ? ifc.gwaddr : '0.0.0.0', s += String.format(
'<%:DNS%> 1', (ifc.dns) ? ifc.dns[0] : null, '<strong><%:Connected%>: </strong>%t<br />',
'<%:DNS%> 2', (ifc.dns) ? ifc.dns[1] : null, ifc.uptime
'<%:DNS%> 3', (ifc.dns) ? ifc.dns[2] : null, );
'<%:DNS%> 4', (ifc.dns) ? ifc.dns[3] : null, }
'<%:DNS%> 5', (ifc.dns) ? ifc.dns[4] : null,
'<%:Expires%>', (ifc.expires > -1) ? '%t'.format(ifc.expires) : null, ss.innerHTML = String.format('<small>%s</small>', s);
'<%:Connected%>', (ifc.uptime > 0) ? '%t'.format(ifc.uptime) : null)); si.innerHTML = String.format(
'<img src="<%=resource%>/icons/ethernet.png" />' +
'<br /><small><a href="%s">%s</a></small>',
ifc.link, ifc.ifname
);
}
else
{
si.innerHTML = '<img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small>';
ss.innerHTML = '<em><%:Not connected%></em>';
}
<% if has_ipv6 then %> <% if has_ipv6 then %>
var ifc6 = info.wan6 || {}; var si6 = document.getElementById('wan6_i');
var ss6 = document.getElementById('wan6_s');
var ifc6 = info.wan6;
us.appendChild(renderBox( if (ifc6 && ifc6.ifname && ifc6.proto != 'none')
'<%:IPv6 Upstream%>', {
(ifc6.ifname && ifc6.proto != 'none'), var s = String.format(
[ E('div', {}, renderBadge( '<strong><%:Type%>: </strong>%s%s<br />',
'<%=resource%>/icons/%s.png'.format(ifc6.type || 'ethernet_disabled'), null, ifc6.proto, (ifc6.ip6prefix) ? '-pd' : ''
'<%:Device%>', ifc6 ? (ifc6.name || ifc6.ifname || '-') : '-', );
'<%:MAC-Address%>', (ifc6 && ifc6.ether) ? ifc6.mac : null)) ],
'<%:Protocol%>', ifc6.i18n ? (ifc6.i18n + (ifc6.proto === 'dhcp' && ifc6.ip6prefix ? '-PD' : '')) : E('em', '<%:Not connected%>'), if (!ifc6.ip6prefix)
'<%:Prefix Delegated%>', ifc6.ip6prefix, {
'<%:Address%>', (ifc6.ip6prefix) ? (ifc6.ip6addr || null) : (ifc6.ipaddr || '::'), s += String.format(
'<%:Gateway%>', (ifc6.gw6addr) ? ifc6.gw6addr : '::', '<strong><%:Address%>: </strong>%s<br />',
'<%:DNS%> 1', (ifc6.dns) ? ifc6.dns[0] : null, (ifc6.ip6addr) ? ifc6.ip6addr : '::'
'<%:DNS%> 2', (ifc6.dns) ? ifc6.dns[1] : null, );
'<%:DNS%> 3', (ifc6.dns) ? ifc6.dns[2] : null, }
'<%:DNS%> 4', (ifc6.dns) ? ifc6.dns[3] : null, else
'<%:DNS%> 5', (ifc6.dns) ? ifc6.dns[4] : null, {
'<%:Connected%>', (ifc6.uptime > 0) ? '%t'.format(ifc6.uptime) : null)); s += String.format(
'<strong><%:Prefix Delegated%>: </strong>%s<br />',
ifc6.ip6prefix
);
if (ifc6.ip6addr)
{
s += String.format(
'<strong><%:Address%>: </strong>%s<br />',
ifc6.ip6addr
);
}
}
s += String.format(
'<strong><%:Gateway%>: </strong>%s<br />',
(ifc6.gw6addr) ? ifc6.gw6addr : '::'
);
for (var i = 0; i < ifc6.dns.length; i++)
{
s += String.format(
'<strong><%:DNS%> %d: </strong>%s<br />',
i + 1, ifc6.dns[i]
);
}
if (ifc6.uptime > 0)
{
s += String.format(
'<strong><%:Connected%>: </strong>%t<br />',
ifc6.uptime
);
}
ss6.innerHTML = String.format('<small>%s</small>', s);
si6.innerHTML = String.format(
'<img src="<%=resource%>/icons/ethernet.png" />' +
'<br /><small><a href="%s">%s</a></small>',
ifc6.link, ifc6.ifname
);
}
else
{
si6.innerHTML = '<img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small>';
ss6.innerHTML = '<em><%:Not connected%></em>';
}
<% end %> <% end %>
<% if has_dsl then %> <% if has_dsl then %>
@ -335,10 +358,10 @@
if (ls) if (ls)
{ {
/* clear all rows */ /* clear all rows */
while (ls.firstElementChild !== ls.lastElementChild) while( ls.rows.length > 1 )
ls.removeChild(ls.lastElementChild); ls.rows[0].parentNode.deleteRow(1);
for (var i = 0; i < info.leases.length; i++) for( var i = 0; i < info.leases.length; i++ )
{ {
var timestr; var timestr;
@ -349,16 +372,24 @@
else else
timestr = String.format('%t', info.leases[i].expires); timestr = String.format('%t', info.leases[i].expires);
ls.appendChild(E('<div class="tr cbi-section-table-row cbi-rowstyle-%d">'.format((i % 2) + 1), [ var tr = ls.rows[0].parentNode.insertRow(-1);
E('<div class="td">', info.leases[i].hostname ? info.leases[i].hostname : '?'), tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1);
E('<div class="td">', info.leases[i].ipaddr),
E('<div class="td">', info.leases[i].macaddr), tr.insertCell(-1).innerHTML = info.leases[i].hostname ? info.leases[i].hostname : '?';
E('<div class="td">', timestr) tr.insertCell(-1).innerHTML = info.leases[i].ipaddr;
])); tr.insertCell(-1).innerHTML = info.leases[i].macaddr;
tr.insertCell(-1).innerHTML = timestr;
} }
if (ls.firstElementChild === ls.lastElementChild) if( ls.rows.length == 1 )
ls.appendChild(E('<div class="tr cbi-section-table-row"><div class="td"><em><br /><%:There are no active leases.%></em></div></div>')); {
var tr = ls.rows[0].parentNode.insertRow(-1);
tr.className = 'cbi-section-table-row';
var td = tr.insertCell(-1);
td.colSpan = 4;
td.innerHTML = '<em><br /><%:There are no active leases.%></em>';
}
} }
var ls6 = document.getElementById('lease6_status_table'); var ls6 = document.getElementById('lease6_status_table');
@ -367,10 +398,10 @@
ls6.parentNode.style.display = 'block'; ls6.parentNode.style.display = 'block';
/* clear all rows */ /* clear all rows */
while (ls6.firstElementChild !== ls6.lastElementChild) while( ls6.rows.length > 1 )
ls6.removeChild(ls6.lastElementChild); ls6.rows[0].parentNode.deleteRow(1);
for (var i = 0; i < info.leases6.length; i++) for( var i = 0; i < info.leases6.length; i++ )
{ {
var timestr; var timestr;
@ -381,29 +412,35 @@
else else
timestr = String.format('%t', info.leases6[i].expires); timestr = String.format('%t', info.leases6[i].expires);
var host = hosts[duid2mac(info.leases6[i].duid)], var tr = ls6.rows[0].parentNode.insertRow(-1);
name = info.leases6[i].hostname, tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1);
hint = null;
if (!name) { var host = hosts[duid2mac(info.leases6[i].duid)];
if (host) if (!info.leases6[i].hostname)
hint = host.name || host.ipv4 || host.ipv6; tr.insertCell(-1).innerHTML =
} (host && (host.name || host.ipv4 || host.ipv6))
else { ? '<div style="max-width:200px;overflow:hidden;text-overflow:ellipsis;white-space: nowrap">? (%h)</div>'.format(host.name || host.ipv4 || host.ipv6)
if (host && host.name && info.leases6[i].hostname != host.name) : '?';
hint = host.name; else
} tr.insertCell(-1).innerHTML =
(host && host.name && info.leases6[i].hostname != host.name)
? '<div style="max-width:200px;overflow:hidden;text-overflow:ellipsis;white-space: nowrap">%h (%h)</div>'.format(info.leases6[i].hostname, host.name)
: info.leases6[i].hostname;
ls6.appendChild(E('<div class="tr cbi-section-table-row cbi-rowstyle-%d">'.format((i % 2) + 1), [ tr.insertCell(-1).innerHTML = info.leases6[i].ip6addr;
E('<div class="td nowrap">', hint ? '<div>%h (%h)</div>'.format(name || '?', hint) : (name || '?')), tr.insertCell(-1).innerHTML = info.leases6[i].duid;
E('<div class="td nowrap">', info.leases6[i].ip6addr), tr.insertCell(-1).innerHTML = timestr;
E('<div class="td nowrap">', info.leases6[i].duid),
E('<div class="td nowrap">', timestr)
]));
} }
if (ls6.firstElementChild === ls6.lastElementChild) if( ls6.rows.length == 1 )
ls6.appendChild(E('<div class="tr cbi-section-table-row"><div class="td"><em><br /><%:There are no active leases.%></em></div></div>')); {
var tr = ls6.rows[0].parentNode.insertRow(-1);
tr.className = 'cbi-section-table-row';
var td = tr.insertCell(-1);
td.colSpan = 4;
td.innerHTML = '<em><br /><%:There are no active leases.%></em>';
}
} }
<% end %> <% end %>
@ -413,34 +450,30 @@
var ws = document.getElementById('wifi_status_table'); var ws = document.getElementById('wifi_status_table');
if (ws) if (ws)
{ {
while (ws.lastElementChild) var wsbody = ws.rows[0].parentNode;
ws.removeChild(ws.lastElementChild); while (ws.rows.length > 0)
wsbody.deleteRow(0);
for (var didx = 0; didx < info.wifinets.length; didx++) for (var didx = 0; didx < info.wifinets.length; didx++)
{ {
var dev = info.wifinets[didx]; var dev = info.wifinets[didx];
var net0 = (dev.networks && dev.networks[0]) ? dev.networks[0] : {};
var vifs = []; var tr = wsbody.insertRow(-1);
var td;
td = tr.insertCell(-1);
td.width = "33%";
td.innerHTML = dev.name;
td.style.verticalAlign = "top";
td = tr.insertCell(-1);
var s = '';
for (var nidx = 0; nidx < dev.networks.length; nidx++) for (var nidx = 0; nidx < dev.networks.length; nidx++)
{ {
var net = dev.networks[nidx]; var net = dev.networks[nidx];
var is_assoc = (net.bssid != '00:00:00:00:00:00' && net.channel && !net.disabled); var is_assoc = (net.bssid != '00:00:00:00:00:00' && net.channel && !net.disabled);
var num_assoc = 0;
for (var bssid in net.assoclist)
{
var bss = net.assoclist[bssid];
bss.bssid = bssid;
bss.link = net.link;
bss.name = net.name;
bss.ifname = net.ifname;
bss.radio = dev.name;
assoclist.push(bss);
num_assoc++;
}
var icon; var icon;
if (!is_assoc) if (!is_assoc)
@ -456,35 +489,66 @@
else else
icon = "<%=resource%>/icons/signal-75-100.png"; icon = "<%=resource%>/icons/signal-75-100.png";
vifs.push(renderBadge( s += String.format(
icon, '<table><tr><td style="text-align:center; width:32px; padding:3px">' +
'<%:Signal%>: %d dBm / <%:Quality%>: %d%%'.format(net.signal, net.quality), '<img src="%s" title="<%:Signal%>: %d dBm / <%:Noise%>: %d dBm" />' +
'<%:SSID%>', E('a', { href: net.link }, [ net.ssid || '?' ]), '<br /><small>%d%%</small>' +
'<%:Mode%>', net.mode, '</td><td style="text-align:left; padding:3px"><small>' +
'<%:BSSID%>', is_assoc ? (net.bssid || '-') : null, '<strong><%:SSID%>:</strong> <a href="%s">%h</a><br />' +
'<%:Encryption%>', is_assoc ? net.encryption : null, '<strong><%:Mode%>:</strong> %s<br />' +
'<%:Associations%>', is_assoc ? (num_assoc || '-') : null, '<strong><%:Channel%>:</strong> %d (%.3f <%:GHz%>)<br />' +
null, is_assoc ? null : E('em', '<%:Wireless is disabled or not associated%>'))); '<strong><%:Bitrate%>:</strong> %s <%:Mbit/s%><br />',
icon, net.signal, net.noise,
net.quality,
net.link, net.ssid || '?',
net.mode,
net.channel, net.frequency,
net.bitrate || '?'
);
if (is_assoc)
{
s += String.format(
'<strong><%:BSSID%>:</strong> %s<br />' +
'<strong><%:Encryption%>:</strong> %s',
net.bssid || '?',
net.encryption
);
}
else
{
s += '<em><%:Wireless is disabled or not associated%></em>';
}
s += '</small></td></tr></table>';
for (var bssid in net.assoclist)
{
var bss = net.assoclist[bssid];
bss.bssid = bssid;
bss.link = net.link;
bss.name = net.name;
bss.ifname = net.ifname;
bss.radio = dev.name;
assoclist.push(bss);
}
} }
ws.appendChild(renderBox( if (!s)
dev.device, dev.up || net0.up, s = '<em><%:No information available%></em>';
[ E('div', vifs) ],
'<%:Type%>', dev.name.replace(/^Generic | Wireless Controller .+$/g, ''),
'<%:Channel%>', net0.channel ? '%d (%.3f <%:GHz%>)'.format(net0.channel, net0.frequency) : '-',
'<%:Bitrate%>', net0.bitrate ? '%d <%:Mbit/s%>'.format(net0.bitrate) : '-'));
}
if (!ws.lastElementChild) td.innerHTML = s;
ws.appendChild(E('<em><%:No information available%></em>')); }
} }
var ac = document.getElementById('wifi_assoc_table'); var ac = document.getElementById('wifi_assoc_table');
if (ac) if (ac)
{ {
/* clear all rows */ /* clear all rows */
while (ac.firstElementChild !== ac.lastElementChild) while( ac.rows.length > 1 )
ac.removeChild(ac.lastElementChild); ac.rows[0].parentNode.deleteRow(1);
assoclist.sort(function(a, b) { assoclist.sort(function(a, b) {
return (a.name == b.name) return (a.name == b.name)
@ -493,8 +557,11 @@
; ;
}); });
for (var i = 0; i < assoclist.length; i++) for( var i = 0; i < assoclist.length; i++ )
{ {
var tr = ac.rows[0].parentNode.insertRow(-1);
tr.className = 'cbi-section-table-row cbi-rowstyle-' + (1 + (i % 2));
var icon; var icon;
var q = (-1 * (assoclist[i].noise - assoclist[i].signal)) / 5; var q = (-1 * (assoclist[i].noise - assoclist[i].signal)) / 5;
if (q < 1) if (q < 1)
@ -508,31 +575,49 @@
else else
icon = "<%=resource%>/icons/signal-75-100.png"; icon = "<%=resource%>/icons/signal-75-100.png";
var host = hosts[assoclist[i].bssid], tr.insertCell(-1).innerHTML = String.format(
name = host ? (host.name || host.ipv4 || host.ipv6) : null, '<span class="ifacebadge" title="%q"><img src="<%=resource%>/icons/wifi.png" /> %h</span>',
hint = (host && host.name && (host.ipv4 || host.ipv6)) ? (host.ipv4 || host.ipv6) : null; assoclist[i].radio, assoclist[i].ifname
);
ac.appendChild(E('<div class="tr cbi-section-table-row cbi-rowstyle-%d">'.format(1 + (i % 2)), [ tr.insertCell(-1).innerHTML = String.format(
E('<div class="td"><span class="ifacebadge" title="%q"><img src="<%=resource%>/icons/wifi.png" /> %h</span></div>' '<a href="%s">%s</a>',
.format(assoclist[i].radio, assoclist[i].ifname)), assoclist[i].link,
E('<div class="td"><a href="%s" style="white-space:nowrap">%h</a></div>' '%h'.format(assoclist[i].name).nobr()
.format(assoclist[i].link, assoclist[i].name)), );
E('<div class="td">',
assoclist[i].bssid), tr.insertCell(-1).innerHTML = assoclist[i].bssid;
E('<div class="td nowrap">',
hint ? '<div>%h (%h)</div>'.format(name || '?', hint) : (name || '?')), var host = hosts[assoclist[i].bssid];
E('<div class="td"><span class="ifacebadge" title="<%:Signal%>: %d <%:dBm%> / <%:Noise%>: %d <%:dBm%> / <%:SNR%>: %d"><img src="%s" /> %d / %d <%:dBm%></span></div>' if (host)
.format(assoclist[i].signal, assoclist[i].noise, assoclist[i].signal - assoclist[i].noise, icon, assoclist[i].signal, assoclist[i].noise)), tr.insertCell(-1).innerHTML = String.format(
E('<div class="td nowrap">', [ '<div style="max-width:200px;overflow:hidden;text-overflow:ellipsis">%s</div>',
E('<span style="white-space:nowrap">', wifirate(assoclist[i], true)), ((host.name && (host.ipv4 || host.ipv6))
E('<br />'), ? '%h (%s)'.format(host.name, host.ipv4 || host.ipv6)
E('<span style="white-space:nowrap">', wifirate(assoclist[i], false)) : '%h'.format(host.name || host.ipv4 || host.ipv6)).nobr()
]) );
])); else
tr.insertCell(-1).innerHTML = '?';
tr.insertCell(-1).innerHTML = String.format(
'<span class="ifacebadge" title="<%:Signal%>: %d <%:dBm%> / <%:Noise%>: %d <%:dBm%> / <%:SNR%>: %d"><img src="%s" /> %d / %d <%:dBm%></span>',
assoclist[i].signal, assoclist[i].noise, assoclist[i].signal - assoclist[i].noise,
icon,
assoclist[i].signal, assoclist[i].noise
);
tr.insertCell(-1).innerHTML = wifirate(assoclist[i], true).nobr() + '<br />' + wifirate(assoclist[i], false).nobr();
} }
if (ac.firstElementChild === ac.lastElementChild) if (ac.rows.length == 1)
ac.appendChild(E('<div class="tr cbi-section-table-row"><div class="td"><em><br /><%:No information available%></em></div></div>')); {
var tr = ac.rows[0].parentNode.insertRow(-1);
tr.className = 'cbi-section-table-row';
var td = tr.insertCell(-1);
td.colSpan = 7;
td.innerHTML = '<br /><em><%:No information available%></em>';
}
} }
<% end %> <% end %>
@ -594,104 +679,109 @@
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend><%:System%></legend> <legend><%:System%></legend>
<div class="table" width="100%"> <table width="100%" cellspacing="10">
<div class="tr"><div class="td left" width="33%"><%:Hostname%></div><div class="td left"><%=luci.sys.hostname() or "?"%></div></div> <tr><td width="33%"><%:Hostname%></td><td><%=luci.sys.hostname() or "?"%></td></tr>
<div class="tr"><div class="td left" width="33%"><%:Model%></div><div class="td left"><%=pcdata(boardinfo.model or "?")%></div></div> <tr><td width="33%"><%:Model%></td><td><%=pcdata(boardinfo.model or boardinfo.system or "?")%></td></tr>
<div class="tr"><div class="td left" width="33%"><%:CPU Temperature%></div><div class="td left"><%=luci.sys.exec("sensors | grep 'Core 0' | cut -c10-24")%> @ <%=luci.sys.exec("grep 'MHz' /proc/cpuinfo | cut -c11- |sed -n '1p'")%> MHz</div></div> <tr><td width="33%"><%:CPU Temperature%></td><td><%=luci.sys.exec("sensors | grep 'Core 0' | cut -c10-24")%> @ <%=luci.sys.exec("grep 'MHz' /proc/cpuinfo | cut -c11- |sed -n '1p'")%> MHz</td></tr>
<div class="tr"><div class="td left" width="33%"><%:Firmware Version%></div><div class="td left"> <tr><td width="33%"><%:Firmware Version%></td><td>
<%=pcdata(ver.distname)%> <%=pcdata(ver.distversion)%> / <%=pcdata(ver.distname)%> <%=pcdata(ver.distversion)%> /
<%=pcdata(ver.luciname)%> (<%=pcdata(ver.luciversion)%>) <%=pcdata(ver.luciname)%> (<%=pcdata(ver.luciversion)%>)
</div></div> </td></tr>
<div class="tr"><div class="td left" width="33%"><%:Kernel Version%></div><div class="td left"><%=unameinfo.release or "?"%></div></div> <tr><td width="33%"><%:Kernel Version%></td><td><%=unameinfo.release or "?"%></td></tr>
<div class="tr"><div class="td left" width="33%"><%:Local Time%></div><div class="td left" id="localtime">-</div></div> <tr><td width="33%"><%:Local Time%></td><td id="localtime">-</td></tr>
<div class="tr"><div class="td left" width="33%"><%:Uptime%></div><div class="td left" id="uptime">-</div></div> <tr><td width="33%"><%:Uptime%></td><td id="uptime">-</td></tr>
<div class="tr"><div class="td left" width="33%"><%:Load Average%></div><div class="td left" id="loadavg">-</div></div> <tr><td width="33%"><%:Load Average%></td><td id="loadavg">-</td></tr>
</div> </table>
</fieldset> </fieldset>
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend><%:Memory%></legend> <legend><%:Memory%></legend>
<div class="table" width="100%"> <table width="100%" cellspacing="10">
<div class="tr"><div class="td left" width="33%"><%:Total Available%></div><div class="td left" id="memtotal">-</div></div> <tr><td width="33%"><%:Total Available%></td><td id="memtotal">-</td></tr>
<div class="tr"><div class="td left" width="33%"><%:Free%></div><div class="td left" id="memfree">-</div></div> <tr><td width="33%"><%:Free%></td><td id="memfree">-</td></tr>
<div class="tr"><div class="td left" width="33%"><%:Buffered%></div><div class="td left" id="membuff">-</div></div> <tr><td width="33%"><%:Buffered%></td><td id="membuff">-</td></tr>
</div> </table>
</fieldset> </fieldset>
<% if swapinfo.total > 0 then %> <% if swapinfo.total > 0 then %>
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend><%:Swap%></legend> <legend><%:Swap%></legend>
<div class="table" width="100%"> <table width="100%" cellspacing="10">
<div class="tr"><div class="td left" width="33%"><%:Total Available%></div><div class="td left" id="swaptotal">-</div></div> <tr><td width="33%"><%:Total Available%></td><td id="swaptotal">-</td></tr>
<div class="tr"><div class="td left" width="33%"><%:Free%></div><div class="td left" id="swapfree">-</div></div> <tr><td width="33%"><%:Free%></td><td id="swapfree">-</td></tr>
</div> </table>
</fieldset> </fieldset>
<% end %> <% end %>
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend><%:Network%></legend> <legend><%:Network%></legend>
<div id="upstream_status_table" class="network-status-table"> <table width="100%" cellspacing="10">
<em><%:Collecting data...%></em> <tr><td width="33%" style="vertical-align:top"><%:IPv4 WAN Status%></td><td>
</div> <table><tr>
<td id="wan4_i" style="width:16px; text-align:center; padding:3px"><img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small></td>
<div class="table" width="100%"> <td id="wan4_s" style="vertical-align:middle; padding: 3px"><em><%:Collecting data...%></em></td>
<div class="tr"><div class="td left" width="33%"><%:Active Connections%></div><div class="td left" id="conns">-</div></div> </tr></table>
</div> </td></tr>
<% if has_ipv6 then %>
<tr><td width="33%" style="vertical-align:top"><%:IPv6 WAN Status%></td><td>
<table><tr>
<td id="wan6_i" style="width:16px; text-align:center; padding:3px"><img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small></td>
<td id="wan6_s" style="vertical-align:middle; padding: 3px"><em><%:Collecting data...%></em></td>
</tr></table>
</td></tr>
<% end %>
<tr><td width="33%"><%:Active Connections%></td><td id="conns">-</td></tr>
</table>
</fieldset> </fieldset>
<% if has_dhcp then %> <% if has_dhcp then %>
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend><%:DHCP Leases%></legend> <legend><%:DHCP Leases%></legend>
<div class="table cbi-section-table" id="lease_status_table"> <table class="cbi-section-table" id="lease_status_table">
<div class="tr cbi-section-table-titles"> <tr class="cbi-section-table-titles">
<div class="th"><%:Hostname%></div> <th class="cbi-section-table-cell"><%:Hostname%></th>
<div class="th"><%:IPv4-Address%></div> <th class="cbi-section-table-cell"><%:IPv4-Address%></th>
<div class="th"><%:MAC-Address%></div> <th class="cbi-section-table-cell"><%:MAC-Address%></th>
<div class="th"><%:Leasetime remaining%></div> <th class="cbi-section-table-cell"><%:Leasetime remaining%></th>
</div> </tr>
<div class="tr cbi-section-table-row"> <tr class="cbi-section-table-row">
<div class="td" colspan="4"><em><br /><%:Collecting data...%></em></div> <td colspan="4"><em><br /><%:Collecting data...%></em></td>
</div> </tr>
</div> </table>
</fieldset> </fieldset>
<fieldset class="cbi-section" style="display:none"> <fieldset class="cbi-section" style="display:none">
<legend><%:DHCPv6 Leases%></legend> <legend><%:DHCPv6 Leases%></legend>
<div class="table cbi-section-table" id="lease6_status_table"> <table class="cbi-section-table" id="lease6_status_table">
<div class="tr cbi-section-table-titles"> <tr class="cbi-section-table-titles">
<div class="th"><%:Host%></div> <th class="cbi-section-table-cell"><%:Host%></th>
<div class="th"><%:IPv6-Address%></div> <th class="cbi-section-table-cell"><%:IPv6-Address%></th>
<div class="th"><%:DUID%></div> <th class="cbi-section-table-cell"><%:DUID%></th>
<div class="th"><%:Leasetime remaining%></div> <th class="cbi-section-table-cell"><%:Leasetime remaining%></th>
</div> </tr>
<div class="tr cbi-section-table-row"> <tr class="cbi-section-table-row">
<div class="td" colspan="4"><em><br /><%:Collecting data...%></em></div> <td colspan="4"><em><br /><%:Collecting data...%></em></td>
</div> </tr>
</div> </table>
</fieldset> </fieldset>
<% end %> <% end %>
<% if has_dsl then %> <% if has_dsl then %>
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend><%:DSL%></legend> <legend><%:DSL%></legend>
<div class="table" width="100%"> <table width="100%" cellspacing="10">
<div class="tr"> <tr><td width="33%" style="vertical-align:top"><%:DSL Status%></td><td>
<div class="td left" width="33%" style="vertical-align:top"><%:DSL Status%></div> <table><tr>
<div class="td"> <td id="dsl_i" style="width:16px; text-align:center; padding:3px"><img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small></td>
<div class="table"> <td id="dsl_s" style="vertical-align:middle; padding: 3px"><em><%:Collecting data...%></em></td>
<div class="tr"> </tr></table>
<div class="td" id="dsl_i" style="width:16px; text-align:center; padding:3px"><img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small></div> </td></tr>
<div class="td left" id="dsl_s" style="vertical-align:middle; padding: 3px"><em><%:Collecting data...%></em></div> </table>
</div>
</div>
</div>
</div>
</div>
</fieldset> </fieldset>
<% end %> <% end %>
@ -699,27 +789,27 @@
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend><%:Wireless%></legend> <legend><%:Wireless%></legend>
<div id="wifi_status_table" class="network-status-table"> <table id="wifi_status_table" width="100%" cellspacing="10">
<em><%:Collecting data...%></em> <tr><td><em><%:Collecting data...%></em></td></tr>
</div> </table>
</fieldset> </fieldset>
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend><%:Associated Stations%></legend> <legend><%:Associated Stations%></legend>
<div class="table cbi-section-table valign-middle" id="wifi_assoc_table"> <table class="cbi-section-table valign-middle" id="wifi_assoc_table">
<div class="tr cbi-section-table-titles"> <tr class="cbi-section-table-titles">
<div class="th">&#160;</div> <th class="cbi-section-table-cell">&#160;</th>
<div class="th"><%:Network%></div> <th class="cbi-section-table-cell"><%:Network%></th>
<div class="th"><%:MAC-Address%></div> <th class="cbi-section-table-cell"><%:MAC-Address%></th>
<div class="th"><%:Host%></div> <th class="cbi-section-table-cell"><%:Host%></th>
<div class="th"><%:Signal%> / <%:Noise%></div> <th class="cbi-section-table-cell"><%:Signal%> / <%:Noise%></th>
<div class="th"><%:RX Rate%> / <%:TX Rate%></div> <th class="cbi-section-table-cell"><%:RX Rate%> / <%:TX Rate%></th>
</div> </tr>
<div class="tr cbi-section-table-row"> <tr class="cbi-section-table-row">
<div class="td" colspan="6"><em><br /><%:Collecting data...%></em></div> <td colspan="6"><em><br /><%:Collecting data...%></em></td>
</div> </tr>
</div> </table>
</fieldset> </fieldset>
<% end %> <% end %>

2
package/lean/default-settings/Makefile
View File

@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=default-settings PKG_NAME:=default-settings
PKG_VERSION:=1.0 PKG_VERSION:=1.0
PKG_RELEASE:=50 PKG_RELEASE:=52
PKG_LICENSE:=GPLv3 PKG_LICENSE:=GPLv3
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE

2
package/lean/default-settings/files/zzz-default-settings
View File

@ -57,7 +57,7 @@ sed -i '/set wireless.radio${devidx}.disabled/d' /lib/wifi/mac80211.sh
wifi up wifi up
sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release
echo "DISTRIB_REVISION='R8.1.1 By Lean'" >> /etc/openwrt_release echo "DISTRIB_REVISION='R8.1.2 By Lean'" >> /etc/openwrt_release
sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release
echo "DISTRIB_DESCRIPTION='OpenWrt '" >> /etc/openwrt_release echo "DISTRIB_DESCRIPTION='OpenWrt '" >> /etc/openwrt_release

2
package/lean/luci-app-xlnetacc/Makefile
View File

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-xlnetacc PKG_NAME:=luci-app-xlnetacc
PKG_VERSION:=1.0.3 PKG_VERSION:=1.0.3
PKG_RELEASE:=9 PKG_RELEASE:=8
PKG_LICENSE:=GPLv2 PKG_LICENSE:=GPLv2
PKG_MAINTAINER:=Sense <sensec@gmail.com> PKG_MAINTAINER:=Sense <sensec@gmail.com>

10
package/lean/luci-app-xlnetacc/files/luci/view/xlnetacc/status.htm
View File

@ -1,10 +1,10 @@
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend><%:Running Status%></legend> <legend><%:Running Status%></legend>
<div class="table" width="100%" id="_xlnetacc_status_table"> <table width="100%" cellspacing="10" id="_xlnetacc_status_table">
<div class="tr"><div class="td left" width="33%"><%:XLNetAcc Running Status%></div><div class="td left" id="_run_state"><em><%:Collecting data...%></em></div></div> <tr><td width="33%"><%:XLNetAcc Running Status%></td><td id="_run_state"><em><%:Collecting data...%></em></td></tr>
<div class="tr"><div class="td left" width="33%"><%:DownLink Upgrade Status%></div><div class="td left" id="_down_state"><em><%:Collecting data...%></em></div></div> <tr><td width="33%"><%:DownLink Upgrade Status%></td><td id="_down_state"><em><%:Collecting data...%></em></td></tr>
<div class="tr"><div class="td left" width="33%"><%:UpLink Upgrade Status%></div><div class="td left" id="_up_state"><em><%:Collecting data...%></em></div></div> <tr><td width="33%"><%:UpLink Upgrade Status%></td><td id="_up_state"><em><%:Collecting data...%></em></td></tr>
</div> </table>
</fieldset> </fieldset>
<script type="text/javascript">//<![CDATA[ <script type="text/javascript">//<![CDATA[