applications/luci-olsr: Use jsoninfo instead of txtinfo as data source.

[project/luci.git] / applications / luci-olsr / luasrc / view / status-olsr / mid.htm

diff --git a/applications/luci-olsr/luasrc/view/status-olsr/mid.htm b/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
index 48823b5bc1335c11e44f2d403b91aefd46b853a9..ec5caaa953c8e730c18644d9776f49533fee5cd3 100644 (file)
--- a/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
@@ -20,6 +20,7 @@ local i = 1
 <%+header%>
 <h2><a id="content" name="content"><%:Active MID announcements%></a></h2>
 
+<div id="togglebuttons"></div> 
 <fieldset class="cbi-section">
        <legend><%:Overview of known multiple interface announcements%></legend>
        <table class="cbi-section-table">
@@ -28,15 +29,30 @@ local i = 1
                        <th class="cbi-section-table-cell" ><%:Secondary OLSR interfaces%></th>
                </tr>
 
-               <% for k, mid in ipairs(mids) do %>
-
-               <tr class="cbi-section-table-row cbi-rowstyle-<%=i%>">
-                       <td class="cbi-section-table-cell"><a href="http://<%=mid["IP address"]%>/cgi-bin-status.html"><%=mid["IP address"]%></a></td>
-                       <td class="cbi-section-table-cell"><%=mid.Aliases%></td>
+               <% for k, mid in ipairs(mids) do 
+                       local aliases = ''
+                       for k,v in ipairs(mid.aliases) do
+                               if aliases == '' then
+                                       sep = ''
+                               else
+                                       sep = ', '
+                               end
+                               aliases = v.ipAddress .. sep .. aliases
+                       end
+                       local host = mid.ipAddress
+                       if mid.proto == '6' then
+                               host = '[' .. mid.ipAddress .. ']'
+                       end
+               %>
+
+               <tr class="cbi-section-table-row cbi-rowstyle-<%=i%> proto-<%=mid.proto%>">
+                       <td class="cbi-section-table-cell"><a href="http://<%=host%>/cgi-bin-status.html"><%=mid.ipAddress%></a></td>
+                       <td class="cbi-section-table-cell"><%=aliases%></td>
                </tr>
 
                <% i = ((i % 2) + 1)
                end %>
        </table>
 </fieldset>
+<%+status-olsr/common_js%>
 <%+footer%>