From 55eff45f96b435de2d3d94a0189ff99473e7828d Mon Sep 17 00:00:00 2001
From: lemoer <git@irrelefant.net>
Date: Sun, 24 Nov 2019 02:38:55 +0100
Subject: [PATCH] gluon-status-page: prettify nextnode when node is offline
---
.../files/lib/gluon/status-page/view/status-page.html | 2 +-
package/gluon-status-page/javascript/status-page.js | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/package/gluon-status-page/files/lib/gluon/status-page/view/status-page.html b/package/gluon-status-page/files/lib/gluon/status-page/view/status-page.html
index 0054e61fc..cb7aaa111 100644
--- a/package/gluon-status-page/files/lib/gluon/status-page/view/status-page.html
+++ b/package/gluon-status-page/files/lib/gluon/status-page/view/status-page.html
@@ -135,7 +135,7 @@
<tr><th><%:Load average%></th><td><%= statistics('loadavg', 'decimal') %></td></tr>
<tr><th><%:RAM%></th><td><%= statistics('memory', 'memory') %></td></tr>
<tr><th><%:Filesystem%></th><td><%= statistics('rootfs_usage', 'percent') %></td></tr>
- <tr><th><%:Gateway%></th><td><%= statistics('gateway') %><br />via <%= statistics('gateway_nexthop', 'neighbour') %></td></tr>
+ <tr><th><%:Gateway%></th><td><%= statistics('gateway') %><br /><%= statistics('gateway_nexthop', 'neighbour') %></td></tr>
<tr><th><%:Clients%></th><td><%= statistics('clients/total') %></td></tr>
</table>
diff --git a/package/gluon-status-page/javascript/status-page.js b/package/gluon-status-page/javascript/status-page.js
index 005a08971..b81d21a70 100644
--- a/package/gluon-status-page/javascript/status-page.js
+++ b/package/gluon-status-page/javascript/status-page.js
@@ -113,15 +113,18 @@
return prettyBytes(bytes);
},
'neighbour': function(addr) {
+ if (!addr)
+ return '';
+
for (var i in interfaces) {
var iface = interfaces[i];
var neigh = iface.get_neigh(addr);
if (!neigh)
continue;
- return neigh.get_hostname() + ' (' + i + ')';
+ return 'via ' + neigh.get_hostname() + ' (' + i + ')';
}
- return addr + ' (unknown iface)';
+ return 'via ' + addr + ' (unknown iface)';
}
}
--
GitLab