From bd1f34da9f26d912cb74d4c8ed906b103ec30da3 Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Tue, 5 Mar 2019 14:50:46 +0100
Subject: [PATCH] OO-3930: Documentation of the Message Admin-Token
---
.../org/olat/admin/sysinfo/InfoMessageControllerSingleVM.java | 3 +++
src/main/java/org/olat/admin/sysinfo/_content/infomsg.html | 3 ++-
.../org/olat/admin/sysinfo/_i18n/LocalStrings_de.properties | 2 ++
.../org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties | 2 ++
4 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/olat/admin/sysinfo/InfoMessageControllerSingleVM.java b/src/main/java/org/olat/admin/sysinfo/InfoMessageControllerSingleVM.java
index b86e10739aa..d03d059da30 100644
--- a/src/main/java/org/olat/admin/sysinfo/InfoMessageControllerSingleVM.java
+++ b/src/main/java/org/olat/admin/sysinfo/InfoMessageControllerSingleVM.java
@@ -76,6 +76,9 @@ public class InfoMessageControllerSingleVM extends BasicController {
Property p = pm.findProperty(null, null, null, AdminModule.SYSTEM_PROPERTY_CATEGORY, AdminModule.PROPERTY_MAINTENANCE_MESSAGE);
String adminToken = (p == null ? "" : p.getStringValue());
infoMsgView.contextPut("admintoken", adminToken);
+ String protocol = Settings.getURIScheme().substring(0, Settings.getURIScheme().length()-1);
+ String changeUrl = Settings.getServerContextPathURI() + "admin.html?token=TOKEN&cmd=setinfomessage&msg=Lorem Ipsum";
+ infoMsgView.contextPut("admintokenusage", translate("infomsg.token.usage", new String[] { protocol, changeUrl }));
infomsgEditButton = LinkFactory.createButton("infomsgEdit", infoMsgView, this);
infomsgClearButton = LinkFactory.createButton("infomsgClear", infoMsgView, this);
diff --git a/src/main/java/org/olat/admin/sysinfo/_content/infomsg.html b/src/main/java/org/olat/admin/sysinfo/_content/infomsg.html
index 16e657962d3..84e597185df 100644
--- a/src/main/java/org/olat/admin/sysinfo/_content/infomsg.html
+++ b/src/main/java/org/olat/admin/sysinfo/_content/infomsg.html
@@ -1,5 +1,6 @@
<fieldset>
- <legend>Admin.</legend>
+ <legend>$r.translate("infomsg.token.title")</legend>
+ <p class="o_info">$admintokenusage</p>
<p><i>Message Admin-Token: $!admintoken</i></p>
</fieldset>
<div class="o_block_large">
diff --git a/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_de.properties
index c1c65473f2a..9a0ae42d777 100644
--- a/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_de.properties
@@ -57,6 +57,8 @@ infomsg.nomsg=Keine Info Meldung vorhanden
infomsg.preview=Vorschau
infomsg.title=Info Meldung (Login-Seite auf allen Nodes)
infomsg.title.cluster=Info Meldung (Login-Seite auf diesem Node)
+infomsg.token.title=Token zur Administration
+infomsg.token.usage=\u00C4nderung der Info Meldung per {0} request: {1}
infomsgClear=Info Meldung l\u00F6schen
infomsgClearCluster=Info Meldung l\u00F6schen
infomsgEdit=Info Meldung editieren
diff --git a/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties
index fe8b92b186e..49b4af8db7c 100644
--- a/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties
@@ -57,6 +57,8 @@ infomsg.nomsg=No message available
infomsg.preview=Preview
infomsg.title=Information (login page on all nodes)
infomsg.title.cluster=Information (login page on this node)
+infomsg.token.title=Administration token
+infomsg.token.usage=Change the info message by {0} request: {1}
infomsgClear=Delete info message
infomsgClearCluster=Delete info message
infomsgEdit=Edit message
--
GitLab