luci-0.11: merge r9559 - r9569

[project/luci.git] / libs / web / luasrc / view / cbi / network_ifacelist.htm

diff --git a/libs/web/luasrc/view/cbi/network_ifacelist.htm b/libs/web/luasrc/view/cbi/network_ifacelist.htm
index a69bd3284e12641a4f46d0725b173043ab857f63..643d849a5071f002808437ebf6297fc54f005aac 100644 (file)
--- a/libs/web/luasrc/view/cbi/network_ifacelist.htm
+++ b/libs/web/luasrc/view/cbi/network_ifacelist.htm
@@ -1,25 +1,20 @@
-<%#
-LuCI - Lua Configuration Interface
-Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-$Id$
-
--%>
 <%+cbi/valueheader%>
 
 <%-
        local utl = require "luci.util"
        local net = require "luci.model.network".init()
+       local cbeid = luci.cbi.FEXIST_PREFIX .. self.config .. "." .. section .. "." .. self.option
 
        local iface
        local ifaces = net:get_interfaces()
-       local value = (self:formvalue(section) or self.default)
+       local value
+
+       if self.map:formvalue(cbeid) == "1" then
+               value = self:formvalue(section) or self.default or ""
+       else
+               value = self:cfgvalue(section) or self.default
+       end
+
        local checked = { }
 
        if value then
@@ -30,32 +25,57 @@ $Id$
                local n = self.network and net:get_network(self.network)
                if n then
                        local i
-                       for _, i in ipairs(n:get_interfaces()) do
+                       for _, i in ipairs(n:get_interfaces() or { n:get_interface() }) do
                                checked[i:name()] = true
                        end
                end
        end
 -%>
 
+<input type="hidden" name="<%=cbeid%>" value="1" />
 <ul style="margin:0; list-style-type:none">
        <% for _, iface in ipairs(ifaces) do
             local link = iface:adminlink()
-         if not self.nobridges or not iface:is_bridge() then %>
+         if (not self.nobridges  or not iface:is_bridge()) and
+                   (not self.noinactive or iface:is_up()) and
+                   iface:name() ~= self.exclude
+                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;
+               %> /> &#160;
                <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" />
+                       <img<%=attr("title", iface:get_i18n())%> style="width:16px; height:16px; vertical-align:middle" src="<%=resource%>/icons/<%=iface:type()%><%=iface:is_up() and "" or "_disabled"%>.png" />
                        <% if link then -%></a><% end -%>
-                       <%=iface:get_i18n()%><% local n = iface:get_network(); if n then %> (<a href="<%=n:adminlink()%>"><%=n:name()%></a>)<% end %>
+                       <%=pcdata(iface:get_i18n())%>
+                       <% local ns = iface:get_networks(); if #ns > 0 then %>(
+                               <%- local i, n; for i, n in ipairs(ns) do -%>
+                                       <%-= (i>1) and ', ' -%>
+                                       <a href="<%=n:adminlink()%>"><%=n:name()%></a>
+                               <%- end -%>
+                       )<% end %>
                </label>
        </li>
        <% end end %>
+       <% if not self.nocreate 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 .. "_custom") ..
+                       attr("name", cbid) ..
+                       attr("value", " ")
+               %> /> &#160;
+               <label<%=attr("for", cbid .. "_custom")%>>
+                       <img title="<%:Custom Interface%>" style="width:16px; height:16px; vertical-align:middle" src="<%=resource%>/icons/ethernet_disabled.png" />
+                       <%:Custom Interface%>:
+               </label>
+               <input type="text" style="width:50px" onfocus="document.getElementById('<%=cbid%>_custom').checked=true" onblur="var x=document.getElementById('<%=cbid%>_custom'); x.value=this.value; x.checked=true" />
+       </li>
+       <% end %>
 </ul>
 
 <%+cbi/valuefooter%>