From a3bfc596bf5f1653bd956063fe727f93ebd56f1c Mon Sep 17 00:00:00 2001 From: pmelange Date: Sat, 17 Nov 2018 23:40:37 +0100 Subject: [PATCH] luci-app-olsr change ccs style to use class "left" instead of "style=text-align: left" Signed-off-by: pmelange --- .../view/freifunk-services/services.htm | 12 +++--- .../luasrc/view/status-olsr/hna.htm | 12 +++--- .../luasrc/view/status-olsr/interfaces.htm | 16 ++++---- .../luasrc/view/status-olsr/mid.htm | 4 +- .../luasrc/view/status-olsr/neighbors.htm | 38 +++++++++---------- .../luasrc/view/status-olsr/routes.htm | 20 +++++----- .../luasrc/view/status-olsr/smartgw.htm | 38 +++++++++---------- .../luasrc/view/status-olsr/topology.htm | 14 +++---- 8 files changed, 77 insertions(+), 77 deletions(-) diff --git a/applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm b/applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm index d1fdb2285..f6a81d002 100644 --- a/applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm +++ b/applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm @@ -132,9 +132,9 @@ end var service = info[idx]; s += String.format( '
' + - '
%s
' + - '
%s
' + - '
%s
' + + '
%s
' + + '
%s
' + + '
%s
' + '
', service.url, service.descr, service.proto, service.origin_link, service.origin || '?' ); @@ -175,9 +175,9 @@ end %>
-
<%=descr%>
-
<%=proto%>
-
<%=origin%>
+
<%=descr%>
+
<%=proto%>
+
<%=origin%>
<% i = ((i % 2) + 1) end %> diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm index 61c7cc21a..5212a5584 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm @@ -60,9 +60,9 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 }, } s += String.format( - '
%s
' + - '
%s
' + - '
%s
', hna.destination + '/' + hna.genmask, linkgw + hostname, validity + '
%s
' + + '
%s
' + + '
%s
', hna.destination + '/' + hna.genmask, linkgw + hostname, validity ) s += '' } @@ -88,8 +88,8 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 }, <% for k, route in ipairs(hna) do %>
-
<%=hna[k].destination%>/<%=hna[k].genmask%>
-
+
<%=hna[k].destination%>/<%=hna[k].genmask%>
+
<% if hna[k].proto == '6' then %> <%=hna[k].gateway%> <% else %> @@ -105,7 +105,7 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 }, validity = '-' end %> -
<%=validity%>
+
<%=validity%>
<% 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 639dbc23e..12f7cba96 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 705b905e9..469d89111 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 %>
-
<%=mid.main.ipAddress%>
-
<%=aliases%>
+
<%=mid.main.ipAddress%>
+
<%=aliases%>
<% 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 4432cb541..262326b49 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( '
' + - '
%s
', + '
%s
', neigh.proto, neigh.dfgcolor, neigh.rip, neigh.rip ); } else { s += String.format( '
' + - '
%s
', + '
%s
', neigh.proto, neigh.dfgcolor, neigh.rip, neigh.rip ); } if (neigh.hn) { s += String.format( - '
%s
', + '
%s
', 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 %> -
<%=link.remoteIP%>
+
<%=link.remoteIP%>
<% else %> -
<%=link.remoteIP%>
+
<%=link.remoteIP%>
<% end %> -
<%=link.hostname%>
-
<%=link.interface%>
-
<%=link.localIP%>
-
<%=string.format("%.3f", link.linkQuality)%>
-
<%=string.format("%.3f", link.neighborLinkQuality)%>
-
<%=string.format("%.3f", link.linkCost)%>
-
<%=link.snr%>
+
<%=link.hostname%>
+
<%=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 a03bd5ad2..ba738c016 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%>
+
<% if route.proto == '6' then %> <%=route.gateway%> <% else %> @@ -121,9 +121,9 @@ XHR.poll(20, '<%=REQUEST_URI%>', { status: 1 }, / <%=route.hostname%> <% end %>
-
<%=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 b5c68cdf1..34d3f118e 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 %> -
<%=gw.originator%>
+
<%=gw.originator%>
<% else %> -
<%=gw.originator%>
+
<%=gw.originator%>
<% 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 70b3d9985..fe673c411 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 %> -
<%=route.destinationIP%>
-
<%=route.lastHopIP%>
+
<%=route.destinationIP%>
+
<%=route.lastHopIP%>
<% else %> -
<%=route.destinationIP%>
-
<%=route.lastHopIP%>
+
<%=route.destinationIP%>
+
<%=route.lastHopIP%>
<%end%> -
<%=lq%>
-
<%=nlq%>
-
<%=cost%>
+
<%=lq%>
+
<%=nlq%>
+
<%=cost%>
<% i = ((i % 2) + 1) -- 2.25.1