From 36dfa37c96a2812dd04ca4f7b1340e799f816d24 Mon Sep 17 00:00:00 2001
From: aboeckle <alexander.boeckle@frentix.com>
Date: Tue, 21 Jul 2020 00:59:58 +0200
Subject: [PATCH] OO-4799 Helpmodule default sorting
---
.../org/olat/core/commons/services/help/HelpModule.java | 9 ++++++---
src/main/resources/serviceconfig/olat.properties | 3 +++
2 files changed, 9 insertions(+), 3 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 c86b2f9f65f..d020b0845b1 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
@@ -100,6 +100,7 @@ public class HelpModule extends AbstractSpringModule {
private String academyEnabled;
@Value("${help.academy.icon:o_icon_video}")
private String academyIcon;
+ @Value("${help.academy.pos:0}")
private int academyPos;
// OOTeach settings
@@ -109,6 +110,7 @@ public class HelpModule extends AbstractSpringModule {
private String ooTeachEnabled;
@Value("${help.ooteach.icon:o_icon_coach}")
private String ooTeachIcon;
+ @Value("${help.ooteach.pos:0}")
private int ooTeachPos;
// Confluence settings
@@ -116,6 +118,7 @@ public class HelpModule extends AbstractSpringModule {
private String confluenceEnabled;
@Value("${help.confluence.icon:o_icon_manual}")
private String confluenceIcon;
+ @Value("${help.confluence.pos:0}")
private int confluencePos;
// Support settings
@@ -196,18 +199,18 @@ public class HelpModule extends AbstractSpringModule {
academyLink = getStringPropertyValue("help.academy.link", academyLink);
academyEnabled = getStringPropertyValue("help.academy.enabled", academyEnabled);
academyIcon = getStringPropertyValue("help.academy.icon", academyIcon);
- academyPos = getIntPropertyValue("help.academy.pos");
+ academyPos = getIntPropertyValue("help.academy.pos", academyPos);
// OOTeach Settings
ooTeachLink = getStringPropertyValue("help.ooteach.link", ooTeachLink);
ooTeachEnabled = getStringPropertyValue("help.ooteach.enabled", ooTeachEnabled);
ooTeachIcon = getStringPropertyValue("help.ooteach.icon", ooTeachIcon);
- ooTeachPos = getIntPropertyValue("help.ooteach.pos");
+ ooTeachPos = getIntPropertyValue("help.ooteach.pos", ooTeachPos);
// Confluence settings
confluenceEnabled = getStringPropertyValue("help.confluence.enabled", confluenceEnabled);
confluenceIcon = getStringPropertyValue("help.confluence.icon", confluenceIcon);
- confluencePos = getIntPropertyValue("help.confluence.pos");
+ confluencePos = getIntPropertyValue("help.confluence.pos", confluencePos);
// Support settings
supportEmail = getStringPropertyValue("help.support.email", supportEmail);
diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties
index d286b58e566..74f8bfa7526 100644
--- a/src/main/resources/serviceconfig/olat.properties
+++ b/src/main/resources/serviceconfig/olat.properties
@@ -431,16 +431,19 @@ help.plugin.icon.values=o_icon_manual,o_icon_video,o_icon_coach,o_course_icon,o_
# Settings for the ooConfluenceLinkHelp plugin
help.confluence.enabled=usertool,authorsite,dmz
help.confluence.icon=o_icon_manual
+help.confluence.pos=0
# Settings for the ooAcademyLinkHelp plugin
help.academy.link=https://www.openolat.com/openolat-academy/
help.academy.enabled=usertool,authorsite,dmz
help.academy.icon=o_icon_video
+help.academy.pos=1
# Settings for the ooTeachLinkHelp plugin
help.ooteach.link=https://www.openolat.com/openolat-teach/
help.ooteach.enabled=authorsite
help.ooteach.icon=o_icon_coach
+help.ooteach.pos=2
# Settings for the supportMailHelp plugin
help.support.email=${supportemail}
--
GitLab