@@ -180,52 +180,52 @@ $Id$
if dev and devinfo and devinfo[dev] then
%>
-
<%:a_s_if_interface Interface%> <%=i['.name']%>
+
<%:Interface%> <%=i['.name']%>
- <%:a_s_if_device Device%>:
- <%=dev%> (<%:a_s_if_mac MAC%> <%=get_mac(dev)%>)
+ <%:Device%>:
+ <%=dev%> (<%:MAC%> <%=get_mac(dev)%>)
- <%:a_s_if_type Type%>:
+ <%:Type%>:
<% if is_wifi(dev) then iw = get_iwinfo(dev) -%>
- <%:a_s_if_wifidev Wireless Adapter%> (<%=iw.type%>)
+ <%:Wireless Adapter%> (<%=iw.type%>)
<% if iw then %>
- └ <%:a_s_if_iwmode Mode%>: <%=get_iwmode(iw)%>
- └ <%:a_s_if_iwssid SSID%>: <%=iw.ssid%>
- └ <%:a_s_if_iwchannel Channel%>: <%=iw.channel%>
+ └ <%:Mode%>: <%=get_iwmode(iw)%>
+ └ <%:SSID%>: <%=iw.ssid%>
+ └ <%:Channel%>: <%=iw.channel%>
<% end %>
<% else -%>
<% if vlan then %>
- <%:a_s_if_ethswitch Ethernet Switch%> (<%=get_switch_driver(dev)%>)
- └ <%:a_s_if_vlan VLAN%>: <%=get_vlan(dev)%> (<%:a_s_if_vlanports Ports%> <%=table.concat(get_vlan_ports(dev), ", ")%>)
+ <%:Ethernet Switch%> (<%=get_switch_driver(dev)%>)
+ └ <%:VLAN%>: <%=get_vlan(dev)%> (<%:Ports%> <%=table.concat(get_vlan_ports(dev), ", ")%>)
<% else %>
- <%:a_s_if_ethdev Ethernet Adapter%>
+ <%:Ethernet Adapter%>
<% end %>
<% end -%>
- <%:a_s_if_transfer Transfer%>
- └ <%:a_s_if_transfer_rx RX%>: <%=devinfo[dev][2]%> <%:a_s_if_pkts Pkts.%> (<%=wba.byte_format(tonumber(devinfo[dev][1]))%>)
- └ <%:a_s_if_transfer_tx TX%>: <%=devinfo[dev][10]%> <%:a_s_if_pkts Pkts.%> (<%=wba.byte_format(tonumber(devinfo[dev][9]))%>)
+ <%:Transfer%>
+ └ <%:RX%>: <%=devinfo[dev][2]%> <%:Pkts.%> (<%=wba.byte_format(tonumber(devinfo[dev][1]))%>)
+ └ <%:TX%>: <%=devinfo[dev][10]%> <%:Pkts.%> (<%=wba.byte_format(tonumber(devinfo[dev][9]))%>)
<%- if ( i.ipaddr and #i.ipaddr > 0 ) or ( i.ip6addr and #i.ip6addr > 0 ) then -%>
- <%:a_s_if_ipconfig IP Configuration%>
- └ <%:a_s_if_ipconfig_primary Primary%>:
+ <%:IP Configuration%>
+ └ <%:Primary%>:
<% if i.ipaddr and #i.ipaddr > 0 then %>
<%=i.ipaddr%>/<%=i.netmask%>
<% if i.proto == "dhcp" then -%>
- (<%:a_s_if_ipconfig_dhcp DHCP assigned%>)
+ (<%:DHCP assigned%>)
<%- end %>
<% else %>
- <%:a_s_if_ipconfig_none Not configured%>
+ <%:Not configured%>
<% end %>
<% for i, a in ipairs(get_aliases(i)) do %>
- └ <%:a_s_if_ipconfig_alias Alias%> #<%=i%>:
- <%=a.ipaddr%>/<%=a.netmask%> (<%:a_s_if_device Device%> <%=dev%>:<%=i%>)
+ └ <%:Alias%> #<%=i%>:
+ <%=a.ipaddr%>/<%=a.netmask%> (<%:Device%> <%=dev%>:<%=i%>)
<% end %>
<% if i.ip6addr and #i.ip6addr > 0 then %>
- └ <%:a_s_if_ipconfig_ipv6 IPv6%>: <%=i.ip6addr%>
+ └ <%:IPv6%>: <%=i.ip6addr%>
<% end %>
<%- end -%>
@@ -238,41 +238,41 @@ $Id$
if br and devinfo and devinfo[dev] then
%>
-
<%:a_s_if_bridge Bridge%> <%=br.name%>
+
<%:Bridge%> <%=br.name%>
- <%:a_s_if_device Device%>:
- <%=dev%> (<%:a_s_if_mac MAC%> <%=get_mac(dev)%>)
+ <%:Device%>:
+ <%=dev%> (<%:MAC%> <%=get_mac(dev)%>)
- <%:a_s_if_type Type%>:
- <%:a_s_if_ethbridge Ethernet Bridge%>
+ <%:Type%>:
+ <%:Ethernet Bridge%>
- └ <%:a_s_if_bridge_id ID%>: <%=br.id%>
- └ <%:a_s_if_bridge_stp STP%>: <%=br.stp and "enabled" or "disabled"%>
+ └ <%:ID%>: <%=br.id%>
+ └ <%:STP%>: <%=br.stp and "enabled" or "disabled"%>
- <%:a_s_if_transfer Transfer%>
- └ <%:a_s_if_transfer_rx RX%>: <%=devinfo[dev][2]%> Pkts. (<%=wba.byte_format(tonumber(devinfo[dev][1]))%>)
- └ <%:a_s_if_transfer_tx TX%>: <%=devinfo[dev][10]%> Pkts. (<%=wba.byte_format(tonumber(devinfo[dev][9]))%>)
+ <%:Transfer%>
+ └ <%:RX%>: <%=devinfo[dev][2]%> Pkts. (<%=wba.byte_format(tonumber(devinfo[dev][1]))%>)
+ └ <%:TX%>: <%=devinfo[dev][10]%> Pkts. (<%=wba.byte_format(tonumber(devinfo[dev][9]))%>)
<%- if ( b.ipaddr and #b.ipaddr > 0 ) or ( b.ip6addr and #b.ip6addr > 0 ) then -%>
- <%:a_s_if_ipconfig IP Configuration%>
- └ <%:a_s_if_ipconfig_primary Primary%>:
+ <%:IP Configuration%>
+ └ <%:Primary%>:
<% if b.ipaddr and #b.ipaddr > 0 then %>
<%=b.ipaddr%>/<%=b.netmask%>
<% if b.proto == "dhcp" then -%>
- (<%:a_s_if_ipconfig_dhcp DHCP assigned%>)
+ (<%:DHCP assigned%>)
<%- end %>
<% else %>
- <%:a_s_if_ipconfig_none Not configured%>
+ <%:Not configured%>
<% end %>
<% for i, a in ipairs(get_aliases(b)) do %>
- └ <%:a_s_if_ipconfig_alias Alias%> #<%=i%>:
- <%=a.ipaddr%>/<%=a.netmask%> (<%:a_s_if_device Device%> <%=dev%>:<%=i%>)
+ └ <%:Alias%> #<%=i%>:
+ <%=a.ipaddr%>/<%=a.netmask%> (<%:Device%> <%=dev%>:<%=i%>)
<% end %>
<% if b.ip6addr and #b.ip6addr > 0 then %>
- └ <%:a_s_if_ipconfig_ipv6 IPv6%>: <%=b.ip6addr%>
+ └ <%:IPv6%>: <%=b.ip6addr%>
<% end %>
<%- end -%>
@@ -280,26 +280,26 @@ $Id$
dev = i
vlan = get_vlan(dev)
%>
- <%:a_s_if_bridge_port Bridge Port%> <%=n%>
+ <%:Bridge Port%> <%=n%>
- └ <%:a_s_if_device Device%>:
- <%=dev%> (<%:a_s_if_mac MAC%> <%=get_mac(dev)%>)
+ └ <%:Device%>:
+ <%=dev%> (<%:MAC%> <%=get_mac(dev)%>)
- └ <%:a_s_if_type Type%>:
+ └ <%:Type%>:
<% if is_wifi(dev) then iw = get_iwinfo(dev) -%>
- <%:a_s_if_wifidev Wireless Adapter%> (<%=iw.type%>)
+ <%:Wireless Adapter%> (<%=iw.type%>)
<% if iw then %>
- └ <%:a_s_if_iwmode Mode%>: <%=get_iwmode(iw)%>
- └ <%:a_s_if_iwssid SSID%>: <%=iw.ssid%>
- └ <%:a_s_if_iwchannel Channel%>: <%=iw.channel%>
+ └ <%:Mode%>: <%=get_iwmode(iw)%>
+ └ <%:SSID%>: <%=iw.ssid%>
+ └ <%:Channel%>: <%=iw.channel%>
<% end %>
<% else -%>
<% if vlan then %>
- <%:a_s_if_ethswitch Ethernet Switch%> (<%=get_switch_driver(dev)%>)
- └ <%:a_s_if_vlan VLAN%>:
- <%=get_vlan(dev)%> (<%:a_s_if_vlan_ports Ports%> <%=table.concat(get_vlan_ports(dev), ", ")%>)
+ <%:Ethernet Switch%> (<%=get_switch_driver(dev)%>)
+ └ <%:VLAN%>:
+ <%=get_vlan(dev)%> (<%:Ports%> <%=table.concat(get_vlan_ports(dev), ", ")%>)
<% else %>
- <%:a_s_if_ethdev Ethernet Adapter%>
+ <%:Ethernet Adapter%>
<% end %>
<% end -%>
<% end %>