<% i = ((i % 2) + 1)
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm
index 639dbc23e9..12f7cba967 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm
@@ -33,14 +33,14 @@ local i = 1
<% for k, iface in ipairs(iface) do %>
-
<%=iface.interface%>
-
<%=iface.name%>
-
<%=iface.olsrInterface.up and luci.i18n.translate('up') or luci.i18n.translate('down')%>
-
<%=iface.olsrInterface.mtu%>
-
<%=iface.olsrInterface.wireless and luci.i18n.translate('yes') or luci.i18n.translate('no')%>
-
<%=iface.olsrInterface.ipAddress%>
-
<%=iface.olsrInterface.ipv4Address ~= '0.0.0.0' and iface.olsrInterface.ipv4Netmask%>
-
<%=iface.olsrInterface.ipv4Address ~= '0.0.0.0' and iface.olsrInterface.ipv4Broadcast or iface.olsrInterface.ipv6Multicast%>
+
<%=iface.interface%>
+
<%=iface.name%>
+
<%=iface.olsrInterface.up and luci.i18n.translate('up') or luci.i18n.translate('down')%>
+
<%=iface.olsrInterface.mtu%>
+
<%=iface.olsrInterface.wireless and luci.i18n.translate('yes') or luci.i18n.translate('no')%>
+
<%=iface.olsrInterface.ipAddress%>
+
<%=iface.olsrInterface.ipv4Address ~= '0.0.0.0' and iface.olsrInterface.ipv4Netmask%>
+
<%=iface.olsrInterface.ipv4Address ~= '0.0.0.0' and iface.olsrInterface.ipv4Broadcast or iface.olsrInterface.ipv6Multicast%>
<% i = ((i % 2) + 1)
end %>
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm
index 705b905e90..469d89111a 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm
@@ -38,8 +38,8 @@ local i = 1
%>
<% i = ((i % 2) + 1)
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm
index 4432cb5416..262326b490 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm
@@ -64,34 +64,34 @@ end
if (neigh.proto == '6') {
s += String.format(
'
' +
- '
',
+ '
',
neigh.proto, neigh.dfgcolor, neigh.rip, neigh.rip
);
} else {
s += String.format(
'
' +
- '
',
+ '
',
neigh.proto, neigh.dfgcolor, neigh.rip, neigh.rip
);
}
if (neigh.hn) {
s += String.format(
- '
',
+ '
',
neigh.dfgcolor, neigh.hn, neigh.hn
);
} else {
s += String.format(
- '
?
',
+ '
?
',
neigh.dfgcolor
);
}
s += String.format(
- '
%s
' +
- '
%s
' +
- '
%s
' +
- '
%s
' +
- '
%s
' +
- '
%s
' +
+ '
%s
' +
+ '
%s
' +
+ '
%s
' +
+ '
%s
' +
+ '
%s
' +
+ '
%s
' +
'
',
neigh.dfgcolor, neigh.ifn, neigh.dfgcolor, neigh.lip, neigh.dfgcolor, neigh.lq, neigh.dfgcolor, neigh.nlq, neigh.color, neigh.cost, neigh.snr_color, neigh.signal, neigh.noise, neigh.snr || '?'
);
@@ -145,17 +145,17 @@ end
<% if link.proto == "6" then %>
-
+
<% else %>
-
+
<% end %>
-
-
<%=link.interface%>
-
<%=link.localIP%>
-
<%=string.format("%.3f", link.linkQuality)%>
-
<%=string.format("%.3f", link.neighborLinkQuality)%>
-
<%=string.format("%.3f", link.linkCost)%>
-
<%=link.snr%>
+
+
<%=link.interface%>
+
<%=link.localIP%>
+
<%=string.format("%.3f", link.linkQuality)%>
+
<%=string.format("%.3f", link.neighborLinkQuality)%>
+
<%=string.format("%.3f", link.linkCost)%>
+
<%=link.snr%>
<%
i = ((i % 2) + 1)
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm
index a03bd5ad27..ba738c016d 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm
@@ -50,8 +50,8 @@ XHR.poll(20, '<%=REQUEST_URI%>', { status: 1 },
s += String.format(
'
' +
- '
%s/%s
' +
- '
' +
+ '
%s/%s
' +
+ '
' +
'
%s',
route.proto, route.dest, route.genmask, route.gw, route.gw
)
@@ -72,9 +72,9 @@ XHR.poll(20, '<%=REQUEST_URI%>', { status: 1 },
}
s += String.format(
'
' +
- '
%s
' +
- '
%s
' +
- '
%s
' +
+ '
%s
' +
+ '
%s
' +
+ '
%s
' +
'
',
route.interface, route.metric, route.color, route.etx || '?'
);
@@ -110,8 +110,8 @@ XHR.poll(20, '<%=REQUEST_URI%>', { status: 1 },
%>
-
<%=route.destination%>/<%=route.genmask%>
-
+
<%=route.destination%>/<%=route.genmask%>
+
-
<%=route.networkInterface%>
-
<%=route.metric%>
-
<%=string.format("%.3f", ETX)%>
+
<%=route.networkInterface%>
+
<%=route.metric%>
+
<%=string.format("%.3f", ETX)%>
<%
i = ((i % 2) + 1)
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm
index b5c68cdf12..34d3f118ea 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm
@@ -63,15 +63,15 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
}
s += String.format(
- '
%s
' +
- '
%s
' +
- '
%s
' +
- '
%s
' +
- '
%s
' +
- '
%s
' +
- '
%s
' +
- '
%s
' +
- '
%s
',
+ '
%s
' +
+ '
%s
' +
+ '
%s
' +
+ '
%s
' +
+ '
%s
' +
+ '
%s
' +
+ '
%s
' +
+ '
%s
' +
+ '
%s
',
linkgw, smartgw.selected, smartgw.cost, smartgw.hops, smartgw.uplink, smartgw.downlink, smartgw.v4, smartgw.v6, smartgw.prefix
)
s += '
'
@@ -114,19 +114,19 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
<% if gw.proto == '6' then %>
-
+
<% else %>
-
+
<% end %>
-
<%=gw.selected and luci.i18n.translate('yes') or luci.i18n.translate('no')%>
-
<%=gw.cost > 0 and string.format("%.3f", gw.cost) or luci.i18n.translate('infinate')%>
-
<%=gw.hops%>
-
<%=gw.uplink%>
-
<%=gw.downlink%>
-
<%=gw.IPv4 and luci.i18n.translate('yes') or luci.i18n.translate('no')%>
-
<%=gw.IPv6 and luci.i18n.translate('yes') or luci.i18n.translate('no')%>
-
<%=gw.prefix%>
+
<%=gw.selected and luci.i18n.translate('yes') or luci.i18n.translate('no')%>
+
<%=gw.cost > 0 and string.format("%.3f", gw.cost) or luci.i18n.translate('infinate')%>
+
<%=gw.hops%>
+
<%=gw.uplink%>
+
<%=gw.downlink%>
+
<%=gw.IPv4 and luci.i18n.translate('yes') or luci.i18n.translate('no')%>
+
<%=gw.IPv6 and luci.i18n.translate('yes') or luci.i18n.translate('no')%>
+
<%=gw.prefix%>
<% i = ((i % 2) + 1)
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm
index 70b3d99854..fe673c4111 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm
@@ -37,19 +37,19 @@ local olsrtools = require "luci.tools.olsr"
<% if route.proto == "6" then %>
-
-
+
+
<% else %>
-
-
+
+
<%end%>
-
<%=lq%>
-
<%=nlq%>
-
<%=cost%>
+
<%=lq%>
+
<%=nlq%>
+
<%=cost%>
<% i = ((i % 2) + 1)