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

libs/web: use imatch() in model related widgets, support multivalues in netlist widget

Browse source
This commit is contained in:
Jo-Philipp Wich 2010-10-30 17:57:49 +00:00
parent 95886d4585
commit fc5b9e27f0
3 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/web/luasrc/view/cbi/firewall_zonelist.htm
View file

@ -15,8 +15,8 @@ $Id$
<%-
local utl = require "luci.util"
local fwm = require "luci.model.firewall"
local nwm = require "luci.model.network"
local fwm = require "luci.model.firewall".init()
local nwm = require "luci.model.network".init()
local zone, net, iface
local zones = fwm:get_zones()
@ -33,7 +33,7 @@ $Id$
checked[value] = true
end
elseif value then
checked[value] = true
checked[value] = true
end
-%>

17
libs/web/luasrc/view/cbi/network_ifacelist.htm
View file

@ -14,16 +14,16 @@ $Id$
<%+cbi/valueheader%>
<%-
local net = require "luci.model.network"
local utl = require "luci.util"
local net = require "luci.model.network".init()
local iface
local ifaces = net:get_interfaces()
local value = (self:formvalue(section) or self.default or "")
local value = (self:formvalue(section) or self.default)
local checked = { }
if value and #value > 0 then
if type(value) == "table" then value = table.concat(value, " ") end
for value in value:gmatch("%S+") do
if value then
for value in utl.imatch(value) do
checked[value] = true
end
else
@ -42,7 +42,12 @@ $Id$
local link = iface:adminlink()
if not self.nobridges or not iface:is_bridge() then %>
<li>
<input class="cbi-input-<%=self.widget or "radio"%>" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)"<%=attr("type", self.widget or "radio") .. attr("id", cbid .. "." .. iface:name()) .. attr("name", cbid) .. attr("value", iface:name()) .. ifattr(checked[iface:name()], "checked", "checked")%> /> &nbsp;
<input class="cbi-input-<%=self.widget or "radio"%>" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)"<%=
attr("type", self.widget or "radio") ..
attr("id", cbid .. "." .. iface:name()) ..
attr("name", cbid) .. attr("value", iface:name()) ..
ifattr(checked[iface:name()], "checked", "checked")
%> /> &nbsp;
<label<%=attr("for", cbid .. "." .. iface:name())%>>
<% if link then -%><a href="<%=link%>"><% end -%>
<img title="<%=iface:get_type_i18n()%>" style="width:16px; height:16px; vertical-align:middle" src="<%=resource%>/icons/<%=iface:type()%><%=iface:is_up() and "" or "_disabled"%>.png" />

15
libs/web/luasrc/view/cbi/network_netlist.htm
View file

@ -14,7 +14,8 @@ $Id$
<%+cbi/valueheader%>
<%-
local nwm = require "luci.model.network"
local utl = require "luci.util"
local nwm = require "luci.model.network".init()
local net, iface
local networks = nwm:get_networks()
@ -23,13 +24,23 @@ $Id$
if not value or value == "-" then
value = self:cfgvalue(section) or self.default
end
local checked = { }
for value in utl.imatch(value) do
checked[value] = true
end
-%>
<ul style="margin:0; list-style-type:none; text-align:left">
<% for _, net in ipairs(networks) do
if net:name() ~= "loopback" then %>
<li style="padding:0.25em 0">
<input class="cbi-input-radio" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)"<%=attr("type", self.widget or "radio") .. attr("id", cbid .. "." .. net:name()) .. attr("name", cbid) .. attr("value", net:name()) .. ifattr(value == net:name(), "checked", "checked")%> /> &nbsp;
<input class="cbi-input-radio" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)"<%=
attr("type", self.widget or "radio") ..
attr("id", cbid .. "." .. net:name()) ..
attr("name", cbid) .. attr("value", net:name()) ..
ifattr(checked[net:name()], "checked", "checked")
%> /> &nbsp;
<label<%=attr("for", cbid .. "." .. net:name())%>>
&nbsp;<span style="background-color:#FFFFFF; border:1px solid #CCCCCC; padding:2px"><%=net:name()%>:
<%