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 <isprotejesvalkata@gmail.com>

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 91624f3b30fe0c853c2e3e8e17ab19af8926e42e..d1fdb22852f1eafd9c9b87014714845cd26c3f02 100644 (file)
--- 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(
                                        '<div class="tr cbi-section-table-row cbi-rowstyle-'+(1 + (idx % 2))+'">' +
-                                               '<div class="td cbi-section-table-titles"><a href="%s">%s</a></div>' +
-                                               '<div class="td cbi-section-table-titles">%s</div>' +
-                                               '<div class="td cbi-section-table-titles"><a href="http://%s/cgi-bin-status.html">%s</a></div>' +
+                                               '<div class="td cbi-section-table-cell" style="text-align: left"><a href="%s">%s</a></div>' +
+                                               '<div class="td cbi-section-table-cell" style="text-align: left">%s</div>' +
+                                               '<div class="td cbi-section-table-cell" style="text-align: left"><a href="http://%s/cgi-bin-status.html">%s</a></div>' +
                                        '</div>',
                                        service.url, service.descr, service.proto, service.origin_link, service.origin || '?'
                                        );
@@ -153,15 +153,12 @@ end
        <fieldset class="cbi-section">
        <legend><%:Internal services%></legend>
        <div class="table cbi-section-table">
-               <div class="thead">
                        <div class="tr cbi-section-table-titles">
                                <div class="th cbi-section-table-cell"><%:Url%></div>
                                <div class="th cbi-section-table-cell"><%:Protocol%></div>
                                <div class="th cbi-section-table-cell"><%:Source%></div>
                        </div>
-               </div>
 
-               <div class="tbody" id="olsr_services">
        <%
                for k, line in ipairs(services) do
                        local field = {}
@@ -178,13 +175,12 @@ end
                        %>
 
                        <div class="tr cbi-section-table-row cbi-rowstyle-<%=i%>">
-                               <div class="td cbi-section-table-titles"><a href="<%=url%>"><%=descr%></a></div>
-                               <div class="td cbi-section-table-titles"><%=proto%></div>
-                               <div class="td cbi-section-table-titles"><a href="http://<%=origin_link%>/cgi-bin-status.html"><%=origin%></a></div>
+                               <div class="td cbi-section-table-cell" style="text-align: left"><a href="<%=url%>"><%=descr%></a></div>
+                               <div class="td cbi-section-table-cell" style="text-align: left"><%=proto%></div>
+                               <div class="td cbi-section-table-cell" style="text-align: left"><a href="http://<%=origin_link%>/cgi-bin-status.html"><%=origin%></a></div>
                        </div>
                        <% i = ((i % 2) + 1)
                end %>
-               </div>
        </div>
        <br />
        <%=last_update%>

diff --git a/applications/luci-app-olsr/luasrc/controller/olsr.lua b/applications/luci-app-olsr/luasrc/controller/olsr.lua
index dc424c011462cefdb19a52878a6a39afbb4beb36..11e27d7c00e83e278236a6573812a9ca6b50f22f 100644 (file)
--- 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 1c178f18103c017757af2cbb21013f67422d0fa7..61c7cc21abc96cae202ef517c202db05edbaf515 100644 (file)
--- 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(
-                                '<div class="td cbi-section-table-cell">%s</div>' +
-                                '<div class="td cbi-section-table-cell">%s</div>' +
-                                '<div class="td cbi-section-table-cell">%s</div>', hna.destination + '/' + hna.genmask, linkgw + hostname, validity
+                                '<div class="td cbi-section-table-cell" style="text-align: left">%s</div>' +
+                                '<div class="td cbi-section-table-cell" style="text-align: left">%s</div>' +
+                                '<div class="td cbi-section-table-cell" style="text-align: left">%s</div>', hna.destination + '/' + hna.genmask, linkgw + hostname, validity
                                 )
                        s += '</div>'
                }
@@ -79,20 +79,17 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
 
        <legend><%:Overview of currently active OLSR host net announcements%></legend>
        <div class="table cbi-section-table">
-               <div class="thead">
                <div class="tr cbi-section-table-titles">
                        <div class="th cbi-section-table-cell"><%:Announced network%></div>
                        <div class="th cbi-section-table-cell"><%:OLSR gateway%></div>
                        <div class="th cbi-section-table-cell"><%:Validity Time%></div>
                </div>
 
-               </div>
-               <div class="tbody" id="olsrd_hna">
                <% for k, route in ipairs(hna) do %>
 
                <div class="tr cbi-section-table-row cbi-rowstyle-<%=i%> proto-<%=hna[k].proto%>">
-                       <div class="td cbi-section-table-cell"><%=hna[k].destination%>/<%=hna[k].genmask%> </div>
-                       <div class="td cbi-section-table-cell">
+                       <div class="td cbi-section-table-cell" style="text-align: left"><%=hna[k].destination%>/<%=hna[k].genmask%> </div>
+                       <div class="td cbi-section-table-cell" style="text-align: left">
                                <% if hna[k].proto == '6' then %>
                                <a href="http://[<%=hna[k].gateway%>]/cgi-bin-status.html"><%=hna[k].gateway%></a>
                                <% else %>
@@ -108,12 +105,11 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
                                validity = '-'
                        end %>
 
-                       <div class="td cbi-section-table-cell"><%=validity%></div>
+                       <div class="td cbi-section-table-cell" style="text-align: left"><%=validity%></div>
                </div>
 
                <% i = ((i % 2) + 1)
                end %>
-               </div>
        </div>
 </fieldset>
 

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 7506f0702992b6e1a258a4ff74d104dfd4052ce4..639dbc23e9ed950b3d95ed9e9c387b19167a6425 100644 (file)
--- 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
        <div class="table cbi-section-table">
                <div class="tr">
                        <div class="th cbi-section-table-cell"><%:Interface%></div>
+                       <div class="th cbi-section-table-cell"><%:Device%></div>
                        <div class="th cbi-section-table-cell"><%:State%></div>
                        <div class="th cbi-section-table-cell"><%:MTU%></div>
                        <div class="th cbi-section-table-cell"><%:WLAN%></div>
@@ -32,13 +33,14 @@ local i = 1
                <% for k, iface in ipairs(iface) do %>
 
                <div class="tr cbi-section-table-row cbi-rowstyle-<%=i%> proto-<%=iface.proto%>">
-                       <div class="td cbi-section-table-cell"><%=iface.name%></div>
-                       <div class="td cbi-section-table-cell"><%=iface.olsrInterface.up and luci.i18n.translate('up') or luci.i18n.translate('down')%></div>
-                       <div class="td cbi-section-table-cell"><%=iface.olsrInterface.mtu%></div>
-                       <div class="td cbi-section-table-cell"><%=iface.olsrInterface.wireless and luci.i18n.translate('yes') or luci.i18n.translate('no')%></div>
-                       <div class="td cbi-section-table-cell"><%=iface.olsrInterface.ipAddress%></div>
-                       <div class="td cbi-section-table-cell"><%=iface.olsrInterface.ipv4Address ~= '0.0.0.0' and iface.olsrInterface.ipv4Netmask%></div>
-                       <div class="td cbi-section-table-cell"><%=iface.olsrInterface.ipv4Address ~= '0.0.0.0' and iface.olsrInterface.ipv4Broadcast or iface.olsrInterface.ipv6Multicast%></div>
+                       <div class="td cbi-section-table-cell" style="text-align: left"><%=iface.interface%></div>
+                       <div class="td cbi-section-table-cell" style="text-align: left"><%=iface.name%></div>
+                       <div class="td cbi-section-table-cell" style="text-align: left"><%=iface.olsrInterface.up and luci.i18n.translate('up') or luci.i18n.translate('down')%></div>
+                       <div class="td cbi-section-table-cell" style="text-align: left"><%=iface.olsrInterface.mtu%></div>
+                       <div class="td cbi-section-table-cell" style="text-align: left"><%=iface.olsrInterface.wireless and luci.i18n.translate('yes') or luci.i18n.translate('no')%></div>
+                       <div class="td cbi-section-table-cell" style="text-align: left"><%=iface.olsrInterface.ipAddress%></div>
+                       <div class="td cbi-section-table-cell" style="text-align: left"><%=iface.olsrInterface.ipv4Address ~= '0.0.0.0' and iface.olsrInterface.ipv4Netmask%></div>
+                       <div class="td cbi-section-table-cell" style="text-align: left"><%=iface.olsrInterface.ipv4Address ~= '0.0.0.0' and iface.olsrInterface.ipv4Broadcast or iface.olsrInterface.ipv6Multicast%></div>
                </div>
                <% 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 9babd50a801e5919f789b09f6c38167705e307c6..705b905e9001ae8dc559eab3dd64d243fa3a62af 100644 (file)
--- 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
                %>
 
                <div class="tr cbi-section-table-row cbi-rowstyle-<%=i%> proto-<%=mid.proto%>">
-                       <div class="td cbi-section-table-cell"><a href="http://<%=host%>/cgi-bin-status.html"><%=mid.main.ipAddress%></a></div>
-                       <div class="td cbi-section-table-cell"><%=aliases%></div>
+                       <div class="td cbi-section-table-cell" style="text-align: left"><a href="http://<%=host%>/cgi-bin-status.html"><%=mid.main.ipAddress%></a></div>
+                       <div class="td cbi-section-table-cell" style="text-align: left"><%=aliases%></div>
                </div>
 
                <% 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 29ea95694c3702d951c8d768698de5fbe389bb67..4432cb541647104d09dc7801dc923b9829515950 100644 (file)
--- 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(
                                                        '<div class="tr cbi-section-table-row cbi-rowstyle-'+(1 + (idx % 2))+' proto-%s">' +
-                                                       '<div class="td cbi-section-table-titles" style="background-color:%s"><a href="http://[%s]/cgi-bin-status.html">%s</a></div>',
+                                                       '<div class="td cbi-section-table-cell" style="background-color:%s; text-align: left"><a href="http://[%s]/cgi-bin-status.html">%s</a></div>',
                                                        neigh.proto, neigh.dfgcolor, neigh.rip, neigh.rip
                                                );
                                        } else {
                                                s += String.format(
                                                        '<div class="tr cbi-section-table-row cbi-rowstyle-'+(1 + (idx % 2))+' proto-%s">' +
-                                                       '<div class="td cbi-section-table-titles" style="background-color:%s"><a href="http://%s/cgi-bin-status.html">%s</a></div>',
+                                                       '<div class="td cbi-section-table-cell" style="background-color:%s; text-align: left"><a href="http://%s/cgi-bin-status.html">%s</a></div>',
                                                        neigh.proto, neigh.dfgcolor, neigh.rip, neigh.rip
                                                );
                                        }
                                        if (neigh.hn) {
                                                s += String.format(
-                                                       '<div class="td cbi-section-table-titles" style="background-color:%s"><a href="http://%s/cgi-bin-status.html">%s</a></div>',
+                                                       '<div class="td cbi-section-table-cell" style="background-color:%s; text-align: left"><a href="http://%s/cgi-bin-status.html">%s</a></div>',
                                                        neigh.dfgcolor, neigh.hn, neigh.hn
                                                );
                                        } else {
                                                s += String.format(
-                                                       '<div class="td cbi-section-table-titles" style="background-color:%s">?</div>',
+                                                       '<div class="td cbi-section-table-cell" style="background-color:%s; text-align: left">?</div>',
                                                        neigh.dfgcolor
                                                );
                                        }
                                        s += String.format(
-                                               '<div class="td cbi-section-table-titles" style="background-color:%s">%s</div>' +
-                                               '<div class="td cbi-section-table-titles" style="background-color:%s">%s</div>' +
-                                               '<div class="td cbi-section-table-titles" style="background-color:%s">%s</div>' +
-                                               '<div class="td cbi-section-table-titles" style="background-color:%s">%s</div>' +
-                                               '<div class="td cbi-section-table-titles" style="background-color:%s">%s</div>' +
-                                               '<div class="td cbi-section-table-titles" style="background-color:%s" title="Signal: %s Noise: %s">%s</div>' +
+                                               '<div class="td cbi-section-table-cell" style="background-color:%s; text-align: left">%s</div>' +
+                                               '<div class="td cbi-section-table-cell" style="background-color:%s; text-align: left">%s</div>' +
+                                               '<div class="td cbi-section-table-cell" style="background-color:%s; text-align: left">%s</div>' +
+                                               '<div class="td cbi-section-table-cell" style="background-color:%s; text-align: left">%s</div>' +
+                                               '<div class="td cbi-section-table-cell" style="background-color:%s; text-align: left">%s</div>' +
+                                               '<div class="td cbi-section-table-cell" style="background-color:%s; text-align: left" title="Signal: %s Noise: %s">%s</div>' +
                                                '</div>',
                                                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
        <legend><%:Overview of currently established OLSR connections%></legend>
 
        <div class="table cbi-section-table">
-               <div class="thead">
-                       <div class="tr cbi-section-table-titles">
+                       <div class="tr cbi-section-table-cell">
                                <div class="th cbi-section-table-cell"><%:Neighbour IP%></div>
                                <div class="th cbi-section-table-cell"><%:Hostname%></div>
                                <div class="th cbi-section-table-cell"><%:Interface%></div>
@@ -123,9 +122,7 @@ end
                                <div class="th cbi-section-table-cell">ETX</div>
                                <div class="th cbi-section-table-cell">SNR</div>
                        </div>
-               </div>
        
-               <div class="tbody" id="olsr_neigh_table">
                <%      local i = 1
                        for k, link in ipairs(links) do
                        link.linkCost = tonumber(link.linkCost) or 0
@@ -148,22 +145,21 @@ end
 
                <div class="tr cbi-section-table-row cbi-rowstyle-<%=i%> proto-<%=link.proto%>">
                        <% if link.proto == "6" then %>
-                       <div class="td cbi-section-table-titles" style="background-color:<%=defaultgw_color%>"><a href="http://[<%=link.remoteIP%>]/cgi-bin-status.html"><%=link.remoteIP%></a></div>
+                       <div class="td cbi-section-table-cell" style="background-color:<%=defaultgw_color%>; text-align: left"><a href="http://[<%=link.remoteIP%>]/cgi-bin-status.html"><%=link.remoteIP%></a></div>
                        <% else %>
-                       <div class="td cbi-section-table-titles" style="background-color:<%=defaultgw_color%>"><a href="http://<%=link.remoteIP%>/cgi-bin-status.html"><%=link.remoteIP%></a></div>
+                       <div class="td cbi-section-table-cell" style="background-color:<%=defaultgw_color%>; text-align: left"><a href="http://<%=link.remoteIP%>/cgi-bin-status.html"><%=link.remoteIP%></a></div>
                        <% end %>
-                       <div class="td cbi-section-table-titles" style="background-color:<%=defaultgw_color%>"><a href="http://<%=link.hostname%>/cgi-bin-status.html"><%=link.hostname%></a></div>
-                       <div class="td cbi-section-table-titles" style="background-color:<%=defaultgw_color%>"><%=link.interface%></div>
-                       <div class="td cbi-section-table-titles" style="background-color:<%=defaultgw_color%>"><%=link.localIP%></div>
-                       <div class="td cbi-section-table-titles" style="background-color:<%=defaultgw_color%>"><%=string.format("%.3f", link.linkQuality)%></div>
-                       <div class="td cbi-section-table-titles" style="background-color:<%=defaultgw_color%>"><%=string.format("%.3f", link.neighborLinkQuality)%></div>
-                       <div class="td cbi-section-table-titles" style="background-color:<%=color%>"><%=string.format("%.3f", link.linkCost)%></div>
-                       <div class="td cbi-section-table-titles" style="background-color:<%=snr_color%>" title="Signal: <%=link.signal%> Noise: <%=link.noise%>"><%=link.snr%></div>
+                       <div class="td cbi-section-table-cell" style="background-color:<%=defaultgw_color%>; text-align: left"><a href="http://<%=link.hostname%>/cgi-bin-status.html"><%=link.hostname%></a></div>
+                       <div class="td cbi-section-table-cell" style="background-color:<%=defaultgw_color%>; text-align: left"><%=link.interface%></div>
+                       <div class="td cbi-section-table-cell" style="background-color:<%=defaultgw_color%>; text-align: left"><%=link.localIP%></div>
+                       <div class="td cbi-section-table-cell" style="background-color:<%=defaultgw_color%>; text-align: left"><%=string.format("%.3f", link.linkQuality)%></div>
+                       <div class="td cbi-section-table-cell" style="background-color:<%=defaultgw_color%>; text-align: left"><%=string.format("%.3f", link.neighborLinkQuality)%></div>
+                       <div class="td cbi-section-table-cell" style="background-color:<%=color%>; text-align: left"><%=string.format("%.3f", link.linkCost)%></div>
+                       <div class="td cbi-section-table-cell" style="background-color:<%=snr_color%>; text-align: left" title="Signal: <%=link.signal%> Noise: <%=link.noise%>"><%=link.snr%></div>
                </div>
                <% 
                        i = ((i % 2) + 1)
                end %>
-               </div>
        </div>
 <br />
 

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 4b733524a5b9d05d40de02565ab9719428b40ae5..a03bd5ad27852c84f4dfc84ae7b74d1cb09b8cb7 100644 (file)
--- 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(
                                                '<div class="tr cbi-section-table-row cbi-rowstyle-'+(1 + (idx % 2))+' proto-%s">' +
-                                                       '<div class="td cbi-section-table-cell">%s/%s</div>' +
-                                                       '<div class="td cbi-section-table-cell">' +
+                                                       '<div class="td cbi-section-table-cell" style="text-align: left">%s/%s</div>' +
+                                                       '<div class="td cbi-section-table-cell" style="text-align: left">' +
                                                                '<a href="http://%s/cgi-bin-status.html">%s</a>',
                                                                route.proto, route.dest, route.genmask, route.gw, route.gw
                                                )
@@ -72,9 +72,9 @@ XHR.poll(20, '<%=REQUEST_URI%>', { status: 1 },
                                        }
                                        s += String.format(
                                                        '</div>' +
-                                                       '<div class="td cbi-section-table-cell">%s</div>' +
-                                                       '<div class="td cbi-section-table-cell">%s</div>' +
-                                                       '<div class="td cbi-section-table-cell" style="background-color:%s">%s</div>' +
+                                                       '<div class="td cbi-section-table-cell" style="text-align: left">%s</div>' +
+                                                       '<div class="td cbi-section-table-cell" style="text-align: left">%s</div>' +
+                                                       '<div class="td cbi-section-table-cell" style="background-color:%s; text-align: left">%s</div>' +
                                                '</div>',
                                                route.interface, route.metric, route.color, route.etx || '?'
                                        );
@@ -96,7 +96,6 @@ XHR.poll(20, '<%=REQUEST_URI%>', { status: 1 },
 <legend><%:Overview of currently known routes to other OLSR nodes%></legend>
 
 <div class="table cbi-section-table">
-       <div class="thead">
                <div class="tr cbi-section-table-titles">
                        <div class="th cbi-section-table-cell"><%:Announced network%></div>
                        <div class="th cbi-section-table-cell"><%:OLSR gateway%></div>
@@ -104,18 +103,15 @@ XHR.poll(20, '<%=REQUEST_URI%>', { status: 1 },
                        <div class="th cbi-section-table-cell"><%:Metric%></div>
                        <div class="th cbi-section-table-cell">ETX</div>
                </div>
-       </div>
-
-       <div class="tbody" id="olsrd_routes">
 
        <% 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)
        %>
 
                <div class="tr cbi-section-table-row cbi-rowstyle-<%=i%> proto-<%=route.proto%>">
-                       <div class="td cbi-section-table-cell"><%=route.destination%>/<%=route.genmask%></div>
-                       <div class="td cbi-section-table-cell">
+                       <div class="td cbi-section-table-cell" style="text-align: left"><%=route.destination%>/<%=route.genmask%></div>
+                       <div class="td cbi-section-table-cell" style="text-align: left">
                                <% if route.proto == '6' then %>
                                <a href="http://[<%=route.gateway%>]/cgi-bin-status.html"><%=route.gateway%></a>
                                <% else  %>
@@ -125,14 +121,13 @@ XHR.poll(20, '<%=REQUEST_URI%>', { status: 1 },
                                        / <a href="http://<%=route.Hostname%>/cgi-bin-status.html"><%=route.hostname%></a>  
                                <% end %>
                        </div>
-                       <div class="td cbi-section-table-cell"><%=route.networkInterface%></div>
-                       <div class="td cbi-section-table-cell"><%=route.metric%></div>
-                       <div class="td cbi-section-table-cell" style="background-color:<%=color%>"><%=string.format("%.3f", ETX)%></div>
+                       <div class="td cbi-section-table-cell" style="text-align: left"><%=route.networkInterface%></div>
+                       <div class="td cbi-section-table-cell" style="text-align: left"><%=route.metric%></div>
+                       <div class="td cbi-section-table-cell" style="background-color:<%=color%>; text-align: left"><%=string.format("%.3f", ETX)%></div>
                </div>
        <% 
                i = ((i % 2) + 1)
        end %>
-       </div>
 </div>
 
 <%+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 d0c65770acc49f82b414ec752e59feafd5bc2c51..b5c68cdf12ea7bd39a2a86b73de23b4634b1f3ec 100644 (file)
--- 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,
@@ -63,15 +63,15 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
                        }
 
                        s += String.format(
-                                '<div class="td cbi-section-table-cell">%s</div>' +
-                                '<div class="td cbi-section-table-cell">%s</div>' +
-                                '<div class="td cbi-section-table-cell">%s</div>' +
-                                '<div class="td cbi-section-table-cell">%s</div>' +
-                                '<div class="td cbi-section-table-cell">%s</div>' +
-                                '<div class="td cbi-section-table-cell">%s</div>' +
-                                '<div class="td cbi-section-table-cell">%s</div>' +
-                                '<div class="td cbi-section-table-cell">%s</div>' +
-                                '<div class="td cbi-section-table-cell">%s</div>',
+                                '<div class="td cbi-section-table-cell" style="text-align: left">%s</div>' +
+                                '<div class="td cbi-section-table-cell" style="text-align: left">%s</div>' +
+                                '<div class="td cbi-section-table-cell" style="text-align: left">%s</div>' +
+                                '<div class="td cbi-section-table-cell" style="text-align: left">%s</div>' +
+                                '<div class="td cbi-section-table-cell" style="text-align: left">%s</div>' +
+                                '<div class="td cbi-section-table-cell" style="text-align: left">%s</div>' +
+                                '<div class="td cbi-section-table-cell" style="text-align: left">%s</div>' +
+                                '<div class="td cbi-section-table-cell" style="text-align: left">%s</div>' +
+                                '<div class="td cbi-section-table-cell" style="text-align: left">%s</div>',
                                linkgw, smartgw.selected, smartgw.cost, smartgw.hops, smartgw.uplink, smartgw.downlink, smartgw.v4, smartgw.v6, smartgw.prefix
                                 )
                        s += '</div>'
@@ -82,9 +82,6 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
 );
 //]]></script>
 
-
-<%+header%>
-
 <h2 name="content"><%:SmartGW announcements%></h2>
 
 <div id="togglebuttons"></div>
@@ -94,7 +91,6 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
        <fieldset class="cbi-section">
                <legend><%:Overview of smart gateways in this network%></legend>
                <div class="table cbi-section-table">
-                       <div class="thead">
                        <div class="tr cbi-section-table-titles">
                                <div class="th cbi-section-table-cell"><%:Gateway%></div>
                                <div class="th cbi-section-table-cell"><%:Selected%></div>
@@ -107,37 +103,34 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
                                <div class="th cbi-section-table-cell"><%:Prefix%></div>
 
                        </div>
-                       </div>
 
-                       <div class="tbody" id="olsrd_smartgw">
-                       <% 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
                        %>
 
                        <div class="tr cbi-section-table-row cbi-rowstyle-<%=i%> proto-<%=proto%>">
                                <% if gw.proto == '6' then %>
-                                       <div class="td cbi-section-table-cell"><a href="http://[<%=gw.originator%>]/cgi-bin-status.html"><%=gw.originator%></a></div>
+                                       <div class="td cbi-section-table-cell" style="text-align: left"><a href="http://[<%=gw.originator%>]/cgi-bin-status.html"><%=gw.originator%></a></div>
                                <% else %>
-                                       <div class="td cbi-section-table-cell"><a href="http://<%=gw.originator%>/cgi-bin-status.html"><%=gw.originator%></a></div>
+                                       <div class="td cbi-section-table-cell" style="text-align: left"><a href="http://<%=gw.originator%>/cgi-bin-status.html"><%=gw.originator%></a></div>
                                <% end %>
 
-                               <div class="td cbi-section-table-cell"><%=gw.selected and luci.i18n.translate('yes') or luci.i18n.translate('no')%></div>
-                               <div class="td cbi-section-table-cell"><%=string.format("%.3f", gw.cost)%></div>
-                               <div class="td cbi-section-table-cell"><%=gw.hops%></div>
-                               <div class="td cbi-section-table-cell"><%=gw.uplink%></div>
-                               <div class="td cbi-section-table-cell"><%=gw.downlink%></div>
-                               <div class="td cbi-section-table-cell"><%=gw.IPv4 and luci.i18n.translate('yes') or luci.i18n.translate('no')%></div>
-                               <div class="td cbi-section-table-cell"><%=gw.IPv6 and luci.i18n.translate('yes') or luci.i18n.translate('no')%></div>
-                               <div class="td cbi-section-table-cell"><%=gw.prefix%></div>
+                               <div class="td cbi-section-table-cell" style="text-align: left"><%=gw.selected and luci.i18n.translate('yes') or luci.i18n.translate('no')%></div>
+                               <div class="td cbi-section-table-cell" style="text-align: left"><%=gw.cost > 0 and string.format("%.3f", gw.cost) or luci.i18n.translate('infinate')%></div>
+                               <div class="td cbi-section-table-cell" style="text-align: left"><%=gw.hops%></div>
+                               <div class="td cbi-section-table-cell" style="text-align: left"><%=gw.uplink%></div>
+                               <div class="td cbi-section-table-cell" style="text-align: left"><%=gw.downlink%></div>
+                               <div class="td cbi-section-table-cell" style="text-align: left"><%=gw.IPv4 and luci.i18n.translate('yes') or luci.i18n.translate('no')%></div>
+                               <div class="td cbi-section-table-cell" style="text-align: left"><%=gw.IPv6 and luci.i18n.translate('yes') or luci.i18n.translate('no')%></div>
+                               <div class="td cbi-section-table-cell" style="text-align: left"><%=gw.prefix%></div>
                        </div>
 
                        <% i = ((i % 2) + 1)
                        end %>
-                       </div>
                </div>
        </fieldset>
 

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 02fdfddac33be7073f2b47262513703e8ccf2d69..70b3d998544eb22c431089489a7aa70b57c264c4 100644 (file)
--- 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"
                </div>
 
                <% 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 %>
 
-                       <div class="td cbi-section-table-cell"><a href="http://[<%=route.destinationIP%>]/cgi-bin-status.html"><%=route.destinationIP%></a></div>
-                       <div class="td cbi-section-table-cell"><a href="http://[<%=route.lastHopIP%>]/cgi-bin-status.html"><%=route.lastHopIP%></a></div>
+                       <div class="td cbi-section-table-cell" style="text-align: left"><a href="http://[<%=route.destinationIP%>]/cgi-bin-status.html"><%=route.destinationIP%></a></div>
+                       <div class="td cbi-section-table-cell" style="text-align: left"><a href="http://[<%=route.lastHopIP%>]/cgi-bin-status.html"><%=route.lastHopIP%></a></div>
 
                        <% else %>
 
-                       <div class="td cbi-section-table-cell"><a href="http://<%=route.destinationIP%>/cgi-bin-status.html"><%=route.destinationIP%></a></div>
-                       <div class="td cbi-section-table-cell"><a href="http://<%=route.lastHopIP%>/cgi-bin-status.html"><%=route.lastHopIP%></a></div>
+                       <div class="td cbi-section-table-cell" style="text-align: left"><a href="http://<%=route.destinationIP%>/cgi-bin-status.html"><%=route.destinationIP%></a></div>
+                       <div class="td cbi-section-table-cell" style="text-align: left"><a href="http://<%=route.lastHopIP%>/cgi-bin-status.html"><%=route.lastHopIP%></a></div>
 
                        <%end%>
 
-                       <div class="td cbi-section-table-cell"><%=lq%></div>
-                       <div class="td cbi-section-table-cell"><%=nlq%></div>
-                       <div class="td cbi-section-table-cell" style="background-color:<%=color%>"><%=cost%></div>
+                       <div class="td cbi-section-table-cell" style="text-align: left"><%=lq%></div>
+                       <div class="td cbi-section-table-cell" style="text-align: left"><%=nlq%></div>
+                       <div class="td cbi-section-table-cell" style="background-color:<%=color%>; text-align: left"><%=cost%></div>
                </div>
 
                <%      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 a23a20d58c35be5e9f2211cfc6e4613ba966a706..2a95ce5fc7ee7f2c086bf38cf6f8e4e20a6d455f 100644 (file)
--- a/applications/luci-app-olsr/po/de/olsr.po
+++ b/applications/luci-app-olsr/po/de/olsr.po
@@ -803,6 +803,13 @@ msgstr ""
 msgid "yes"
 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 131005e1eebcbdb604f2e13e37f02d50c2e4826a..188c4bd5101851479aeb34d37c0b8b7dc8fc002a 100644 (file)
--- a/applications/luci-app-olsr/po/en/olsr.po
+++ b/applications/luci-app-olsr/po/en/olsr.po
@@ -693,6 +693,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 6bd63c2a2aa4044c0fa107b310a776b62af19e2d..b60e003a9f3386bb4e5a90e64532eacbc17cfc0d 100644 (file)
--- a/applications/luci-app-olsr/po/templates/olsr.pot
+++ b/applications/luci-app-olsr/po/templates/olsr.pot
@@ -678,3 +678,8 @@ msgstr ""
 
 msgid "yes"
 msgstr ""
+
+#: application/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
+msgid "Selected"
+msgstr ""
+