libs/web: remove inline styles from firewall_zoneforwards and firewall_zonelist widgets

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

diff --git a/libs/web/luasrc/view/cbi/firewall_zoneforwards.htm b/libs/web/luasrc/view/cbi/firewall_zoneforwards.htm
index f027ab3..2a433b5 100644 (file)
--- a/libs/web/luasrc/view/cbi/firewall_zoneforwards.htm
+++ b/libs/web/luasrc/view/cbi/firewall_zoneforwards.htm
@@ -17,16 +17,16 @@
 -%>
 
 <% if zone then %>
-<div style="padding:0.5em; white-space:nowrap">
-       <label style="background-color:<%=zone:get_color()%>; padding:0.4em">
+<div style="white-space:nowrap">
+       <label class="zonebadge" style="background-color:<%=zone:get_color()%>">
                <strong><%=zone:name()%>:</strong>
-               <%
+               <%-
                        local zempty = true
                        for _, net in ipairs(zone:get_networks()) do
                                net = nwm:get_network(net)
                                if net then
                                        zempty = false
-               %>
+               -%>
                        <span class="ifacebadge<% if net:name() == self.network then %> ifacebadge-active<% end %>"><%=net:name()%>:
                        <%
                                local nempty = true
@@ -37,20 +37,20 @@
                        <% end %>
                        <% if nempty then %><em><%:(empty)%></em><% end %>
                        </span>
-               <% end end %>
-               <% if zempty then %><em><%:(empty)%></em><% end %>
+               <%- end end -%>
+               <%- if zempty then %><em><%:(empty)%></em><% end -%>
        </label>
        &#160;&#8658;&#160;
        <% for _, fwd in ipairs(zone:get_forwardings_by("src")) do
                fz = fwd:dest_zone()
                empty = false %>
-               <label style="background-color:<%=fz:get_color()%>; padding:0.4em">
+               <label class="zonebadge" style="background-color:<%=fz:get_color()%>">
                        <strong><%=fz:name()%></strong>
                </label>&#160;
        <% end %>
        <% if empty then %>
-               <label style="border:1px dashed #AAAAAA; color:#AAAAAA; padding:0.3em">
-                       <strong><small><em><%=zone:forward():upper()%></em></small></strong>
+               <label class="zonebadge zonebadge-empty">
+                       <strong><%=zone:forward():upper()%></strong>
                </label>
        <% end %>
 </div>