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:
6832010
)
libs/web: remove inline styles for interface badges
author
Jo-Philipp Wich
<jow@openwrt.org>
Wed, 15 Feb 2012 16:00:23 +0000
(16:00 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Wed, 15 Feb 2012 16:00:23 +0000
(16:00 +0000)
libs/web/luasrc/view/cbi/firewall_zoneforwards.htm
patch
|
blob
|
history
libs/web/luasrc/view/cbi/firewall_zonelist.htm
patch
|
blob
|
history
libs/web/luasrc/view/cbi/network_netlist.htm
patch
|
blob
|
history
diff --git
a/libs/web/luasrc/view/cbi/firewall_zoneforwards.htm
b/libs/web/luasrc/view/cbi/firewall_zoneforwards.htm
index
5a2befd
..
f027ab3
100644
(file)
--- a/
libs/web/luasrc/view/cbi/firewall_zoneforwards.htm
+++ b/
libs/web/luasrc/view/cbi/firewall_zoneforwards.htm
@@
-27,12
+27,7
@@
if net then
zempty = false
%>
if net then
zempty = false
%>
-  
- <%- if net:name() == self.network then -%>
- <span style="background-color:#FFFFFF; border:1px solid #000000; padding:2px; font-weight:bold"><%=net:name()%>:
- <%- else -%>
- <span style="background-color:#FFFFFF; border:1px solid #CCCCCC; padding:2px"><%=net:name()%>:
- <%- end -%>
+ <span class="ifacebadge<% if net:name() == self.network then %> ifacebadge-active<% end %>"><%=net:name()%>:
<%
local nempty = true
for _, iface in ipairs(net:is_bridge() and net:get_interfaces() or { net:get_interface() }) do
<%
local nempty = true
for _, iface in ipairs(net:is_bridge() and net:get_interfaces() or { net:get_interface() }) do
diff --git
a/libs/web/luasrc/view/cbi/firewall_zonelist.htm
b/libs/web/luasrc/view/cbi/firewall_zonelist.htm
index
53fa836
..
8aa6970
100644
(file)
--- a/
libs/web/luasrc/view/cbi/firewall_zonelist.htm
+++ b/
libs/web/luasrc/view/cbi/firewall_zonelist.htm
@@
-59,12
+59,7
@@
if net then
zempty = false
%>
if net then
zempty = false
%>
-  
- <%- if net:name() == self.network then -%>
- <span style="background-color:#FFFFFF; border:1px solid #000000; padding:2px; font-weight:bold"><%=net:name()%>:
- <%- else -%>
- <span style="background-color:#FFFFFF; border:1px solid #CCCCCC; padding:2px"><%=net:name()%>:
- <%- end -%>
+ <span class="ifacebadge<% if net:name() == self.network then %> ifacebadge-active<% end %>"><%=net:name()%>:
<%
local nempty = true
for _, iface in ipairs(net:is_bridge() and net:get_interfaces() or { net:get_interface() }) do
<%
local nempty = true
for _, iface in ipairs(net:is_bridge() and net:get_interfaces() or { net:get_interface() }) do
diff --git
a/libs/web/luasrc/view/cbi/network_netlist.htm
b/libs/web/luasrc/view/cbi/network_netlist.htm
index
37a206a
..
35e0ed3
100644
(file)
--- a/
libs/web/luasrc/view/cbi/network_netlist.htm
+++ b/
libs/web/luasrc/view/cbi/network_netlist.htm
@@
-32,7
+32,7
@@
ifattr(checked[net:name()], "checked", "checked")
%> />  
<label<%=attr("for", cbid .. "." .. net:name())%>>
ifattr(checked[net:name()], "checked", "checked")
%> />  
<label<%=attr("for", cbid .. "." .. net:name())%>>
-
 <span style="background-color:#FFFFFF; border:1px solid #CCCCCC; padding:2px
"><%=net:name()%>:
+
<span class="ifacebadge
"><%=net:name()%>:
<%
local empty = true
for _, iface in ipairs(net:is_bridge() and net:get_interfaces() or { net:get_interface() }) do
<%
local empty = true
for _, iface in ipairs(net:is_bridge() and net:get_interfaces() or { net:get_interface() }) do