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 192bcac729a9869f356e607d6d4407094f5ee049..643d849a5071f002808437ebf6297fc54f005aac 100644 (file)
--- a/libs/web/luasrc/view/cbi/network_ifacelist.htm
+++ b/libs/web/luasrc/view/cbi/network_ifacelist.htm
@@ -8,7 +8,7 @@
        local iface
        local ifaces = net:get_interfaces()
        local value
-       
+
        if self.map:formvalue(cbeid) == "1" then
                value = self:formvalue(section) or self.default or ""
        else
@@ -25,7 +25,7 @@
                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
@@ -36,20 +36,28 @@
 <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()) and iface:name() ~= self.exclude 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") ..
-                       ifattr(iface:type() == "wifi" and not iface:is_up(), "disabled", "disabled")
+                       ifattr(checked[iface:name()], "checked", "checked")
                %> /> &#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 -%>
-                       <%=pcdata(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 %>
@@ -58,7 +66,8 @@
                <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("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" />