From 21397ce678c32539247196135e3c30d914d5c592 Mon Sep 17 00:00:00 2001
From: lemoer <git@irrelefant.net>
Date: Mon, 30 Sep 2019 02:00:17 +0200
Subject: [PATCH] gluon-status-page: add domain and site (#1820)
---
.../files/lib/gluon/status-page/view/status-page.html | 4 ++++
package/gluon-status-page/i18n/de.po | 6 ++++++
package/gluon-status-page/i18n/gluon-status-page.pot | 6 ++++++
.../luasrc/lib/gluon/status-page/controller/status-page.lua | 2 +-
4 files changed, 17 insertions(+), 1 deletion(-)
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 94c1d433e..6e18b010d 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
@@ -116,6 +116,10 @@
<% if nodeinfo.software.fastd then -%>
<dt><%:Mesh VPN%></dt><dd><%| enabled(nodeinfo.software.fastd.enabled) %></dd>
<%- end %>
+ <dt><%:Site%></dt><dd><%| site.site_name() %></dd>
+ <% if nodeinfo.system.domain_code then -%>
+ <dt><%:Domain%></dt><dd><%| site.domain_names[nodeinfo.system.domain_code]() %></dd>
+ <%- end %>
<% if nodeinfo.software.autoupdater then -%>
<dt><%:Automatic updates%></dt><dd><%| enabled(nodeinfo.software.autoupdater.enabled) %><%|
nodeinfo.software.autoupdater.enabled and
diff --git a/package/gluon-status-page/i18n/de.po b/package/gluon-status-page/i18n/de.po
index 2e2d54b9b..ede125ba2 100644
--- a/package/gluon-status-page/i18n/de.po
+++ b/package/gluon-status-page/i18n/de.po
@@ -117,3 +117,9 @@ msgstr "aktiviert"
msgid "not connected"
msgstr "nicht verbunden"
+
+msgid "Domain"
+msgstr "Domäne"
+
+msgid "Site"
+msgstr "Site"
diff --git a/package/gluon-status-page/i18n/gluon-status-page.pot b/package/gluon-status-page/i18n/gluon-status-page.pot
index 1b4cd75b1..08b6f3868 100644
--- a/package/gluon-status-page/i18n/gluon-status-page.pot
+++ b/package/gluon-status-page/i18n/gluon-status-page.pot
@@ -108,3 +108,9 @@ msgstr ""
msgid "not connected"
msgstr ""
+
+msgid "Domain"
+msgstr ""
+
+msgid "Site"
+msgstr ""
diff --git a/package/gluon-status-page/luasrc/lib/gluon/status-page/controller/status-page.lua b/package/gluon-status-page/luasrc/lib/gluon/status-page/controller/status-page.lua
index bdd46979e..ceb5d8552 100644
--- a/package/gluon-status-page/luasrc/lib/gluon/status-page/controller/status-page.lua
+++ b/package/gluon-status-page/luasrc/lib/gluon/status-page/controller/status-page.lua
@@ -82,5 +82,5 @@ entry({}, call(function(http, renderer)
end
- renderer.render('status-page', { nodeinfo = nodeinfo }, 'gluon-status-page')
+ renderer.render('status-page', { nodeinfo = nodeinfo, site = site }, 'gluon-status-page')
end))
--
GitLab