From 580b7357d5fe53e01c8845aec348fbae255b5e7f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 1 Dec 2019 16:22:34 +0100 Subject: [PATCH] Revert gluon-status-page gateway_nexthop changes This reverts commits - caf2dd037ba4b560a0794ce87d6a230e7a6cbcf8. - 07ebac6a49a288a3f5b7c7fc4e45a38b265ff929 - 55eff45f96b435de2d3d94a0189ff99473e7828d I accidentally pushed these commits as I had them lying around on a dirty checkout I did testing on. --- .../lib/gluon/status-page/view/status-page.html | 2 +- package/gluon-status-page/i18n/de.po | 3 --- .../i18n/gluon-status-page.pot | 3 --- .../gluon-status-page/javascript/status-page.js | 17 ----------------- 4 files changed, 1 insertion(+), 24 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 cb7aaa11..6e18b010 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 @@ <%:Load average%><%= statistics('loadavg', 'decimal') %> <%:RAM%><%= statistics('memory', 'memory') %> <%:Filesystem%><%= statistics('rootfs_usage', 'percent') %> - <%:Gateway%><%= statistics('gateway') %>
<%= statistics('gateway_nexthop', 'neighbour') %> + <%:Gateway%><%= statistics('gateway') %> <%:Clients%><%= statistics('clients/total') %> diff --git a/package/gluon-status-page/i18n/de.po b/package/gluon-status-page/i18n/de.po index 5caebfde..ef0374c0 100644 --- a/package/gluon-status-page/i18n/de.po +++ b/package/gluon-status-page/i18n/de.po @@ -55,9 +55,6 @@ msgstr "Weitergeleitet" msgid "Gateway" msgstr "Gateway" -msgid "Gateway Nexthop" -msgstr "Gateway Nexthop" - msgid "IP address" msgstr "IP-Adresse" diff --git a/package/gluon-status-page/i18n/gluon-status-page.pot b/package/gluon-status-page/i18n/gluon-status-page.pot index e471e878..766a5de8 100644 --- a/package/gluon-status-page/i18n/gluon-status-page.pot +++ b/package/gluon-status-page/i18n/gluon-status-page.pot @@ -46,9 +46,6 @@ msgstr "" msgid "Gateway" msgstr "" -msgid "Gateway Nexthop" -msgstr "" - msgid "IP address" msgstr "" diff --git a/package/gluon-status-page/javascript/status-page.js b/package/gluon-status-page/javascript/status-page.js index b81d21a7..e3405cf6 100644 --- a/package/gluon-status-page/javascript/status-page.js +++ b/package/gluon-status-page/javascript/status-page.js @@ -112,20 +112,6 @@ 'bytes': function(bytes) { 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 'via ' + neigh.get_hostname() + ' (' + i + ')'; - } - - return 'via ' + addr + ' (unknown iface)'; - } } @@ -596,9 +582,6 @@ } return { - 'get_hostname': function() { - return hostname.textContent; - }, 'update_nodeinfo': function(nodeinfo) { var addr = choose_address(nodeinfo.network.addresses); if (addr) {