From 7387553a042c9357081e4baaa2141ce2d1964ecb Mon Sep 17 00:00:00 2001 From: pmelange Date: Thu, 15 Nov 2018 14:55:42 +0100 Subject: [PATCH] luci-app-olsr: make cosmetic changes. modify the status tables so that then headers and columns align, values left justified. Additionally, add the openwrt style interface name to the interfaces table, change huge ETX numbers to 'infinate', and add the german translation for 'Selected'. Signed-off-by: pmelange --- .../view/freifunk-services/services.htm | 16 +++--- .../luci-app-olsr/luasrc/controller/olsr.lua | 9 ++++ .../luasrc/view/status-olsr/hna.htm | 16 +++--- .../luasrc/view/status-olsr/interfaces.htm | 16 +++--- .../luasrc/view/status-olsr/mid.htm | 4 +- .../luasrc/view/status-olsr/neighbors.htm | 44 +++++++-------- .../luasrc/view/status-olsr/routes.htm | 27 ++++------ .../luasrc/view/status-olsr/smartgw.htm | 53 ++++++++----------- .../luasrc/view/status-olsr/topology.htm | 16 +++--- applications/luci-app-olsr/po/de/olsr.po | 4 ++ applications/luci-app-olsr/po/en/olsr.po | 4 ++ .../luci-app-olsr/po/templates/olsr.pot | 5 ++ 12 files changed, 107 insertions(+), 107 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 91624f3b30..d1fdb22852 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 || '?' ); @@ -153,15 +153,12 @@ end
<%:Internal services%>
-
<%:Url%>
<%:Protocol%>
<%:Source%>
-
-
<% for k, line in ipairs(services) do local field = {} @@ -178,13 +175,12 @@ end %>
-
<%=descr%>
-
<%=proto%>
-
<%=origin%>
+
<%=descr%>
+
<%=proto%>
+
<%=origin%>
<% i = ((i % 2) + 1) end %> -

<%=last_update%> diff --git a/applications/luci-app-olsr/luasrc/controller/olsr.lua b/applications/luci-app-olsr/luasrc/controller/olsr.lua index dc424c0114..11e27d7c00 100644 --- a/applications/luci-app-olsr/luasrc/controller/olsr.lua +++ b/applications/luci-app-olsr/luasrc/controller/olsr.lua @@ -331,6 +331,8 @@ end function action_interfaces() local data, has_v4, has_v6, error = fetch_jsoninfo('interfaces') + local ntm = require "luci.model.network".init() + if error then return end @@ -339,6 +341,13 @@ function action_interfaces() return a.proto < b.proto end + for k, v in ipairs(data) do + local interface = ntm:get_status_by_address(v.olsrInterface.ipAddress) + if interface then + v.interface = interface + end + end + table.sort(data, compare) luci.template.render("status-olsr/interfaces", {iface=data, has_v4=has_v4, has_v6=has_v6}) 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 f04d926918..29832f1350 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm @@ -62,9 +62,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 += '' } @@ -81,20 +81,17 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 }, <%:Overview of currently active OLSR host net announcements%>
-
<%:Announced network%>
<%:OLSR gateway%>
<%:Validity Time%>
-
-
<% 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 %> @@ -110,12 +107,11 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 }, validity = '-' end %> -
<%=validity%>
+
<%=validity%>
<% i = ((i % 2) + 1) end %> -
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 7506f07029..639dbc23e9 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm @@ -21,6 +21,7 @@ local i = 1
<%:Interface%>
+
<%:Device%>
<%:State%>
<%:MTU%>
<%:WLAN%>
@@ -32,13 +33,14 @@ local i = 1 <% for k, iface in ipairs(iface) do %>
-
<%=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 9babd50a80..705b905e90 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 29ea95694c..4432cb5416 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 || '?' ); @@ -112,8 +112,7 @@ end <%:Overview of currently established OLSR connections%>
-
-
+
<%:Neighbour IP%>
<%:Hostname%>
<%:Interface%>
@@ -123,9 +122,7 @@ end
ETX
SNR
-
-
<% local i = 1 for k, link in ipairs(links) do link.linkCost = tonumber(link.linkCost) or 0 @@ -148,22 +145,21 @@ 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) end %> -

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 4b733524a5..a03bd5ad27 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 || '?' ); @@ -96,7 +96,6 @@ XHR.poll(20, '<%=REQUEST_URI%>', { status: 1 }, <%:Overview of currently known routes to other OLSR nodes%>
-
<%:Announced network%>
<%:OLSR gateway%>
@@ -104,18 +103,15 @@ XHR.poll(20, '<%=REQUEST_URI%>', { status: 1 },
<%:Metric%>
ETX
-
- -
<% for k, route in ipairs(routes) do - ETX = tonumber(route.rtpMetricCost)/1024 or '0' + ETX = tonumber(route.etx) or '0' color = olsrtools.etx_color(ETX) %>
-
<%=route.destination%>/<%=route.genmask%>
-
+
<%=route.destination%>/<%=route.genmask%>
+
<% if route.proto == '6' then %> <%=route.gateway%> <% else %> @@ -125,14 +121,13 @@ 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) end %> -
<%+status-olsr/legend%> 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 ba36ce980a..56dd868381 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm @@ -19,7 +19,7 @@ if luci.http.formvalue("status") == "1" then local rv = {} for k, gw in ipairs(gws.ipv4, gws.ipv6) do gw.cost = tonumber(gw.cost)/1024 or 0 - if gw.cost == 4096 then + if gw.cost >= 100 then gw.cost = 0 end @@ -27,7 +27,7 @@ if luci.http.formvalue("status") == "1" then proto = gw.IPv4 and '4' or '6', originator = gw.originator, selected = gw.selected and luci.i18n.translate('yes') or luci.i18n.translate('no'), - cost = string.format("%.3f", gw.cost), + cost = gw.cost > 0 and string.format("%.3f", gw.cost) or luci.i18n.translate('infinate'), hops = gw.hops, uplink = gw.uplink, downlink = gw.downlink, @@ -64,15 +64,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 += '
' @@ -83,9 +83,6 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 }, ); //]]> - -<%+header%> -

<%:SmartGW announcements%>

@@ -95,7 +92,6 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
<%:Overview of smart gateways in this network%>
-
<%:Gateway%>
<%:Selected%>
@@ -108,37 +104,34 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
<%:Prefix%>
-
-
- <% for k, gw in ipairs(gws) do + <% for k, gw in ipairs(gws.ipv4, gws.ipv6) do gw.cost = tonumber(gw.cost)/1024 or 0 - if gw.cost == 4096 then + if gw.cost >= 100 then gw.cost = 0 end %>
<% 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')%>
-
<%=string.format("%.3f", gw.cost)%>
-
<%=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) end %> -
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 02fdfddac3..70b3d99854 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm @@ -27,7 +27,7 @@ local olsrtools = require "luci.tools.olsr"
<% for k, route in ipairs(routes) do - local cost = string.format("%.3f", tonumber(route.tcEdgeCost/1024) or 0) + local cost = string.format("%.3f", tonumber(route.tcEdgeCost) or 0) local color = olsrtools.etx_color(tonumber(cost)) local lq = string.format("%.3f", tonumber(route.linkQuality) or 0) local nlq = string.format("%.3f", tonumber(route.neighborLinkQuality) or 0) @@ -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) diff --git a/applications/luci-app-olsr/po/de/olsr.po b/applications/luci-app-olsr/po/de/olsr.po index 2f387413ff..15b8412a26 100644 --- a/applications/luci-app-olsr/po/de/olsr.po +++ b/applications/luci-app-olsr/po/de/olsr.po @@ -1201,6 +1201,10 @@ msgstr "" #~ msgid "Status" #~ msgstr "Status" +#: application/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97 +msgid "Selected" +msgstr "Ausgewählt" + #~ msgid "Device" #~ msgstr "Schnittstelle" diff --git a/applications/luci-app-olsr/po/en/olsr.po b/applications/luci-app-olsr/po/en/olsr.po index bd7ee6fcbf..a009f84854 100644 --- a/applications/luci-app-olsr/po/en/olsr.po +++ b/applications/luci-app-olsr/po/en/olsr.po @@ -1088,6 +1088,10 @@ msgstr "" msgid "yes" msgstr "" +#: application/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97 +msgid "Selected" +msgstr "" + #~ msgid "" #~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, " #~ "configured on port 2006 and accepts connections from \"127.0.0.1\"." diff --git a/applications/luci-app-olsr/po/templates/olsr.pot b/applications/luci-app-olsr/po/templates/olsr.pot index 49f5d63501..521af613ed 100644 --- a/applications/luci-app-olsr/po/templates/olsr.pot +++ b/applications/luci-app-olsr/po/templates/olsr.pot @@ -1073,3 +1073,8 @@ msgstr "" #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135 msgid "yes" msgstr "" + +#: application/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97 +msgid "Selected" +msgstr "" + -- 2.30.2