From a60f781bdf6ff4b4d117fd1dfe54c8a664c5bfaf Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 1 Nov 2009 19:49:07 +0000
Subject: libs/cbi: fix formatting issue in zone picker widget

---
 libs/cbi/luasrc/view/cbi/firewall_zonelist.htm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'libs/cbi/luasrc/view')

diff --git a/libs/cbi/luasrc/view/cbi/firewall_zonelist.htm b/libs/cbi/luasrc/view/cbi/firewall_zonelist.htm
index 863452fbbb..0523786641 100644
--- a/libs/cbi/luasrc/view/cbi/firewall_zonelist.htm
+++ b/libs/cbi/luasrc/view/cbi/firewall_zonelist.htm
@@ -48,10 +48,12 @@ $Id$
 		<label<%=attr("for", cbid .. "." .. zone:name())%> style="background-color:<%=zone:get_color()%>; padding:0.5em">
 			<strong><%=zone:name()%>:</strong>
 			<%
-				local empty = true
+				local zempty = true
 				for _, net in ipairs(zone:get_networks()) do
 					net = nwm:get_network(net)
+					zempty = false
 					if net then
+						local nempty = true
 			%>
 				&nbsp;
 				<%- if net:name() == self.network then -%>
@@ -62,13 +64,14 @@ $Id$
 				<%
 					for _, iface in ipairs(net and net:get_interfaces() or {}) do
 						if not iface:is_bridgeport() then
-							empty = false
+							nempty = false
 				 %>
 					<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 nempty then %><em><%:(no interfaces attached)%></em><% end %>
 				</span>
 			<% end end %>
-			<% if empty then %><em><%:(no interfaces attached)%></em><% end %>
+			<% if zempty then %><em><%:(no interfaces attached)%></em><% end %>
 		</label>
 	</li>
 	<% end end %>
-- 
cgit v1.2.3