mirror of
https://github.com/Ysurac/openmptcprouter-feeds.git
synced 2025-03-09 15:40:03 +00:00
Update luci-base and luci-mod-admin-full to latest upstream version
This commit is contained in:
Ycarus
parent
e00cf0f4f0
commit
6b6c7e6d7a
75 changed files with 3309 additions and 2564 deletions
|
|
@ -113,32 +113,10 @@
|
|||
|
||||
var is_reconnecting = false;
|
||||
|
||||
function nowrap(s) {
|
||||
return s.replace(/ /g, ' ');
|
||||
}
|
||||
|
||||
function wifirate(bss, rx) {
|
||||
var p = rx ? 'rx_' : 'tx_',
|
||||
s = '%.1f <%:Mbit/s%>, %d<%:MHz%>'
|
||||
.format(bss[p+'rate'] / 1000, bss[p+'mhz']),
|
||||
ht = bss[p+'ht'], vht = bss[p+'vht'],
|
||||
mhz = bss[p+'mhz'], nss = bss[p+'nss'],
|
||||
mcs = bss[p+'mcs'], sgi = bss[p+'short_gi'];
|
||||
|
||||
if (ht || vht) {
|
||||
if (vht) s += ', VHT-MCS %d'.format(mcs);
|
||||
if (nss) s += ', VHT-NSS %d'.format(nss);
|
||||
if (ht) s += ', MCS %s'.format(mcs);
|
||||
if (sgi) s += ', <%:Short GI%>';
|
||||
}
|
||||
|
||||
return s;
|
||||
}
|
||||
|
||||
function wifi_shutdown(id, toggle) {
|
||||
var reconnect = (toggle.getAttribute('active') == 'false');
|
||||
|
||||
if (!reconnect && !confirm(String.format('<%:Really shut down network?\nYou might lose access to this device if you are connected via this interface.%>')))
|
||||
if (!reconnect && !confirm(<%=luci.http.write_json(translate('Really shut down network? You might lose access to this device if you are connected via this interface'))%>))
|
||||
return;
|
||||
|
||||
is_reconnecting = true;
|
||||
|
|
@ -176,7 +154,7 @@
|
|||
}
|
||||
|
||||
function wifi_delete(id) {
|
||||
if (!confirm('<%:Really delete this wireless network? The deletion cannot be undone!\nYou might lose access to this device if you are connected via this network.%>'))
|
||||
if (!confirm(<%=luci.http.write_json(translate('Really delete this wireless network? The deletion cannot be undone! You might lose access to this device if you are connected via this network.'))%>))
|
||||
return;
|
||||
|
||||
(new XHR()).post('<%=url('admin/network/wireless_delete')%>/' + id, { token: '<%=token%>' },
|
||||
|
|
@ -193,20 +171,25 @@
|
|||
{
|
||||
if (st)
|
||||
{
|
||||
var assoctable = document.getElementById('iw-assoclist');
|
||||
if (assoctable)
|
||||
while (assoctable.firstElementChild !== assoctable.lastElementChild)
|
||||
assoctable.removeChild(assoctable.lastElementChild);
|
||||
|
||||
var devup = { };
|
||||
var rowstyle = 1;
|
||||
var radiostate = { };
|
||||
|
||||
st.forEach(function(s) {
|
||||
var r = radiostate[wifidevs[s.id]] || (radiostate[wifidevs[s.id]] = {});
|
||||
|
||||
s.is_assoc = (s.bssid && s.bssid != '00:00:00:00:00:00' && s.channel && s.mode != 'Unknown' && !s.disabled);
|
||||
|
||||
r.up = r.up || s.is_assoc;
|
||||
r.channel = r.channel || s.channel;
|
||||
r.bitrate = r.bitrate || s.bitrate;
|
||||
r.frequency = r.frequency || s.frequency;
|
||||
});
|
||||
|
||||
for( var i = 0; i < st.length; i++ )
|
||||
{
|
||||
var iw = st[i];
|
||||
var is_assoc = (iw.bssid && iw.bssid != '00:00:00:00:00:00' && iw.channel && iw.mode != 'Unknown' && !iw.disabled);
|
||||
var p = iw.quality;
|
||||
var q = is_assoc ? p : -1;
|
||||
var q = iw.is_assoc ? p : -1;
|
||||
|
||||
var icon;
|
||||
if (q < 0)
|
||||
|
|
@ -222,9 +205,6 @@
|
|||
else
|
||||
icon = "<%=resource%>/icons/signal-75-100.png";
|
||||
|
||||
if (!devup[wifidevs[iw.id]])
|
||||
devup[wifidevs[iw.id]] = is_assoc;
|
||||
|
||||
var sig = document.getElementById(iw.id + '-iw-signal');
|
||||
if (sig)
|
||||
sig.innerHTML = String.format(
|
||||
|
|
@ -237,13 +217,13 @@
|
|||
{
|
||||
if (!iw.disabled)
|
||||
{
|
||||
toggle.className = 'cbi-button cbi-button-reset';
|
||||
toggle.className = 'cbi-button cbi-button-neutral';
|
||||
toggle.value = '<%:Disable%>';
|
||||
toggle.title = '<%:Shutdown this network%>';
|
||||
}
|
||||
else
|
||||
{
|
||||
toggle.className = 'cbi-button cbi-button-reload';
|
||||
toggle.className = 'cbi-button cbi-button-neutral';
|
||||
toggle.value = '<%:Enable%>';
|
||||
toggle.title = '<%:Activate this network%>';
|
||||
}
|
||||
|
|
@ -254,7 +234,7 @@
|
|||
var info = document.getElementById(iw.id + '-iw-status');
|
||||
if (info)
|
||||
{
|
||||
if (is_assoc)
|
||||
if (iw.is_assoc)
|
||||
info.innerHTML = String.format(
|
||||
'<strong><%:SSID%>:</strong> %h | ' +
|
||||
'<strong><%:Mode%>:</strong> %s<br />' +
|
||||
|
|
@ -274,83 +254,23 @@
|
|||
: '<em><%:Wireless is disabled or not associated%></em>'
|
||||
);
|
||||
}
|
||||
|
||||
var dev = document.getElementById(wifidevs[iw.id] + '-iw-devinfo');
|
||||
if (dev)
|
||||
{
|
||||
if (is_assoc)
|
||||
dev.innerHTML = String.format(
|
||||
'<strong><%:Channel%>:</strong> %s (%s <%:GHz%>) | ' +
|
||||
'<strong><%:Bitrate%>:</strong> %s <%:Mbit/s%>',
|
||||
iw.channel ? iw.channel : '?',
|
||||
iw.frequency ? iw.frequency : '?',
|
||||
iw.bitrate ? iw.bitrate : '?'
|
||||
);
|
||||
else
|
||||
dev.innerHTML = '';
|
||||
}
|
||||
|
||||
if (assoctable)
|
||||
{
|
||||
var assoclist = [ ];
|
||||
for (var bssid in iw.assoclist)
|
||||
{
|
||||
assoclist.push(iw.assoclist[bssid]);
|
||||
assoclist[assoclist.length-1].bssid = bssid;
|
||||
}
|
||||
|
||||
assoclist.sort(function(a, b) { a.bssid < b.bssid });
|
||||
|
||||
for (var j = 0; j < assoclist.length; j++)
|
||||
{
|
||||
var icon;
|
||||
var q = (-1 * (assoclist[j].noise - assoclist[j].signal)) / 5;
|
||||
if (q < 1)
|
||||
icon = "<%=resource%>/icons/signal-0.png";
|
||||
else if (q < 2)
|
||||
icon = "<%=resource%>/icons/signal-0-25.png";
|
||||
else if (q < 3)
|
||||
icon = "<%=resource%>/icons/signal-25-50.png";
|
||||
else if (q < 4)
|
||||
icon = "<%=resource%>/icons/signal-50-75.png";
|
||||
else
|
||||
icon = "<%=resource%>/icons/signal-75-100.png";
|
||||
|
||||
var host = hosts[assoclist[j].bssid],
|
||||
name = host ? (host.name || host.ipv4 || host.ipv6) : null,
|
||||
hint = (host && host.name && (host.ipv4 || host.ipv6)) ? (host.ipv4 || host.ipv6) : null;
|
||||
|
||||
assoctable.appendChild(E('<div class="tr cbi-section-table-row cbi-rowstyle-%d">'.format(rowstyle), [
|
||||
E('<div class="td"><span class="ifacebadge" title="%q"><img src="<%=resource%>/icons/wifi.png" /> %h</span></div>'
|
||||
.format(iw.device.name, iw.ifname)),
|
||||
E('<div class="td" style="white-space:nowrap">%h</div>'
|
||||
.format(iw.ssid || '?')),
|
||||
E('<div class="td">%h</div>'
|
||||
.format(assoclist[j].bssid)),
|
||||
E('<div class="td">', hint ? '<div style="max-width:200px;overflow:hidden;text-overflow:ellipsis">%h (%h)</div>'
|
||||
.format(name || '?', hint) : (name || '?')),
|
||||
E('<div class="td"><span class="ifacebadge" title="<%:Signal%>: %d <%:dBm%> / <%:Noise%>: %d <%:dBm%> / <%:SNR%>: %d"><img src="%s" /> %d / %d <%:dBm%></span></div>'
|
||||
.format(assoclist[j].signal, assoclist[j].noise, assoclist[j].signal - assoclist[j].noise, icon, assoclist[j].signal, assoclist[j].noise)),
|
||||
E('<div class="td">', [
|
||||
E('<span style="white-space:nowrap">', wifirate(assoclist[j], true)),
|
||||
E('<br />'),
|
||||
E('<span style="white-space:nowrap">', wifirate(assoclist[j], false))
|
||||
])
|
||||
]));
|
||||
|
||||
rowstyle = (rowstyle == 1) ? 2 : 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (assoctable && assoctable.firstElementChild === assoctable.lastElementChild)
|
||||
assoctable.appendChild(E('<div class="tr cbi-section-table-row"><div class="td"><em><br /><%:No information available%></em></div></div>'));
|
||||
|
||||
for (var dev in devup)
|
||||
for (var dev in radiostate)
|
||||
{
|
||||
var img = document.getElementById(dev + '-iw-upstate');
|
||||
if (img)
|
||||
img.src = '<%=resource%>/icons/wifi_big' + (devup[dev] ? '' : '_disabled') + '.png';
|
||||
img.src = '<%=resource%>/icons/wifi' + (radiostate[dev].up ? '' : '_disabled') + '.png';
|
||||
|
||||
var stat = document.getElementById(dev + '-iw-devinfo');
|
||||
if (stat)
|
||||
stat.innerHTML = String.format(
|
||||
'<strong><%:Channel%>:</strong> %s (%s <%:GHz%>) | ' +
|
||||
'<strong><%:Bitrate%>:</strong> %s <%:Mbit/s%>',
|
||||
radiostate[dev].channel ? radiostate[dev].channel : '?',
|
||||
radiostate[dev].frequency ? radiostate[dev].frequency : '?',
|
||||
radiostate[dev].bitrate ? radiostate[dev].bitrate : '?'
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -359,37 +279,37 @@
|
|||
|
||||
<h2 name="content"><%:Wireless Overview%></h2>
|
||||
|
||||
<fieldset class="cbi-section" style="display:none">
|
||||
<div class="cbi-section" style="display:none">
|
||||
<legend><%:Reconnecting interface%></legend>
|
||||
<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" />
|
||||
<span id="iw-rc-status"><%:Waiting for changes to be applied...%></span>
|
||||
</fieldset>
|
||||
</div>
|
||||
|
||||
<div class="cbi-map">
|
||||
<div id="cbi-wireless-overview" class="cbi-map">
|
||||
|
||||
<% for _, dev in ipairs(devices) do local nets = dev:get_wifinets() %>
|
||||
<!-- device <%=dev:name()%> -->
|
||||
<fieldset class="cbi-section">
|
||||
<div class="table cbi-section-table" style="margin:10px; empty-cells:hide">
|
||||
<div class="cbi-section-node">
|
||||
<div class="table">
|
||||
<!-- physical device -->
|
||||
<div class="tr">
|
||||
<div class="td">
|
||||
<img src="<%=resource%>/icons/wifi_big_disabled.png" id="<%=dev:name()%>-iw-upstate" />
|
||||
<div class="td col-2 center">
|
||||
<span class="ifacebadge"><img src="<%=resource%>/icons/wifi_disabled.png" id="<%=dev:name()%>-iw-upstate" /> <%=dev:name()%></span>
|
||||
</div>
|
||||
<div class="td left">
|
||||
<big><strong><%=guess_wifi_hw(dev)%> (<%=dev:name()%>)</strong></big><br />
|
||||
<div class="td col-7 left">
|
||||
<big><strong><%=guess_wifi_hw(dev)%></strong></big><br />
|
||||
<span id="<%=dev:name()%>-iw-devinfo"></span>
|
||||
</div>
|
||||
<div class="td right">
|
||||
<div class="td cbi-section-actions">
|
||||
<form action="<%=url('admin/network/wireless_join')%>" method="post" class="inline">
|
||||
<input type="hidden" name="device" value="<%=dev:name()%>" />
|
||||
<input type="hidden" name="token" value="<%=token%>" />
|
||||
<input type="submit" class="cbi-button cbi-button-find" style="width:100px" title="<%:Find and join network%>" value="<%:Scan%>" />
|
||||
<input type="submit" class="cbi-button cbi-button-action" title="<%:Find and join network%>" value="<%:Scan%>" />
|
||||
</form>
|
||||
<form action="<%=url('admin/network/wireless_add')%>" method="post" class="inline">
|
||||
<input type="hidden" name="device" value="<%=dev:name()%>" />
|
||||
<input type="hidden" name="token" value="<%=token%>" />
|
||||
<input type="submit" class="cbi-button cbi-button-add" style="width:100px" title="<%:Provide new network%>" value="<%:Add%>" />
|
||||
<input type="submit" class="cbi-button cbi-button-add" title="<%:Provide new network%>" value="<%:Add%>" />
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -398,22 +318,22 @@
|
|||
<!-- network list -->
|
||||
<% if #nets > 0 then %>
|
||||
<% for i, net in ipairs(nets) do %>
|
||||
<div class="tr cbi-section-table-row cbi-rowstyle-<%=1 + ((i-1) % 2)%>">
|
||||
<div class="td" id="<%=net:id()%>-iw-signal">
|
||||
<div class="tr cbi-rowstyle-<%=1 + ((i-1) % 2)%>">
|
||||
<div class="td col-2 center" id="<%=net:id()%>-iw-signal">
|
||||
<span class="ifacebadge" title="<%:Not associated%>"><img src="<%=resource%>/icons/signal-none.png" /> 0%</span>
|
||||
</div>
|
||||
<div class="td left" id="<%=net:id()%>-iw-status">
|
||||
<div class="td col-7 left" id="<%=net:id()%>-iw-status">
|
||||
<em><%:Collecting data...%></em>
|
||||
</div>
|
||||
<div class="td right">
|
||||
<input id="<%=net:id()%>-iw-toggle" type="button" class="cbi-button cbi-button-reload" style="width:100px" onclick="wifi_shutdown('<%=net:id()%>', this)" title="<%:Delete this network%>" value="<%:Enable%>" />
|
||||
<input type="button" class="cbi-button cbi-button-edit" style="width:100px" onclick="location.href='<%=net:adminlink()%>'" title="<%:Edit this network%>" value="<%:Edit%>" />
|
||||
<input type="button" class="cbi-button cbi-button-remove" style="width:100px" onclick="wifi_delete('<%=net:id()%>')" title="<%:Delete this network%>" value="<%:Remove%>" />
|
||||
<div class="td cbi-section-actions">
|
||||
<input id="<%=net:id()%>-iw-toggle" type="button" class="cbi-button cbi-button-neutral" onclick="wifi_shutdown('<%=net:id()%>', this)" title="<%:Enable this network%>" value="<%:Enable%>" />
|
||||
<input type="button" class="cbi-button cbi-button-action important" onclick="location.href='<%=net:adminlink()%>'" title="<%:Edit this network%>" value="<%:Edit%>" />
|
||||
<input type="button" class="cbi-button cbi-button-negative" onclick="wifi_delete('<%=net:id()%>')" title="<%:Delete this network%>" value="<%:Remove%>" />
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
<% else %>
|
||||
<div class="tr cbi-section-table-row cbi-rowstyle-2">
|
||||
<div class="tr cbi-rowstyle-2">
|
||||
<div class="td left">
|
||||
<em><%:No network configured on this device%></em>
|
||||
</div>
|
||||
|
|
@ -421,30 +341,14 @@
|
|||
<% end %>
|
||||
<!-- /network list -->
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
<!-- /device <%=dev:name()%> -->
|
||||
<% end %>
|
||||
|
||||
|
||||
<h2><%:Associated Stations%></h2>
|
||||
|
||||
<fieldset class="cbi-section">
|
||||
<div class="table cbi-section-table valign-middle" style="margin:10px" id="iw-assoclist">
|
||||
<div class="tr cbi-section-table-titles">
|
||||
<div class="th cbi-section-table-cell"></div>
|
||||
<div class="th cbi-section-table-cell"><%:SSID%></div>
|
||||
<div class="th cbi-section-table-cell"><%:MAC-Address%></div>
|
||||
<div class="th cbi-section-table-cell"><%:Host%></div>
|
||||
<div class="th cbi-section-table-cell"><%:Signal%> / <%:Noise%></div>
|
||||
<div class="th cbi-section-table-cell"><%:RX Rate%> / <%:TX Rate%></div>
|
||||
</div>
|
||||
<div class="tr cbi-section-table-row cbi-rowstyle-2">
|
||||
<div class="td">
|
||||
<em><%:Collecting data...%></em>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
<%+admin_network/wifi_assoclist%>
|
||||
</div>
|
||||
|
||||
<%+footer%>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue