From 8a37f5600685b44848116e9670d14a7c255564e4 Mon Sep 17 00:00:00 2001
From: Manuel Munz <freifunk@somakoma.de>
Date: Sun, 5 Dec 2010 15:02:44 +0000
Subject: applications/luci-olsr: Add Hostnames, show v6 infos. Most parts of
 this are from patrick(at)lunatiki(dot)de again, thanks.

---
 applications/luci-olsr/luasrc/view/status-olsr/hna.htm    | 7 ++++++-
 applications/luci-olsr/luasrc/view/status-olsr/index.htm  | 6 +++++-
 applications/luci-olsr/luasrc/view/status-olsr/routes.htm | 7 ++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'applications/luci-olsr/luasrc/view')

diff --git a/applications/luci-olsr/luasrc/view/status-olsr/hna.htm b/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
index 0e153bbbc3..a7a14e4fad 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
@@ -24,7 +24,12 @@ $Id$
 <% for k, route in ipairs(routes) do %>
 <tr>
 <td><%=route.Destination%></td>
-<td><a href="http://<%=route.Gateway%>"><%=route.Gateway%></a></td>
+<td>
+<a href="http://<%=route.Gateway%>/cgi-bin-status.html"><%=route.Gateway%></a>
+<% if route.Hostname then %>
+        / <a href="http://<%=route.Hostname%>/cgi-bin-status.html"><%=route.Hostname%></a>
+<% end %>
+</td>
 </tr>
 <% end %>
 </table>
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/index.htm b/applications/luci-olsr/luasrc/view/status-olsr/index.htm
index fc8f76e2c9..786c859545 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/index.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/index.htm
@@ -19,7 +19,9 @@ $Id$
 <table class="smalltext" cellspacing="0" cellpadding="6">
 <tr>
 <th><%:Neighbour IP%></th>
+<th><%:Hostname%></th>
 <th><%:Local interface IP%></th>
+<th><%:Device%></th>
 <th>LQ</th>
 <th>NLQ</th>
 <th>ETX</th>
@@ -39,8 +41,10 @@ $Id$
 	end
 %>
 <tr>
-<td><a href="http://<%=link["Remote IP"]%>/cgi-bin-nodes.html"><%=link["Remote IP"]%></a></td>
+<td><a href="http://<%=link["Remote IP"]%>/cgi-bin-status.html"><%=link["Remote IP"]%></a></td>
+<td><a href="http://<%=link["Hostname"]%>/cgi-bin-status.html"><%=link["Hostname"]%></a></td>
 <td><%=link["Local IP"]%></td>
+<td><%=link["Local Device"]%></td>
 <td><%=link.LQ%></td>
 <td><%=link.NLQ%></td>
 <td style="background-color:<%=color%>"><%=string.format("%.3f", link.Cost)%></td>
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/routes.htm b/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
index 52bf101ccf..cad9c35884 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
@@ -40,7 +40,12 @@ $Id$
 %>
 <tr>
 <td><%=route.Destination%></td>
-<td><%=route["Gateway IP"]%></td>
+<td>
+<a href="http://<%=route["Gateway IP"]%>/cgi-bin-status.html"><%=route["Gateway IP"]%></a>
+<% if route.Hostname then %>
+	/ <a href="http://<%=route.Hostname%>/cgi-bin-status.html"><%=route.Hostname%></a>  
+<% end %>
+</td>
 <td><%=route.Interface%></td>
 <td><%=route.Metric%></td>
 <td style="background-color:<%=color%>"><%=string.format("%.3f", tonumber(route.ETX) or 0)%></td>
-- 
cgit v1.2.3