From 5adbf84d18876a4cbd893ebfeb538e8cb41197f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Gn=C3=A4gi?= <gnaegi@frentix.com>
Date: Wed, 8 Jul 2020 00:27:51 +0200
Subject: [PATCH] OO-4791 make ooteach appear in author site help, fix
delimiter issue and icon
---
.../olat/core/commons/services/help/HelpModule.java | 10 ++++++++--
src/main/resources/serviceconfig/olat.properties | 8 ++++----
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/olat/core/commons/services/help/HelpModule.java b/src/main/java/org/olat/core/commons/services/help/HelpModule.java
index 55cdbca5e88..c86b2f9f65f 100644
--- a/src/main/java/org/olat/core/commons/services/help/HelpModule.java
+++ b/src/main/java/org/olat/core/commons/services/help/HelpModule.java
@@ -819,7 +819,10 @@ public class HelpModule extends AbstractSpringModule {
String enabled = usertool ? USERTOOL : "";
enabled += authorsite ? DELIMITER + AUTHORSITE : "";
enabled += login ? DELIMITER + DMZ : "";
-
+ // remove trailing delimiter
+ if (enabled.startsWith(DELIMITER)) {
+ enabled = enabled.substring(DELIMITER.length());
+ }
return enabled;
}
@@ -892,7 +895,10 @@ public class HelpModule extends AbstractSpringModule {
*/
private void addToHelpPlugins(String plugin) {
if (!helpPlugins.contains(plugin)) {
- helpPlugins += DELIMITER + plugin;
+ if (helpPlugins.length() > 0) {
+ helpPlugins += DELIMITER;
+ }
+ helpPlugins += plugin;
setStringProperty("help.plugin", helpPlugins, true);
}
}
diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties
index 3d6e904f84f..549594804cd 100644
--- a/src/main/resources/serviceconfig/olat.properties
+++ b/src/main/resources/serviceconfig/olat.properties
@@ -423,10 +423,10 @@ certificate.linemanager=false
# your own help plugin and configure it here.
help.enabled=true
# Define the plugin which generate the help URL
-help.plugin=ooConfluenceLinkHelp,ooAcademyLinkHelp
-help.plugin.values=ooConfluenceLinkHelp,ooAcademyLinkHelp,supportMailHelp,courseHelp,customLink1Help,customLink2Help
+help.plugin=ooConfluenceLinkHelp,ooAcademyLinkHelp,ooTeachLinkHelp
+help.plugin.values=ooConfluenceLinkHelp,ooAcademyLinkHelp,ooTeachLinkHelp,supportMailHelp,courseHelp,customLink1Help,customLink2Help,customLink3Help
# Note that when you use anything but ooConfluenceLinkHelp, the context help will be disabled. Only the help button in the top navigation will be available and open the help course
-help.plugin.icon.values=o_icon_manual,o_icon_video,o_course_icon,o_icon_mail or any other icon
+help.plugin.icon.values=o_icon_manual,o_icon_video,o_icon_coach,o_course_icon,o_icon_mail or any other icon
# Settings for the ooConfluenceLinkHelp plugin
help.confluence.enabled=usertool,authorsite,dmz
@@ -440,7 +440,7 @@ help.academy.icon=o_icon_video
# Settings for the ooTeachLinkHelp plugin
help.ooteach.link=https://www.openolat.com/openolat-teach/
help.ooteach.enabled=authorsite
-help.ooteach.icon=o_icon_video
+help.ooteach.icon=o_icon_coach
# Settings for the supportMailHelp plugin
help.support.email=${supportemail}
--
GitLab