projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a6dcb3f
)
libs/web: network widget fixes
author
Jo-Philipp Wich
<jow@openwrt.org>
Sun, 25 Sep 2011 11:59:21 +0000
(11:59 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Sun, 25 Sep 2011 11:59:21 +0000
(11:59 +0000)
libs/web/luasrc/view/cbi/network_ifacelist.htm
patch
|
blob
|
history
libs/web/luasrc/view/cbi/network_netinfo.htm
patch
|
blob
|
history
libs/web/luasrc/view/cbi/network_netlist.htm
patch
|
blob
|
history
diff --git
a/libs/web/luasrc/view/cbi/network_ifacelist.htm
b/libs/web/luasrc/view/cbi/network_ifacelist.htm
index
76ea74a
..
a6565eb
100644
(file)
--- a/
libs/web/luasrc/view/cbi/network_ifacelist.htm
+++ b/
libs/web/luasrc/view/cbi/network_ifacelist.htm
@@
-25,7
+25,7
@@
local n = self.network and net:get_network(self.network)
if n then
local i
local n = self.network and net:get_network(self.network)
if n then
local i
- for _, i in ipairs(n:
is_bridge() and n:
get_interfaces() or { n:get_interface() }) do
+ for _, i in ipairs(n:get_interfaces() or { n:get_interface() }) do
checked[i:name()] = true
end
end
checked[i:name()] = true
end
end
diff --git
a/libs/web/luasrc/view/cbi/network_netinfo.htm
b/libs/web/luasrc/view/cbi/network_netinfo.htm
index
89389f8
..
f364ca0
100644
(file)
--- a/
libs/web/luasrc/view/cbi/network_netinfo.htm
+++ b/
libs/web/luasrc/view/cbi/network_netinfo.htm
@@
-15,7
+15,7
@@
<span style="background-color:#FFFFFF; border:1px solid #CCCCCC; padding:2px"><%=net:name()%>:
<%
local empty = true
<span style="background-color:#FFFFFF; border:1px solid #CCCCCC; padding:2px"><%=net:name()%>:
<%
local empty = true
- for _, iface in ipairs(net:
is_bridge() and net:
get_interfaces() or { net:get_interface() }) do
+ for _, iface in ipairs(net:get_interfaces() or { net:get_interface() }) do
if not iface:is_bridge() then
empty = false
%>
if not iface:is_bridge() then
empty = false
%>
diff --git
a/libs/web/luasrc/view/cbi/network_netlist.htm
b/libs/web/luasrc/view/cbi/network_netlist.htm
index
1723932
..
fab7883
100644
(file)
--- a/
libs/web/luasrc/view/cbi/network_netlist.htm
+++ b/
libs/web/luasrc/view/cbi/network_netlist.htm
@@
-36,7
+36,7
@@
if not iface:is_bridge() then
empty = false
%>
if not iface:is_bridge() then
empty = false
%>
- <img<%=attr("title",
pcdata(iface:get_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" />
<% end end %>
<% if empty then %><em><%:(no interfaces attached)%></em><% end %>
</span>
<% end end %>
<% if empty then %><em><%:(no interfaces attached)%></em><% end %>
</span>