Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
OLAT CI-CD Testing Project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lars Oliver Dam
OLAT CI-CD Testing Project
Commits
36dfa37c
Commit
36dfa37c
authored
4 years ago
by
aboeckle
Browse files
Options
Downloads
Patches
Plain Diff
OO-4799 Helpmodule default sorting
parent
1d5a387f
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/org/olat/core/commons/services/help/HelpModule.java
+6
-3
6 additions, 3 deletions
.../java/org/olat/core/commons/services/help/HelpModule.java
src/main/resources/serviceconfig/olat.properties
+3
-0
3 additions, 0 deletions
src/main/resources/serviceconfig/olat.properties
with
9 additions
and
3 deletions
src/main/java/org/olat/core/commons/services/help/HelpModule.java
+
6
−
3
View file @
36dfa37c
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/serviceconfig/olat.properties
+
3
−
0
View file @
36dfa37c
...
...
@@ -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}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment