From 1d06b6f6d19aaa2fa28413f1241bb23325144c83 Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Tue, 30 Jul 2019 15:30:42 +0200
Subject: [PATCH] OO-4167: Wording, minor GUI enhancements
---
.../config/ui/CourseToolbarController.java | 53 +++++++++++--------
.../ui/_i18n/LocalStrings_de.properties | 2 +-
.../ui/_i18n/LocalStrings_en.properties | 6 +--
.../ui/_i18n/LocalStrings_fr.properties | 3 +-
.../ui/_i18n/LocalStrings_it.properties | 3 +-
.../ui/_i18n/LocalStrings_pt_BR.properties | 3 +-
6 files changed, 39 insertions(+), 31 deletions(-)
diff --git a/src/main/java/org/olat/course/config/ui/CourseToolbarController.java b/src/main/java/org/olat/course/config/ui/CourseToolbarController.java
index 2b5b1fe84d4..f5b47189220 100644
--- a/src/main/java/org/olat/course/config/ui/CourseToolbarController.java
+++ b/src/main/java/org/olat/course/config/ui/CourseToolbarController.java
@@ -26,6 +26,7 @@ import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.form.flexible.FormItem;
import org.olat.core.gui.components.form.flexible.FormItemContainer;
import org.olat.core.gui.components.form.flexible.elements.SelectionElement;
+import org.olat.core.gui.components.form.flexible.elements.StaticTextElement;
import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
import org.olat.core.gui.components.form.flexible.impl.FormEvent;
import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
@@ -66,6 +67,7 @@ public class CourseToolbarController extends FormBasicController {
private final String[] onValues;
private SelectionElement toolbarEl;
+ private StaticTextElement explainEl;
private SelectionElement calendarEl;
private SelectionElement searchEl;
private SelectionElement chatEl;
@@ -122,7 +124,7 @@ public class CourseToolbarController extends FormBasicController {
toolbarEl.addActionListener(FormEvent.ONCHANGE);
toolbarEl.setEnabled(editable);
- uifactory.addStaticTextElement("chkbx.toolbar.explain", "", formLayout);
+ explainEl = uifactory.addStaticTextElement("chkbx.toolbar.explain", "", formLayout);
boolean canHideToolbar = true;
if(calendarModule.isEnabled() && calendarModule.isEnableCourseToolCalendar()) {
@@ -180,7 +182,7 @@ public class CourseToolbarController extends FormBasicController {
@Override
protected void formInnerEvent(UserRequest ureq, FormItem source, FormEvent event) {
if(toolbarEl == source) {
- if(!toolbarEl.isSelected(0)) {
+ if(!toolbarEl.isSelected(0) && isAnyToolSelected()) {
showWarning("chkbx.toolbar.off.warning");
}
updateToolbar();
@@ -188,13 +190,22 @@ public class CourseToolbarController extends FormBasicController {
super.formInnerEvent(ureq, source, event);
}
+ private boolean isAnyToolSelected() {
+ return (calendarEl != null && calendarEl.isSelected(0))
+ || chatEl.isSelected(0)
+ || searchEl.isSelected(0)
+ || glossaryEl.isSelected(0);
+ }
+
private void updateToolbar() {
boolean enabled = toolbarEl.isSelected(0);
+ explainEl.setVisible(enabled);
if(calendarEl != null) {
calendarEl.setVisible(enabled);
}
chatEl.setVisible(enabled);
searchEl.setVisible(enabled);
+ glossaryEl.setVisible(enabled);
}
@Override
@@ -226,45 +237,45 @@ public class CourseToolbarController extends FormBasicController {
CourseFactory.closeCourseEditSession(course.getResourceableId(), true);
if(updateSearch) {
- ILoggingAction loggingAction = enableSearch ?
- LearningResourceLoggingAction.REPOSITORY_ENTRY_PROPERTIES_COURSESEARCH_ENABLED :
+ ILoggingAction loggingAction =enableSearch ?
+ LearningResourceLoggingAction.REPOSITORY_ENTRY_PROPERTIES_COURSESEARCH_ENABLED:
LearningResourceLoggingAction.REPOSITORY_ENTRY_PROPERTIES_COURSESEARCH_DISABLED;
- ThreadLocalUserActivityLogger.log(loggingAction, getClass());
-
- CoordinatorManager.getInstance().getCoordinator().getEventBus()
- .fireEventToListenersOf(new CourseConfigEvent(CourseConfigType.search, course.getResourceableId()), course);
+ ThreadLocalUserActivityLogger.log(loggingAction, getClass());
+
+ CoordinatorManager.getInstance().getCoordinator().getEventBus()
+ .fireEventToListenersOf(new CourseConfigEvent(CourseConfigType.search, course.getResourceableId()), course);
}
if(updateChat) {
- ILoggingAction loggingAction = enableChat ?
- LearningResourceLoggingAction.REPOSITORY_ENTRY_PROPERTIES_IM_ENABLED :
+ ILoggingAction loggingAction =enableChat ?
+ LearningResourceLoggingAction.REPOSITORY_ENTRY_PROPERTIES_IM_ENABLED:
LearningResourceLoggingAction.REPOSITORY_ENTRY_PROPERTIES_IM_DISABLED;
- ThreadLocalUserActivityLogger.log(loggingAction, getClass());
+ ThreadLocalUserActivityLogger.log(loggingAction, getClass());
- CoordinatorManager.getInstance().getCoordinator().getEventBus()
- .fireEventToListenersOf(new CourseConfigEvent(CourseConfigType.chat, course.getResourceableId()), course);
+ CoordinatorManager.getInstance().getCoordinator().getEventBus()
+ .fireEventToListenersOf(new CourseConfigEvent(CourseConfigType.chat, course.getResourceableId()), course);
}
if(updateGlossary) {
ILoggingAction loggingAction = enableCalendar ?
- LearningResourceLoggingAction.REPOSITORY_ENTRY_PROPERTIES_GLOSSARY_ENABLED :
+ LearningResourceLoggingAction.REPOSITORY_ENTRY_PROPERTIES_GLOSSARY_ENABLED:
LearningResourceLoggingAction.REPOSITORY_ENTRY_PROPERTIES_GLOSSARY_DISABLED;
ThreadLocalUserActivityLogger.log(loggingAction, getClass());
- CoordinatorManager.getInstance().getCoordinator().getEventBus()
- .fireEventToListenersOf(new CourseConfigEvent(CourseConfigType.glossary, course.getResourceableId()), course);
+ CoordinatorManager.getInstance().getCoordinator().getEventBus()
+ .fireEventToListenersOf(new CourseConfigEvent(CourseConfigType.glossary, course.getResourceableId()), course);
}
if(updateCalendar) {
ILoggingAction loggingAction = enableCalendar ?
- LearningResourceLoggingAction.REPOSITORY_ENTRY_PROPERTIES_CALENDAR_ENABLED :
+ LearningResourceLoggingAction.REPOSITORY_ENTRY_PROPERTIES_CALENDAR_ENABLED:
LearningResourceLoggingAction.REPOSITORY_ENTRY_PROPERTIES_CALENDAR_DISABLED;
ThreadLocalUserActivityLogger.log(loggingAction, getClass());
- CoordinatorManager.getInstance().getCoordinator().getEventBus()
- .fireEventToListenersOf(new CalendarGUIModifiedEvent(), OresHelper.lookupType(CalendarManager.class));
- CoordinatorManager.getInstance().getCoordinator().getEventBus()
- .fireEventToListenersOf(new CourseConfigEvent(CourseConfigType.calendar, course.getResourceableId()), course);
+ CoordinatorManager.getInstance().getCoordinator().getEventBus()
+ .fireEventToListenersOf(new CalendarGUIModifiedEvent(), OresHelper.lookupType(CalendarManager.class));
+ CoordinatorManager.getInstance().getCoordinator().getEventBus()
+ .fireEventToListenersOf(new CourseConfigEvent(CourseConfigType.calendar, course.getResourceableId()), course);
}
fireEvent(ureq, new ReloadSettingsEvent(false, false, true, false));
diff --git a/src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_de.properties
index 7dd27afe7ea..361685f2e48 100644
--- a/src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_de.properties
@@ -9,7 +9,7 @@ chkbx.search.onoff=Kurssuche
chkbx.menu.onoff=Menu sichtbar f\u00FCr Teilnehmer und Betreuer
chkbx.toolbar.explain=Werkzeuge in Toolbar aktivieren:
chkbx.toolbar.onoff=Toolbar sichtbar f\u00FCr Teilnehmer
-chkbx.toolbar.off.warning=Wenn sie den Toolbar abschalten, stehen die folgende Werkzeuge nicht mehr zur Verf\u00fcgung: Glossar, Kurs-Chat und Kalender.
+chkbx.toolbar.off.warning=Wenn sie die Toolbar abschalten, stehen die einzelnen Werkzeuge ebenfalls nicht mehr zur Verf\u00FCgung.
chkbx.breadcrumb.onoff=Kr\u00FCmelnavigation
command.choose=W\u00E4hlen
command.glossary.add=Glossar w\u00E4hlen
diff --git a/src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_en.properties
index f8f93a81c35..f21a4a7831c 100644
--- a/src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_en.properties
@@ -1,7 +1,7 @@
#Fri Jan 21 11:22:00 CET 2011
chkbx.calendar.onoff=Course calendar
-chkbx.chat.onoff=Use course chat
-chkbx.search.onoff=Enable course search
+chkbx.chat.onoff=Course chat
+chkbx.search.onoff=Course search
chkbx.efficency.onoff=Use evidence of achievement
chkbx.glossary.explain=The glossary need to be configured under "Options".
chkbx.glossary.inverse.explain=Glossary menu in toolbar is configured under "Toolbar".
@@ -9,7 +9,7 @@ chkbx.glossary.onoff=Glossary
chkbx.menu.onoff=Menu visible for participants and coaches
chkbx.toolbar.explain=Activate tools in toolbar:
chkbx.toolbar.onoff=Toolbar visible for participants
-chkbx.toolbar.off.warning=If you disable the toolbar the participants cannot use the calendar, chat and glossary.
+chkbx.toolbar.off.warning=If you disable the toolbar, the individual tools are also no longer available.
chkbx.breadcrumb.onoff=Bread-crumb navigation
command.choose=Choose
command.glossary.add=Select glossary
diff --git a/src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_fr.properties
index a813f3d5580..4c6383ea221 100644
--- a/src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_fr.properties
@@ -4,12 +4,11 @@ chkbx.calendar.onoff=Calendrier du cours
chkbx.chat.onoff=Chat du cours
chkbx.efficency.onoff=Utiliser l'attestation de performance
chkbx.glossary.explain=Le glossaire doit \u00EAtre configurer sous "Options".
-chkbx.glossary.inverse.explain=Le menu du glossaire dans la barre d'outils est à configurer sous "Barre d'outils".
+chkbx.glossary.inverse.explain=Le menu du glossaire dans la barre d'outils est \uFFFD configurer sous "Barre d'outils".
chkbx.glossary.onoff=Glossaire
chkbx.menu.onoff=Menu visible pour les participants et les coaches
chkbx.search.onoff=Recherche au sein du cours
chkbx.toolbar.explain=Activer les outils de la barre d'outils\:
-chkbx.toolbar.off.warning=Si vous d\u00E9sactiv\u00E9 la barre d'outils, les participants ne peuvent plus acc\u00E9der aux fonctions calendrier, chat et glossaire.
chkbx.toolbar.onoff=Barre d'outils visible pour les participants
command.choose=S\u00E9lectionner
command.glossary.add=Choisir glossaire
diff --git a/src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_it.properties
index 0ae3b7fe7c7..0f0e6608de9 100644
--- a/src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_it.properties
@@ -3,8 +3,7 @@ chkbx.calendar.onoff=Utilizza il calendario
chkbx.chat.onoff=Utilizza la chat di corso
chkbx.efficency.onoff=Utilizza l'attestato di efficienza
chkbx.menu.onoff=Menu visibile per partecipanti e tutori
-chkbx.search.onoff=Abilitare ricerca nel corso
-chkbx.toolbar.off.warning=Se disabiliti la barra degli strumenti, i partecipanti non potranno usare il calendario, la chat e il glossario.
+chkbx.search.onoff=Ricerca nel corso
chkbx.toolbar.onoff=Barre degli strumenti visibili ai partecipanti
command.choose=Selezionare
command.glossary.add=Selezionare glossario
diff --git a/src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_pt_BR.properties
index 5dac9ae1c2f..2eb52419f84 100644
--- a/src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_pt_BR.properties
@@ -7,9 +7,8 @@ chkbx.glossary.explain=O gloss\u00E1rio precisa ser configurado em "Op\u00E7\u00
chkbx.glossary.inverse.explain=O menu do gloss\u00E1rio na barra de ferramentas est\u00E1 configurado em "Barra de ferramentas".
chkbx.glossary.onoff=Gloss\u00E1rio
chkbx.menu.onoff=Menu vis\u00EDvel para os participantes e treinadores
-chkbx.search.onoff=Ativar pesquisa no curso
+chkbx.search.onoff=Pesquisa no curso
chkbx.toolbar.explain=Ativar ferramentas na barra de ferramentas\:
-chkbx.toolbar.off.warning=Se voc\u00EA desativar a barra de ferramentas os participantes n\u00E3o podem usar o calend\u00E1rio, o chat e o gloss\u00E1rio.
chkbx.toolbar.onoff=Barra de ferramentas vis\u00EDvel para os participantes
command.choose=Escolher
command.glossary.add=Usar um gloss\u00E1rio
--
GitLab