summaryrefslogtreecommitdiffhomepage
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/luci-mod-admin-full/luasrc/controller/admin/network.lua63
-rw-r--r--modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua228
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm353
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview_status.htm127
4 files changed, 364 insertions, 407 deletions
diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua
index e04a964dd..8c14de924 100644
--- a/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua
+++ b/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua
@@ -45,26 +45,20 @@ function index()
if has_wifi then
page = entry({"admin", "network", "wireless_assoclist"}, call("wifi_assoclist"), nil)
page.leaf = true
-
+
page = entry({"admin", "network", "wireless_join"}, post("wifi_join"), nil)
page.leaf = true
page = entry({"admin", "network", "wireless_add"}, post("wifi_add"), nil)
page.leaf = true
- page = entry({"admin", "network", "wireless_delete"}, post("wifi_delete"), nil)
- page.leaf = true
-
page = entry({"admin", "network", "wireless_status"}, call("wifi_status"), nil)
page.leaf = true
page = entry({"admin", "network", "wireless_reconnect"}, post("wifi_reconnect"), nil)
page.leaf = true
- page = entry({"admin", "network", "wireless_shutdown"}, post("wifi_shutdown"), nil)
- page.leaf = true
-
- page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), _("Wireless"), 15)
+ page = entry({"admin", "network", "wireless"}, arcombine(cbi("admin_network/wifi_overview"), cbi("admin_network/wifi")), _("Wireless"), 15)
page.leaf = true
page.subindex = true
@@ -201,29 +195,6 @@ function wifi_add()
end
end
-function wifi_delete(network)
- local ntm = require "luci.model.network".init()
- local wnet = ntm:get_wifinet(network)
- if wnet then
- local dev = wnet:get_device()
- local nets = wnet:get_networks()
- if dev then
- ntm:del_wifinet(network)
- ntm:commit("wireless")
- local _, net
- for _, net in ipairs(nets) do
- if net:is_empty() then
- ntm:del_network(net:name())
- ntm:commit("network")
- end
- end
- luci.sys.call("env -i /bin/ubus call network reload >/dev/null 2>/dev/null")
- end
- end
-
- luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
-end
-
function iface_status(ifaces)
local netm = require "luci.model.network".init()
local rv = { }
@@ -349,35 +320,19 @@ function wifi_status(devs)
luci.http.status(404, "No such device")
end
-local function wifi_reconnect_shutdown(shutdown, wnet)
- local netmd = require "luci.model.network".init()
- local net = netmd:get_wifinet(wnet)
- local dev = net:get_device()
- if dev and net then
- dev:set("disabled", nil)
- net:set("disabled", shutdown and 1 or nil)
- netmd:commit("wireless")
-
- luci.sys.call("env -i /bin/ubus call network reload >/dev/null 2>/dev/null")
- luci.http.status(200, shutdown and "Shutdown" or "Reconnected")
+function wifi_reconnect(radio)
+ local rc = luci.sys.call("env -i /sbin/wifi up %s" % luci.util.shellquote(radio))
- return
+ if rc == 0 then
+ luci.http.status(200, "Reconnected")
+ else
+ luci.http.status(500, "Error")
end
-
- luci.http.status(404, "No such radio")
-end
-
-function wifi_reconnect(wnet)
- wifi_reconnect_shutdown(false, wnet)
-end
-
-function wifi_shutdown(wnet)
- wifi_reconnect_shutdown(true, wnet)
end
function wifi_assoclist()
local s = require "luci.tools.status"
-
+
luci.http.prepare_content("application/json")
luci.http.write_json(s.wifi_assoclist())
end
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua
new file mode 100644
index 000000000..208a191cb
--- /dev/null
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua
@@ -0,0 +1,228 @@
+-- Copyright 2018 Jo-Philipp Wich <jo@mein.io>
+-- Licensed to the public under the Apache License 2.0.
+
+local fs = require "nixio.fs"
+local utl = require "luci.util"
+local tpl = require "luci.template"
+local ntm = require "luci.model.network"
+
+local has_iwinfo = pcall(require, "iwinfo")
+
+function guess_wifi_hw(dev)
+ local bands = ""
+ local ifname = dev:name()
+ local name, idx = ifname:match("^([a-z]+)(%d+)")
+ idx = tonumber(idx)
+
+ if has_iwinfo then
+ local bl = dev.iwinfo.hwmodelist
+ if bl and next(bl) then
+ if bl.a then bands = bands .. "a" end
+ if bl.b then bands = bands .. "b" end
+ if bl.g then bands = bands .. "g" end
+ if bl.n then bands = bands .. "n" end
+ if bl.ac then bands = bands .. "ac" end
+ end
+
+ local hw = dev.iwinfo.hardware_name
+ if hw then
+ return "%s 802.11%s" %{ hw, bands }
+ end
+ end
+
+ -- wl.o
+ if name == "wl" then
+ local name = translatef("Broadcom 802.11%s Wireless Controller", bands)
+ local nm = 0
+
+ local fd = nixio.open("/proc/bus/pci/devices", "r")
+ if fd then
+ local ln
+ for ln in fd:linesource() do
+ if ln:match("wl$") then
+ if nm == idx then
+ local version = ln:match("^%S+%s+%S%S%S%S([0-9a-f]+)")
+ name = translatef(
+ "Broadcom BCM%04x 802.11 Wireless Controller",
+ tonumber(version, 16)
+ )
+
+ break
+ else
+ nm = nm + 1
+ end
+ end
+ end
+ fd:close()
+ end
+
+ return name
+
+ -- dunno yet
+ else
+ return translatef("Generic 802.11%s Wireless Controller", bands)
+ end
+end
+
+local tpl_radio = tpl.Template(nil, [[
+ <div class="cbi-section-node">
+ <div class="table">
+ <!-- physical device -->
+ <div class="tr">
+ <div class="td col-2 center">
+ <span class="ifacebadge"><img src="<%=resource%>/icons/wifi_toggled.png" id="<%=dev:name()%>-iw-upstate" /> <%=dev:name()%></span>
+ </div>
+ <div class="td col-7 left">
+ <big><strong><%=hw%></strong></big><br />
+ <span id="<%=dev:name()%>-iw-devinfo"></span>
+ </div>
+ <div class="td cbi-section-actions">
+ <input type="button" class="cbi-button cbi-button-neutral" title="<%:Restart radio interface%>" value="<%:Restart%>" onclick="wifi_restart(event)" data-radio="<%=dev:name()%>" />
+
+ <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-action important" 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" title="<%:Provide new network%>" value="<%:Add%>" />
+ </form>
+ </div>
+ </div>
+ <!-- /physical device -->
+
+ <!-- network list -->
+ <% if #wnets > 0 then %>
+ <% for i, net in ipairs(wnets) do local disabled = (dev:get("disabled") == "1" or net:get("disabled") == "1") %>
+ <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-<%= disabled and "none" or "0" %>.png" /> 0%</span>
+ </div>
+ <div class="td col-7 left" id="<%=net:id()%>-iw-status" data-network="<%=net:id()%>" data-disabled="<%= disabled and "true" or "false" %>">
+ <em><%= disabled and translate("Wireless is disabled") or translate("Collecting data...") %></em>
+ </div>
+ <div class="td cbi-section-actions">
+ <% if disabled then %>
+ <input name="cbid.wireless.<%=net:name()%>.__disable__" type="hidden" value="1" />
+ <input name="cbi.apply" type="submit" class="cbi-button cbi-button-neutral" title="<%:Enable this network%>" value="<%:Enable%>" onclick="this.previousElementSibling.value='0'" />
+ <% else %>
+ <input name="cbid.wireless.<%=net:name()%>.__disable__" type="hidden" value="0" />
+ <input name="cbi.apply" type="submit" class="cbi-button cbi-button-neutral" title="<%:Disable this network%>" value="<%:Disable%>" onclick="this.previousElementSibling.value='1'" />
+ <% end %>
+
+ <input type="button" class="cbi-button cbi-button-action important" onclick="location.href='<%=net:adminlink()%>'" title="<%:Edit this network%>" value="<%:Edit%>" />
+
+ <input name="cbid.wireless.<%=net:name()%>.__delete__" type="hidden" value="" />
+ <input name="cbi.apply" type="submit" class="cbi-button cbi-button-negative" title="<%:Delete this network%>" value="<%:Remove%>" onclick="wifi_delete(event)" />
+ </div>
+ </div>
+ <% end %>
+ <% else %>
+ <div class="tr cbi-rowstyle-2">
+ <div class="td left">
+ <em><%:No network configured on this device%></em>
+ </div>
+ </div>
+ <% end %>
+ <!-- /network list -->
+ </div>
+ </div>
+]])
+
+
+m = Map("wireless", translate("Wireless Overview"))
+m:chain("network")
+m.pageaction = false
+
+if not has_iwinfo then
+ s = m:section(NamedSection, "__warning__")
+
+ function s.render(self)
+ tpl.render_string([[
+ <div class="alert-message warning">
+ <h4><%:Package libiwinfo required!%></h4>
+ <p><%_The <em>libiwinfo-lua</em> package is not installed. You must install this component for working wireless configuration!%></p>
+ </div>
+ ]])
+ end
+end
+
+local _, dev, net
+for _, dev in ipairs(ntm:get_wifidevs()) do
+ s = m:section(TypedSection)
+ s.wnets = dev:get_wifinets()
+
+ function s.render(self, sid)
+ tpl_radio:render({
+ hw = guess_wifi_hw(dev),
+ dev = dev,
+ wnets = self.wnets
+ })
+ end
+
+ function s.cfgsections(self)
+ local _, net, sl = nil, nil, { }
+ for _, net in ipairs(self.wnets) do
+ sl[#sl+1] = net:name()
+ self.wnets[net:name()] = net
+ end
+ return sl
+ end
+
+ o = s:option(Value, "__disable__")
+
+ function o.cfgvalue(self, sid)
+ local wnet = self.section.wnets[sid]
+ local wdev = wnet:get_device()
+
+ return ((wnet and wnet:get("disabled") == "1") or
+ (wdev and wdev:get("disabled") == "1")) and "1" or "0"
+ end
+
+ function o.write(self, sid, value)
+ local wnet = self.section.wnets[sid]
+ local wdev = wnet:get_device()
+
+ if value ~= "1" then
+ wnet:set("disabled", nil)
+ wdev:set("disabled", nil)
+ else
+ wnet:set("disabled", "1")
+ end
+ end
+
+ o.remove = o.write
+
+
+ o = s:option(Value, "__delete__")
+
+ function o.write(self, sid, value)
+ local wnet = self.section.wnets[sid]
+ local nets = wnet:get_networks()
+
+ ntm:del_wifinet(wnet:id())
+
+ local _, net
+ for _, net in ipairs(nets) do
+ if net:is_empty() then
+ ntm:del_network(net:name())
+ end
+ end
+ end
+end
+
+s = m:section(NamedSection, "__script__")
+s.template = "admin_network/wifi_overview_status"
+
+s = m:section(NamedSection, "__assoclist__")
+
+function s.render(self, sid)
+ tpl.render_string([[
+ <h2><%:Associated Stations%></h2>
+ <%+admin_network/wifi_assoclist%>
+ ]])
+end
+
+return m
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm
deleted file mode 100644
index f3809ea94..000000000
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm
+++ /dev/null
@@ -1,353 +0,0 @@
-<%#
- Copyright 2008-2009 Steven Barth <steven@midlink.org>
- Copyright 2008-2015 Jo-Philipp Wich <jow@openwrt.org>
- Licensed to the public under the Apache License 2.0.
--%>
-
-<%-
-
- local ip = require "luci.ip"
- local fs = require "nixio.fs"
- local utl = require "luci.util"
- local uci = require "luci.model.uci".cursor()
- local ntm = require "luci.model.network"
-
- local has_iwinfo = pcall(require, "iwinfo")
-
- ntm.init(uci)
-
- function guess_wifi_hw(dev)
- local bands = ""
- local ifname = dev:name()
- local name, idx = ifname:match("^([a-z]+)(%d+)")
- idx = tonumber(idx)
-
- if has_iwinfo then
- local bl = dev.iwinfo.hwmodelist
- if bl and next(bl) then
- if bl.a then bands = bands .. "a" end
- if bl.b then bands = bands .. "b" end
- if bl.g then bands = bands .. "g" end
- if bl.n then bands = bands .. "n" end
- if bl.ac then bands = bands .. "ac" end
- end
-
- local hw = dev.iwinfo.hardware_name
- if hw then
- return "%s 802.11%s" %{ hw, bands }
- end
- end
-
- -- wl.o
- if name == "wl" then
- local name = translatef("Broadcom 802.11%s Wireless Controller", bands)
- local nm = 0
-
- local fd = nixio.open("/proc/bus/pci/devices", "r")
- if fd then
- local ln
- for ln in fd:linesource() do
- if ln:match("wl$") then
- if nm == idx then
- local version = ln:match("^%S+%s+%S%S%S%S([0-9a-f]+)")
- name = translatef(
- "Broadcom BCM%04x 802.11 Wireless Controller",
- tonumber(version, 16)
- )
-
- break
- else
- nm = nm + 1
- end
- end
- end
- fd:close()
- end
-
- return name
-
- -- ralink
- elseif name == "ra" then
- return translatef("RaLink 802.11%s Wireless Controller", bands)
-
- -- hermes
- elseif name == "eth" then
- return translate("Hermes 802.11b Wireless Controller")
-
- -- hostap
- elseif name == "wlan" and fs.stat("/proc/net/hostap/" .. ifname, "type") == "dir" then
- return translate("Prism2/2.5/3 802.11b Wireless Controller")
-
- -- dunno yet
- else
- return translatef("Generic 802.11%s Wireless Controller", bands)
- end
- end
-
- local devices = ntm:get_wifidevs()
- local netlist = { }
- local netdevs = { }
-
- local dev
- for _, dev in ipairs(devices) do
- local net
- for _, net in ipairs(dev:get_wifinets()) do
- netlist[#netlist+1] = net:id()
- netdevs[net:id()] = dev:name()
- end
- end
--%>
-
-<%+header%>
-
-<% if not has_iwinfo then %>
- <div class="alert-message warning">
- <h4><%:Package libiwinfo required!%></h4>
- <p><%_The <em>libiwinfo-lua</em> package is not installed. You must install this component for working wireless configuration!%></p>
- </div>
-<% end %>
-
-<script type="text/javascript">//<![CDATA[
- var wifidevs = <%=luci.http.write_json(netdevs)%>;
-
- var is_reconnecting = false;
-
- function wifi_shutdown(id, toggle) {
- var reconnect = (toggle.getAttribute('active') == 'false');
-
- 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;
-
- var s = document.getElementById('iw-rc-status');
- if (s)
- {
- s.parentNode.style.display = 'block';
- s.innerHTML = '<%:Waiting for changes to be applied...%>';
- }
-
- for (var net in wifidevs)
- {
- var st = document.getElementById(net + '-iw-status');
- if (st)
- st.innerHTML = '<em><%:Wireless is restarting...%></em>';
- }
-
- (new XHR()).post('<%=url('admin/network')%>/wireless_' + (reconnect ? 'reconnect' : 'shutdown') + '/' + id, { token: '<%=token%>' },
- function(x)
- {
- if (s)
- {
- s.innerHTML = reconnect
- ? '<%:Wireless restarted%>'
- : '<%:Wireless shut down%>';
-
- window.setTimeout(function() {
- s.parentNode.style.display = 'none';
- is_reconnecting = false;
- }, 1000);
- }
- }
- );
- }
-
- function wifi_delete(id) {
- 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%>' },
- function(x) {
- location.href = '<%=url('admin/network/wireless')%>';
- }
- );
- }
-
- var hosts = <%=luci.http.write_json(luci.sys.net.host_hints())%>;
-
- XHR.poll(5, '<%=url('admin/network/wireless_status', table.concat(netlist, ","))%>', null,
- function(x, st)
- {
- if (st)
- {
- 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 p = iw.quality;
- var q = iw.is_assoc ? p : -1;
-
- var icon;
- if (q < 0)
- icon = "<%=resource%>/icons/signal-none.png";
- else if (q == 0)
- icon = "<%=resource%>/icons/signal-0.png";
- else if (q < 25)
- icon = "<%=resource%>/icons/signal-0-25.png";
- else if (q < 50)
- icon = "<%=resource%>/icons/signal-25-50.png";
- else if (q < 75)
- icon = "<%=resource%>/icons/signal-50-75.png";
- else
- icon = "<%=resource%>/icons/signal-75-100.png";
-
- var sig = document.getElementById(iw.id + '-iw-signal');
- if (sig)
- sig.innerHTML = String.format(
- '<span class="ifacebadge" title="<%:Signal%>: %d <%:dBm%> / <%:Noise%>: %d <%:dBm%>"><img src="%s" /> %d%%</span>',
- iw.signal, iw.noise, icon, p
- );
-
- var toggle = document.getElementById(iw.id + '-iw-toggle');
- if (toggle)
- {
- if (!iw.disabled)
- {
- toggle.className = 'cbi-button cbi-button-neutral';
- toggle.value = '<%:Disable%>';
- toggle.title = '<%:Shutdown this network%>';
- }
- else
- {
- toggle.className = 'cbi-button cbi-button-neutral';
- toggle.value = '<%:Enable%>';
- toggle.title = '<%:Activate this network%>';
- }
-
- toggle.setAttribute('active', !iw.disabled);
- }
-
- var info = document.getElementById(iw.id + '-iw-status');
- if (info)
- {
- if (iw.is_assoc)
- info.innerHTML = String.format(
- '<strong><%:SSID%>:</strong> %h | ' +
- '<strong><%:Mode%>:</strong> %s<br />' +
- '<strong><%:BSSID%>:</strong> %s | ' +
- '<strong><%:Encryption%>:</strong> %s',
- iw.ssid, iw.mode, iw.bssid,
- iw.encryption ? iw.encryption : '<%:None%>'
- );
- else
- info.innerHTML = String.format(
- '<strong><%:SSID%>:</strong> %h | ' +
- '<strong><%:Mode%>:</strong> %s<br />' +
- '<em>%s</em>',
- iw.ssid || '?', iw.mode,
- is_reconnecting
- ? '<em><%:Wireless is restarting...%></em>'
- : '<em><%:Wireless is disabled or not associated%></em>'
- );
- }
- }
-
- for (var dev in radiostate)
- {
- var img = document.getElementById(dev + '-iw-upstate');
- if (img)
- 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 : '?'
- );
- }
- }
- }
- );
-//]]></script>
-
-<h2 name="content"><%:Wireless Overview%></h2>
-
-<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>
-</div>
-
-<div id="cbi-wireless-overview" class="cbi-map">
-
- <% for _, dev in ipairs(devices) do local nets = dev:get_wifinets() %>
- <!-- device <%=dev:name()%> -->
- <div class="cbi-section-node">
- <div class="table">
- <!-- physical device -->
- <div class="tr">
- <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 col-7 left">
- <big><strong><%=guess_wifi_hw(dev)%></strong></big><br />
- <span id="<%=dev:name()%>-iw-devinfo"></span>
- </div>
- <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-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" title="<%:Provide new network%>" value="<%:Add%>" />
- </form>
- </div>
- </div>
- <!-- /physical device -->
-
- <!-- network list -->
- <% if #nets > 0 then %>
- <% for i, net in ipairs(nets) do %>
- <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 col-7 left" id="<%=net:id()%>-iw-status">
- <em><%:Collecting data...%></em>
- </div>
- <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-rowstyle-2">
- <div class="td left">
- <em><%:No network configured on this device%></em>
- </div>
- </div>
- <% end %>
- <!-- /network list -->
- </div>
- </div>
- <!-- /device <%=dev:name()%> -->
- <% end %>
-
-
- <h2><%:Associated Stations%></h2>
-
- <%+admin_network/wifi_assoclist%>
-</div>
-
-<%+footer%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview_status.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview_status.htm
new file mode 100644
index 000000000..9730bc2c9
--- /dev/null
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview_status.htm
@@ -0,0 +1,127 @@
+<%#
+ Copyright 2008-2009 Steven Barth <steven@midlink.org>
+ Copyright 2008-2018 Jo-Philipp Wich <jo@mein.io>
+ Licensed to the public under the Apache License 2.0.
+-%>
+
+<script type="text/javascript">//<![CDATA[
+ function wifi_delete(ev) {
+ 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.'))%>)) {
+ ev.preventDefault();
+ return false;
+ }
+
+ ev.target.previousElementSibling.value = '1';
+ return true;
+ }
+
+ function wifi_restart(ev) {
+ XHR.halt();
+
+ findParent(ev.target, '.table').querySelectorAll('[data-disabled="false"]').forEach(function(s) {
+ s.innerHTML = '<em><%:Wireless is restarting...%></em>';
+ });
+
+ (new XHR()).post('<%=url('admin/network/wireless_reconnect')%>/' + ev.target.getAttribute('data-radio'),
+ { token: '<%=token%>' }, XHR.run);
+ }
+
+ var networks = [ ];
+
+ document.querySelectorAll('[data-network]').forEach(function(n) {
+ networks.push(n.getAttribute('data-network'));
+ });
+
+ XHR.poll(5, '<%=url('admin/network/wireless_status')%>/' + networks.join(','), null,
+ function(x, st)
+ {
+ if (st)
+ {
+ var rowstyle = 1;
+ var radiostate = { };
+
+ st.forEach(function(s) {
+ var r = radiostate[s.device.device] || (radiostate[s.device.device] = {});
+
+ 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],
+ sig = document.getElementById(iw.id + '-iw-signal'),
+ info = document.getElementById(iw.id + '-iw-status'),
+ disabled = (info && info.getAttribute('data-disabled') === 'true');
+
+ var p = iw.quality;
+ var q = disabled ? -1 : p;
+
+ var icon;
+ if (q < 0)
+ icon = "<%=resource%>/icons/signal-none.png";
+ else if (q == 0)
+ icon = "<%=resource%>/icons/signal-0.png";
+ else if (q < 25)
+ icon = "<%=resource%>/icons/signal-0-25.png";
+ else if (q < 50)
+ icon = "<%=resource%>/icons/signal-25-50.png";
+ else if (q < 75)
+ icon = "<%=resource%>/icons/signal-50-75.png";
+ else
+ icon = "<%=resource%>/icons/signal-75-100.png";
+
+
+ if (sig)
+ sig.innerHTML = String.format(
+ '<span class="ifacebadge" title="<%:Signal%>: %d <%:dBm%> / <%:Noise%>: %d <%:dBm%>"><img src="%s" /> %d%%</span>',
+ iw.signal, iw.noise, icon, p
+ );
+
+ if (info)
+ {
+ if (iw.is_assoc)
+ info.innerHTML = String.format(
+ '<strong><%:SSID%>:</strong> %h | ' +
+ '<strong><%:Mode%>:</strong> %s<br />' +
+ '<strong><%:BSSID%>:</strong> %s | ' +
+ '<strong><%:Encryption%>:</strong> %s',
+ iw.ssid, iw.mode, iw.bssid,
+ iw.encryption ? iw.encryption : '<%:None%>'
+ );
+ else
+ info.innerHTML = String.format(
+ '<strong><%:SSID%>:</strong> %h | ' +
+ '<strong><%:Mode%>:</strong> %s<br />' +
+ '<em>%s</em>',
+ iw.ssid || '?', iw.mode,
+ disabled ? '<em><%:Wireless is disabled%></em>'
+ : '<em><%:Wireless is not associated%></em>'
+ );
+ }
+ }
+
+ for (var dev in radiostate)
+ {
+ var img = document.getElementById(dev + '-iw-upstate');
+ if (img)
+ 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 : '?'
+ );
+ }
+ }
+ }
+ );
+//]]></script>