Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

modules/admin-full: convert admin templates to new network model

Browse source
This commit is contained in:
Jo-Philipp Wich 2010-10-30 00:44:34 +00:00
parent 595020f919
commit ba84656d6e
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/admin-full/luasrc/view/admin_network/iface_status.htm
View file

@ -7,7 +7,7 @@
function(x) function(x)
{ {
var ifc = x.responseText ? eval('(' + x.responseText + ')') : { }; var ifc = x.responseText ? eval('(' + x.responseText + ')') : { };
if (ifc) if (ifc && (ifc = ifc[0]))
{ {
var is_up = (ifc.flags && ifc.flags.up); var is_up = (ifc.flags && ifc.flags.up);
var rxb = ifc.stats ? (ifc.stats["rx_bytes"] / 1024) : 0; var rxb = ifc.stats ? (ifc.stats["rx_bytes"] / 1024) : 0;

16
modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
View file

@ -1,7 +1,7 @@
<%# <%#
LuCI - Lua Configuration Interface LuCI - Lua Configuration Interface
Copyright 2008-2009 Steven Barth <steven@midlink.org> Copyright 2008-2009 Steven Barth <steven@midlink.org>
Copyright 2008-2009 Jo-Philipp Wich <xm@leipzig.freifunk.net> Copyright 2008-2010 Jo-Philipp Wich <xm@subsignal.org>
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -18,9 +18,9 @@ $Id$
local sys = require "luci.sys" local sys = require "luci.sys"
local utl = require "luci.util" local utl = require "luci.util"
local uci = require "luci.model.uci".cursor() local uci = require "luci.model.uci".cursor()
local wlm = require "luci.model.wireless" local ntm = require "luci.model.network"
wlm.init(uci) ntm.init(uci)
function guess_wifi_hw(ifname) function guess_wifi_hw(ifname)
local name, idx = ifname:match("^([a-z]+)(%d+)") local name, idx = ifname:match("^([a-z]+)(%d+)")
@ -92,7 +92,7 @@ $Id$
return icon return icon
end end
local devices = wlm:get_devices() local devices = ntm:get_wifidevs()
local arpcache = { } local arpcache = { }
sys.net.arptable(function(e) arpcache[e["HW address"]] = e["IP address"] end) sys.net.arptable(function(e) arpcache[e["HW address"]] = e["IP address"] end)
-%> -%>
@ -103,7 +103,7 @@ $Id$
<div class="cbi-map"> <div class="cbi-map">
<% for _, dev in ipairs(devices) do local nets = dev:get_networks() %> <% for _, dev in ipairs(devices) do local nets = dev:get_wifinets() %>
<!-- device <%=dev:name()%> --> <!-- device <%=dev:name()%> -->
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<table class="cbi-section-table" style="margin:10px; empty-cells:hide"> <table class="cbi-section-table" style="margin:10px; empty-cells:hide">
@ -140,8 +140,8 @@ $Id$
<strong>Encryption:</strong> <%=net:active_encryption()%> <strong>Encryption:</strong> <%=net:active_encryption()%>
</td> </td>
<td class="cbi-value-field" style="width:40px"> <td class="cbi-value-field" style="width:40px">
<a href="<%=REQUEST_URI%>/<%=dev:name()%>/<%=net:name()%>"><img style="border:none" src="<%=resource%>/cbi/edit.gif" alt="Edit this network" title="Edit this network" /></a> <a href="<%=net:adminlink()%>"><img style="border:none" src="<%=resource%>/cbi/edit.gif" alt="Edit this network" title="Edit this network" /></a>
<a href="<%=luci.dispatcher.build_url("admin/network/wireless_delete", net:name())%>"><img style="border:none" src="<%=resource%>/cbi/remove.gif" alt="Delete this network" title="Delete this network" /></a> <a href="<%=luci.dispatcher.build_url("admin/network/wireless_delete", net:ifname())%>"><img style="border:none" src="<%=resource%>/cbi/remove.gif" alt="Delete this network" title="Delete this network" /></a>
</td> </td>
</tr> </tr>
<% end %> <% end %>
@ -176,7 +176,7 @@ $Id$
</tr> </tr>
<% local count = -1 %> <% local count = -1 %>
<% for _, dev in ipairs(devices) do local nets = dev:get_networks() %> <% for _, dev in ipairs(devices) do local nets = dev:get_wifinets() %>
<% for _, net in ipairs(nets) do %> <% for _, net in ipairs(nets) do %>
<% for mac, info in utl.kspairs(net:assoclist()) do count = count + 1 %> <% for mac, info in utl.kspairs(net:assoclist()) do count = count + 1 %>
<tr class="cbi-section-table-row cbi-rowstyle-<%=1 + (count % 2)%>"> <tr class="cbi-section-table-row cbi-rowstyle-<%=1 + (count % 2)%>">

12
modules/admin-full/luasrc/view/admin_network/wifi_status.htm
View file

@ -7,7 +7,7 @@
function(x) function(x)
{ {
var iw = x.responseText ? eval('(' + x.responseText + ')') : null; var iw = x.responseText ? eval('(' + x.responseText + ')') : null;
if (iw) if (iw && (iw = iw[0]))
{ {
var is_assoc = (iw.bssid && iw.channel); var is_assoc = (iw.bssid && iw.channel);
var p = (100 / iw.quality_max * iw.quality); var p = (100 / iw.quality_max * iw.quality);
@ -37,15 +37,15 @@
var d = document.getElementById('<%=self.option%>-iw-description'); var d = document.getElementById('<%=self.option%>-iw-description');
if (d && is_assoc) if (d && is_assoc)
d.innerHTML = String.format( d.innerHTML = String.format(
'<strong><%:Mode%>:</strong> %s |' + '<strong><%:Mode%>:</strong> %s | ' +
'<strong><%:SSID%>:</strong> %s<br />' + '<strong><%:SSID%>:</strong> %s<br />' +
'<strong><%:BSSID%>:</strong> %s |' + '<strong><%:BSSID%>:</strong> %s | ' +
'<strong><%:Encryption%>:</strong> %s<br />' + '<strong><%:Encryption%>:</strong> %s<br />' +
'<strong><%:Channel%>:</strong> %d (%.3f GHz) |' + '<strong><%:Channel%>:</strong> %d (%.3f GHz) | ' +
'<strong><%:Tx-Power%>:</strong> %d dBm<br />' + '<strong><%:Tx-Power%>:</strong> %d dBm<br />' +
'<strong><%:Signal%>:</strong> %d dBm |' + '<strong><%:Signal%>:</strong> %d dBm | ' +
'<strong><%:Noise%>:</strong> %d dBm<br />' + '<strong><%:Noise%>:</strong> %d dBm<br />' +
'<strong><%:Bit Rate%>:</strong> %.1f MBit/s |' + '<strong><%:Bit Rate%>:</strong> %.1f MBit/s | ' +
'<strong><%:Country%>:</strong> %s', '<strong><%:Country%>:</strong> %s',
iw.mode, iw.ssid, iw.bssid, iw.mode, iw.ssid, iw.bssid,
iw.encryption ? iw.encryption.description : '<%:None%>', iw.encryption ? iw.encryption.description : '<%:None%>',