diff --git a/src/main/java/org/olat/course/nodes/bc/_content/folder.html b/src/main/java/org/olat/course/nodes/bc/_content/folder.html
index 2e6d2c1cc06a4fc3ae893523d5742cc245a5c47f..e60e12d43f79f443775778ca5f3a85eebe4d5e2d 100644
--- a/src/main/java/org/olat/course/nodes/bc/_content/folder.html
+++ b/src/main/java/org/olat/course/nodes/bc/_content/folder.html
@@ -1,6 +1,6 @@
<fieldset>
<legend>
- $r.translate("info.select")$r.contextHelpWithWrapper("Knowledge Transfer#_folder_configuration")
+ $r.translate("info.select")$r.contextHelpWithWrapper("Course Element: Folder#_folder_configuration")
</legend>
$r.render("pathChooser")
<legend>
diff --git a/src/main/java/org/olat/course/nodes/cp/CPEditController.java b/src/main/java/org/olat/course/nodes/cp/CPEditController.java
index 466749c9ba8926b296f27b5ca56cdca4dc8acfa0..f727e48b443fb76a3fe7f01695e569819102b38c 100644
--- a/src/main/java/org/olat/course/nodes/cp/CPEditController.java
+++ b/src/main/java/org/olat/course/nodes/cp/CPEditController.java
@@ -185,16 +185,14 @@ public class CPEditController extends ActivateableTabbableDefaultController impl
listenTo(accessibilityCondContr);
DeliveryOptions deliveryOptions = (DeliveryOptions)config.get(CPEditController.CONFIG_DELIVERYOPTIONS);
- deliveryOptionsCtrl = new DeliveryOptionsConfigurationController(ureq, getWindowControl(), deliveryOptions, "Knowledge Transfer#_cp_layout", parentConfig);
+ deliveryOptionsCtrl = new DeliveryOptionsConfigurationController(ureq, getWindowControl(), deliveryOptions,
+ "In Five Steps to Your Content Package#_cp_layout", parentConfig);
listenTo(deliveryOptionsCtrl);
main.setContent(cpConfigurationVc);
}
- /**
- * @see org.olat.core.gui.control.DefaultController#event(org.olat.core.gui.UserRequest,
- * org.olat.core.gui.components.Component, org.olat.core.gui.control.Event)
- */
+ @Override
public void event(UserRequest ureq, Component source, Event event) {
if (source == chooseCPButton || source == changeCPButton) {
removeAsListenerAndDispose(searchController);
diff --git a/src/main/java/org/olat/course/nodes/feed/FeedNodeEditController.java b/src/main/java/org/olat/course/nodes/feed/FeedNodeEditController.java
index 024674bdfa2e247685ae215a148ff113e7b21321..a99db590b27735a504e5bc3452bf0c9bc394c7cd 100644
--- a/src/main/java/org/olat/course/nodes/feed/FeedNodeEditController.java
+++ b/src/main/java/org/olat/course/nodes/feed/FeedNodeEditController.java
@@ -97,18 +97,18 @@ public abstract class FeedNodeEditController extends ActivateableTabbableDefault
/**
* Constructor. The uiFactory is needed for preview controller and the
* resourceTypeName for the repository search.
- *
+ * @param ureq
+ * @param wControl
* @param courseNode
* @param course
* @param uce
* @param uiFactory
* @param resourceTypeName
- * @param ureq
- * @param control
+ * @param contentHelpUrl
*/
- public FeedNodeEditController(AbstractFeedCourseNode courseNode, ICourse course, UserCourseEnvironment uce, FeedUIFactory uiFactory,
- String resourceTypeName, UserRequest ureq, WindowControl control) {
- super(ureq, control);
+ public FeedNodeEditController(UserRequest ureq, WindowControl wControl, AbstractFeedCourseNode courseNode, ICourse course,
+ UserCourseEnvironment uce, FeedUIFactory uiFactory, String resourceTypeName, String contentHelpUrl) {
+ super(ureq, wControl);
this.course = course;
this.node = courseNode;
this.config = courseNode.getModuleConfiguration();
@@ -146,6 +146,7 @@ public abstract class FeedNodeEditController extends ActivateableTabbableDefault
// building block
learningResource = new Panel("learning_resource_panel");
contentVC = new VelocityContainer("accessVC", FeedNodeEditController.class, "edit", getTranslator(), this);
+ contentVC.contextPut("helpUrl", contentHelpUrl);
changeButton = LinkFactory.createButtonSmall(BUTTON_CHANGE_FEED, contentVC, this);
changeButton.setElementCssClass("o_sel_feed_change_repofile");
chooseButton = LinkFactory.createButtonSmall(BUTTON_CREATE_FEED, contentVC, this);
@@ -305,6 +306,7 @@ public abstract class FeedNodeEditController extends ActivateableTabbableDefault
/**
* @see org.olat.core.gui.control.generic.tabbable.TabbableController#addTabs(org.olat.core.gui.components.tabbedpane.TabbedPane)
*/
+ @Override
public void addTabs(TabbedPane tabbedPane) {
this.tabbedPane = tabbedPane;
tabbedPane.addTab(translate(PANE_TAB_ACCESS), accessVC);
diff --git a/src/main/java/org/olat/course/nodes/feed/_content/edit.html b/src/main/java/org/olat/course/nodes/feed/_content/edit.html
index 25a4c0d683c9091f2fae1f56a94d7212db281c76..629341e74454ca54e7c4084b6ca18c65c35bd157 100644
--- a/src/main/java/org/olat/course/nodes/feed/_content/edit.html
+++ b/src/main/java/org/olat/course/nodes/feed/_content/edit.html
@@ -1,5 +1,5 @@
<fieldset class="o_form form-horizontal clearfix">
- <legend>$r.contextHelpWithWrapper("Knowledge Transfer")
+ <legend>$r.contextHelpWithWrapper($helpUrl)
$r.translate("form.title.choose.feed")</legend>
#if ($showPreviewLink)
diff --git a/src/main/java/org/olat/course/nodes/feed/blog/BlogNodeEditController.java b/src/main/java/org/olat/course/nodes/feed/blog/BlogNodeEditController.java
index 65aa8c59be63a47b0694096c86fa6edc53ab90bf..a4dc6824f2411a0d3688864d3b0358c55e844c27 100644
--- a/src/main/java/org/olat/course/nodes/feed/blog/BlogNodeEditController.java
+++ b/src/main/java/org/olat/course/nodes/feed/blog/BlogNodeEditController.java
@@ -38,17 +38,9 @@ import org.olat.modules.webFeed.ui.blog.BlogUIFactory;
*/
public class BlogNodeEditController extends FeedNodeEditController {
- /**
- * Constructor
- *
- * @param courseNode
- * @param course
- * @param uce
- * @param ureq
- * @param control
- */
- public BlogNodeEditController(AbstractFeedCourseNode courseNode, ICourse course, UserCourseEnvironment uce, UserRequest ureq,
- WindowControl control) {
- super(courseNode, course, uce, BlogUIFactory.getInstance(ureq.getLocale()), BlogFileResource.TYPE_NAME, ureq, control);
+ public BlogNodeEditController(AbstractFeedCourseNode courseNode, ICourse course, UserCourseEnvironment uce,
+ UserRequest ureq, WindowControl control) {
+ super(ureq, control, courseNode, course, uce, BlogUIFactory.getInstance(ureq.getLocale()),
+ BlogFileResource.TYPE_NAME, "Knowledge Transfer#_blog");
}
}
diff --git a/src/main/java/org/olat/course/nodes/feed/podcast/PodcastNodeEditController.java b/src/main/java/org/olat/course/nodes/feed/podcast/PodcastNodeEditController.java
index fa3127e23782e7c9003c8de3e674de925a830629..7ca65c8724ca60141a011a8f58c7ef77d098c493 100644
--- a/src/main/java/org/olat/course/nodes/feed/podcast/PodcastNodeEditController.java
+++ b/src/main/java/org/olat/course/nodes/feed/podcast/PodcastNodeEditController.java
@@ -38,17 +38,9 @@ import org.olat.modules.webFeed.ui.podcast.PodcastUIFactory;
*/
public class PodcastNodeEditController extends FeedNodeEditController {
- /**
- * Constructor
- *
- * @param courseNode
- * @param course
- * @param uce
- * @param ureq
- * @param control
- */
- public PodcastNodeEditController(AbstractFeedCourseNode courseNode, ICourse course, UserCourseEnvironment uce, UserRequest ureq,
- WindowControl control) {
- super(courseNode, course, uce, PodcastUIFactory.getInstance(ureq.getLocale()), PodcastFileResource.TYPE_NAME, ureq, control);
+ public PodcastNodeEditController(AbstractFeedCourseNode courseNode, ICourse course, UserCourseEnvironment uce,
+ UserRequest ureq, WindowControl control) {
+ super(ureq, control, courseNode, course, uce, PodcastUIFactory.getInstance(ureq.getLocale()),
+ PodcastFileResource.TYPE_NAME, "Knowledge Transfer#_podcast");
}
}
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTAEditController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTAEditController.java
index 84b6387c6b8e3987f2e26898cb22008c5674fa78..39610112a1881bd50b38f793eaec09e7f8660046 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/GTAEditController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/GTAEditController.java
@@ -106,7 +106,7 @@ public class GTAEditController extends ActivateableTabbableDefaultController {
revisionCtrl = new GTARevisionAndCorrectionEditController(ureq, getWindowControl(), config);
listenTo(revisionCtrl);
//grading
- manualAssessmentCtrl = new MSEditFormController(ureq, getWindowControl(), config);
+ manualAssessmentCtrl = createManualAssessmentCtrl(ureq);
listenTo(manualAssessmentCtrl);
//solutions
solutionsCtrl = new GTASampleSolutionsEditController(ureq, getWindowControl(), gtaNode, courseEnv, false);
@@ -217,7 +217,7 @@ public class GTAEditController extends ActivateableTabbableDefaultController {
fireEvent(ureq, NodeEditController.NODECONFIG_CHANGED_EVENT);
} else if(event == Event.CANCELLED_EVENT) {
removeAsListenerAndDispose(manualAssessmentCtrl);
- manualAssessmentCtrl = new MSEditFormController(ureq, getWindowControl(), config);
+ manualAssessmentCtrl = createManualAssessmentCtrl(ureq);
listenTo(manualAssessmentCtrl);
myTabbedPane.replaceTab(gradingPos, manualAssessmentCtrl.getInitialComponent());
}
@@ -233,4 +233,9 @@ public class GTAEditController extends ActivateableTabbableDefaultController {
super.event(ureq, source, event);
}
+
+ public MSEditFormController createManualAssessmentCtrl(UserRequest ureq) {
+ return new MSEditFormController(ureq, getWindowControl(), config, translate("pane.tab.grading"),
+ "Three Steps to Your Task#_task_configuration");
+ }
}
\ No newline at end of file
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTARevisionAndCorrectionEditController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTARevisionAndCorrectionEditController.java
index 5c4664dc8b77af14eb03d6f4fa32a0d826ad92b9..6d21302b4ddd8a87e14d87acc161e1debda0d94f 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/GTARevisionAndCorrectionEditController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/GTARevisionAndCorrectionEditController.java
@@ -57,7 +57,7 @@ public class GTARevisionAndCorrectionEditController extends FormBasicController
FormLayoutContainer configCont = FormLayoutContainer.createDefaultFormLayout("config", getTranslator());
configCont.setRootForm(mainForm);
configCont.setFormTitle(translate("editor.revisions.title"));
- configCont.setFormContextHelp("Assessment#_task_abgabe");
+ configCont.setFormContextHelp("Three Steps to Your Task#_task_configuration");
formLayout.add(configCont);
maxNumberOfDocsEl = uifactory.addTextElement("max.documents", "max.documents", 5, "", configCont);
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTASampleSolutionsEditController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTASampleSolutionsEditController.java
index cc53748488c84ac220214fb454de953f80555292..53e7e55a9b03b5f754c82c967c68542c56dc1d6f 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/GTASampleSolutionsEditController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/GTASampleSolutionsEditController.java
@@ -113,7 +113,6 @@ public class GTASampleSolutionsEditController extends FormBasicController implem
@Override
protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
-
addSolutionLink = uifactory.addFormLink("add.solution", formLayout, Link.BUTTON);
addSolutionLink.setElementCssClass("o_sel_course_gta_add_solution");
addSolutionLink.setIconLeftCSS("o_icon o_icon_upload");
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTASubmissionEditController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTASubmissionEditController.java
index 6ee05667f1d4747dddde1bf9735524c2ada3900b..bda1e209005f55bd984c7fc5925e7ed884370274 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/GTASubmissionEditController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/GTASubmissionEditController.java
@@ -63,7 +63,7 @@ public class GTASubmissionEditController extends FormBasicController {
FormLayoutContainer configCont = FormLayoutContainer.createDefaultFormLayout("config", getTranslator());
configCont.setRootForm(mainForm);
configCont.setFormTitle(translate("editor.title"));
- configCont.setFormContextHelp("Assessment#_task_abgabe");
+ configCont.setFormContextHelp("Three Steps to Your Task#_task_configuration");
formLayout.add(configCont);
String[] enableValues = new String[]{ translate("enabled") };
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTAWorkflowEditController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTAWorkflowEditController.java
index bdab300ac6b6c01ef7e8117062aa7bb33ba13830..0b012633895a14e96bde163566e6637903cec595 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/GTAWorkflowEditController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/GTAWorkflowEditController.java
@@ -214,7 +214,7 @@ public class GTAWorkflowEditController extends FormBasicController {
stepsCont.setFormDescription(translate("task.steps.description"));
stepsCont.setElementCssClass("o_sel_course_gta_steps");
stepsCont.setRootForm(mainForm);
- stepsCont.setFormContextHelp("Assessment#_task_workflow");
+ stepsCont.setFormContextHelp("Three Steps to Your Task#_task_configuration");
formLayout.add(stepsCont);
String[] optionalValues = new String[] {
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/_content/edit_solution_list.html b/src/main/java/org/olat/course/nodes/gta/ui/_content/edit_solution_list.html
index 43c051241ccd7ebe7972a2a5cf95010af14c3037..7f6c13690cb5a25483c5361e1a06c2fd103be779 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/_content/edit_solution_list.html
+++ b/src/main/java/org/olat/course/nodes/gta/ui/_content/edit_solution_list.html
@@ -1,5 +1,5 @@
<fieldset class="o_form o_block_large_bottom o_sel_course_gta_solutions" role="form">
- <legend>$r.translate("solution.list.title")</legend>
+ <legend>$r.translate("solution.list.title") $r.contextHelpWithWrapper("Three Steps to Your Task#_task_configuration")</legend>
<div class="o_desc">$r.translate("solution.list.description")</div>
#if($r.visible("add.solution") || $r.visible("create.solution"))
<div class="o_button_group o_button_group_right"><div class="btn-group">
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/_content/edit_task_list.html b/src/main/java/org/olat/course/nodes/gta/ui/_content/edit_task_list.html
index 05ef270300243152ffe208ef51ba31e88ba978ec..b25530152b61d66f6e33a20f6ae54ef530417f91 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/_content/edit_task_list.html
+++ b/src/main/java/org/olat/course/nodes/gta/ui/_content/edit_task_list.html
@@ -1,5 +1,5 @@
<fieldset class="o_form o_block_large_bottom o_sel_course_gta_tasks" role="form">
- <legend>$r.translate("task.list.title") $r.contextHelpWithWrapper("Assessment#_task_aufgabe")</legend>
+ <legend>$r.translate("task.list.title") $r.contextHelpWithWrapper("Three Steps to Your Task#_task_configuration")</legend>
<div class="o_desc">$r.translate("task.list.description")</div>
#if($r.visible("add.task") || $r.visible("create.task"))
<div class="o_button_group o_button_group_right"><div class="btn-group">
diff --git a/src/main/java/org/olat/course/nodes/iq/_content/edit.html b/src/main/java/org/olat/course/nodes/iq/_content/edit.html
index caad661a7f1bdbd2450f8353f22b628bcc212631..6ef2648f69503b89b8e4238522a5f0a90bc83359 100644
--- a/src/main/java/org/olat/course/nodes/iq/_content/edit.html
+++ b/src/main/java/org/olat/course/nodes/iq/_content/edit.html
@@ -3,7 +3,7 @@
#if ($type == "Assessment")
$r.contextHelpWithWrapper("Assessment#_test_kursbaustein")
#elseif ($type == "Self-Assessment")
- $r.contextHelpWithWrapper("Assessment#_selbsttest_kursbaustein")
+ $r.contextHelpWithWrapper("Tests at course level")
#else
$r.contextHelpWithWrapper("Assessment#_fragebogen")
#end
diff --git a/src/main/java/org/olat/course/nodes/ms/MSEditFormController.java b/src/main/java/org/olat/course/nodes/ms/MSEditFormController.java
index c49d01242ab97dde9637f8dc024430c1b2f94685..5bbe6b14c1d8a744e94e955d403f39a38a951233 100644
--- a/src/main/java/org/olat/course/nodes/ms/MSEditFormController.java
+++ b/src/main/java/org/olat/course/nodes/ms/MSEditFormController.java
@@ -90,16 +90,21 @@ public class MSEditFormController extends FormBasicController {
private String[] passedTypeValues;
private static final String scoreRex = "^[0-9]+(\\.[0-9]+)?$";
- /**
- * Creates this controller.
- *
- * @param ureq
- * @param wControl
- * @param modConfig
- */
+
+ private final String title;
+ private final String helpUrl;
+
+
public MSEditFormController(UserRequest ureq, WindowControl wControl, ModuleConfiguration modConfig) {
+ this(ureq, wControl, modConfig, null, null);
+ }
+
+ public MSEditFormController(UserRequest ureq, WindowControl wControl, ModuleConfiguration modConfig, String title,
+ String helpUrl) {
super(ureq, wControl, FormBasicController.LAYOUT_DEFAULT);
this.modConfig = modConfig;
+ this.title = title;
+ this.helpUrl = helpUrl;
trueFalseKeys = new String[] { Boolean.TRUE.toString(), Boolean.FALSE.toString() };
passedTypeValues = new String[] { translate("form.passedtype.cutval"), translate("form.passedtype.manual") };
initForm(ureq);
@@ -150,6 +155,12 @@ public class MSEditFormController extends FormBasicController {
*/
@Override
protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
+ if (StringHelper.containsNonWhitespace(title)) {
+ setFormTitle("form.title", new String[] {title});
+ }
+ if (StringHelper.containsNonWhitespace(helpUrl)) {
+ setFormContextHelp(helpUrl);
+ }
formLayout.setElementCssClass("o_sel_course_ms_form");
// Create the "score granted" field...
diff --git a/src/main/java/org/olat/course/nodes/ms/_content/edit.html b/src/main/java/org/olat/course/nodes/ms/_content/edit.html
index 2b8ad4ec3065a8aeedc6bb638994ed7bbfbd9511..6b52545994b147ecf297aed6c94fc98287b90cd6 100644
--- a/src/main/java/org/olat/course/nodes/ms/_content/edit.html
+++ b/src/main/java/org/olat/course/nodes/ms/_content/edit.html
@@ -1,5 +1,5 @@
<fieldset class="o_sel_course_ms">
- <legend>$r.contextHelpWithWrapper("Assessment#_bewertung_kursbaustein")
+ <legend>$r.contextHelpWithWrapper("Course Element: Assessment")
$r.translate("form.configuration")</legend>
#if ($hasLogEntries)
diff --git a/src/main/java/org/olat/course/nodes/ms/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/nodes/ms/_i18n/LocalStrings_de.properties
index 02b08749e8e161a2e0ec3b69513a8e955a6a51ea..f877c4074952ad216117c34eb2397bea327f3707 100644
--- a/src/main/java/org/olat/course/nodes/ms/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/nodes/ms/_i18n/LocalStrings_de.properties
@@ -4,29 +4,29 @@ breadcrumb.users=Benutzer
comment.nocomment=Es liegt kein Kommentar vor
comment.title=Kommentar
condition.accessibility.title=Zugang
-error.missingconfig.long=\u00D6ffnen Sie den Tab "Bewertung", um "{0}" fertig zu konfigurieren.
-error.missingconfig.short=Die Bewertung f\u00FCr "{0}" ist nicht korrekt konfiguriert.
-error.repo.entry.missing=Der Fragebogen, welchen Sie anzeigen m\u00F6chten, wurde in der Zwischenzeit gel\u00F6scht.
-error.repo.entry.not.replaceable=Der Fragebogen kann nicht mehr ge\u00E4ndert werden.
-evaluation.execution.reopen=Wieder \u00F6ffnen
+error.missingconfig.long=\u00d6ffnen Sie den Tab "Bewertung", um "{0}" fertig zu konfigurieren.
+error.missingconfig.short=Die Bewertung f\u00fcr "{0}" ist nicht korrekt konfiguriert.
+error.repo.entry.missing=Der Fragebogen, welchen Sie anzeigen m\u00f6chten, wurde in der Zwischenzeit gel\u00f6scht.
+error.repo.entry.not.replaceable=Der Fragebogen kann nicht mehr ge\u00e4ndert werden.
+evaluation.execution.reopen=Wieder \u00f6ffnen
form.comment=Individueller Kommentar
form.configuration=Konfiguration der manuellen Bewertung
-form.configuration.alreadydata=Die Konfiguration kann nicht mehr ge\u00E4ndert werden, da bereits Daten gespeichert wurden.
-form.cut=Punkteschwelle f\u00FCr Bestanden
-form.error.cutButNoScore=Die <b>Art der Ausgabe</b> muss auf «Manuell durch Betreuer» stehen, wenn Sie bei <b>Punkte vergeben</b> «Nein» gew\u00E4hlt haben.
+form.configuration.alreadydata=Die Konfiguration kann nicht mehr ge\u00e4ndert werden, da bereits Daten gespeichert wurden.
+form.cut=Punkteschwelle f\u00fcr Bestanden
+form.error.cutButNoScore=Die <b>Art der Ausgabe</b> muss auf «Manuell durch Betreuer» stehen, wenn Sie bei <b>Punkte vergeben</b> «Nein» gew\u00e4hlt haben.
form.error.cutOutOfRange=Punkteschwelle liegt nicht zwischen Punkteminimum/-maximum
-form.error.minGreaterThanMax=Punkteminimum ist gr\u00F6sser als Punktemaximum
+form.error.minGreaterThanMax=Punkteminimum ist gr\u00f6sser als Punktemaximum
form.error.wrongFloat=Falsches Zahlenformat. Beispiele\: 15.0, 5.5, 10
form.evaluation=Rubrik-Fragebogen
-form.evaluation.choose=Ausw\u00E4hlen, erstellen oder importieren
+form.evaluation.choose=Ausw\u00e4hlen, erstellen oder importieren
form.evaluation.edit=Bearbeiten
form.evaluation.enabled=Rubrik-Bewertung
-form.evaluation.not.choosen=Es ist kein Rubrik-Fragebogen ausw\u00E4hlt.
+form.evaluation.not.choosen=Es ist kein Rubrik-Fragebogen ausw\u00e4hlt.
form.evaluation.replace=Ersetzen
-form.evaluation.choose=Rubrik-Fragebogen ausw\u00E4hlen
+form.evaluation.choose=Rubrik-Fragebogen ausw\u00e4hlen
form.individual.assessment.docs=Individuelle Bewertungsdokumente
-form.infotext.coach=Hinweis f\u00FCr Betreuer
-form.infotext.user=Hinweis f\u00FCr alle Benutzer
+form.infotext.coach=Hinweis f\u00fcr Betreuer
+form.infotext.user=Hinweis f\u00fcr alle Benutzer
form.max=Maximal erreichbare Punkte
form.min=Minimal erreichbare Punkte
form.no=Nein
@@ -36,19 +36,20 @@ form.passedtype.cutval=Automatisch durch Punkteschwelle
form.passedtype.manual=Manuell durch Betreuer
form.scale=Skalierungsfaktor
form.score=Punkte vergeben
-form.score.eval.avg=Durchschnitt aus Rubrik-Fragebogen \u00FCbernehmen
-form.score.eval.sum=Summe aus Rubrik-Fragebogen \u00FCbernehmen
+form.score.eval.avg=Durchschnitt aus Rubrik-Fragebogen \u00fcbernehmen
+form.score.eval.sum=Summe aus Rubrik-Fragebogen \u00fcbernehmen
form.score.manual=Punkte manuell vergeben
form.score.none=Keine Punkte vergeben
+form.title={0}
form.yes=Ja
in.review=In Korrektur
info.title=Information zur Bewertung
-log.title=\u00C4nderungsverlauf
+log.title=\u00c4nderungsverlauf
pane.tab.accessibility=Zugang
pane.tab.configuration=Bewertung
passed.cut=Bestanden ab Anzahl Punkte
passed.no=Nicht bestanden
-passed.nopassed=Information nicht verf\u00FCgbar
+passed.nopassed=Information nicht verf\u00fcgbar
passed.title=Ergebnis
passed.yes=Bestanden
passed.yourpassed=Status
@@ -59,21 +60,21 @@ segment.all=Alle Teilnehmer
segment.my=Meine Bewertung
score.max=Punktemaximum
score.min=Punkteminimum
-score.noscore=Information nicht verf\u00FCgbar
+score.noscore=Information nicht verf\u00fcgbar
score.title=Zusammenfassung der Punkte
score.yourscore=Erreichte Punktzahl
-scoring.config.enable.button=\u00C4ndern
-scoring.overwriting=Es wurden bereits Bewertungen vorgenommen. Wollen Sie die Bewertungskonfiguartion trotzdem \u00E4ndern? Es werden alle (auch bereits abgeschlossene) berechneten Bewertungen neu durchgef\u00FCrt!
-scoring.overwriting.note=Hinweis\: Sie \u00E4ndern die Bewertungskonfiguration, obwohl bereits Bewertungen vorgenommen wurden. Es werden alle (auch bereits abgeschlossene) berechneten Bewertungen neu durchgef\u00FCrt!
+scoring.config.enable.button=\u00c4ndern
+scoring.overwriting=Es wurden bereits Bewertungen vorgenommen. Wollen Sie die Bewertungskonfiguartion trotzdem \u00e4ndern? Es werden alle (auch bereits abgeschlossene) berechneten Bewertungen neu durchgef\u00fcrt!
+scoring.overwriting.note=Hinweis\: Sie \u00e4ndern die Bewertungskonfiguration, obwohl bereits Bewertungen vorgenommen wurden. Es werden alle (auch bereits abgeschlossene) berechneten Bewertungen neu durchgef\u00fcrt!
table.header.details.ms=Rubrik
-tool.reset.data=Alle Daten zur\u00FCcksetzen
-tool.reset.data.confirm.button=Daten zur\u00FCcksetzen
-tool.reset.data.confirm.error=Bitte best\u00E4tigen Sie das zur\u00FCcksetzen der Daten.
-tool.reset.data.confirm.message=Ich verstehe, dass die Daten endg\u00FCltig gel\u00F6scht werden.
-tool.reset.data.message=Wollen Sie wirklich alle Bewertungen l\u00F6schen? Es wurden bereits {0} Benutzer bewertet. Die Daten k\u00F6nnen nicht wieder hergestellt werden!
-tool.reset.data.title=Daten von Bewertungen zur\u00FCcksetzen
+tool.reset.data=Alle Daten zur\u00fccksetzen
+tool.reset.data.confirm.button=Daten zur\u00fccksetzen
+tool.reset.data.confirm.error=Bitte best\u00e4tigen Sie das zur\u00fccksetzen der Daten.
+tool.reset.data.confirm.message=Ich verstehe, dass die Daten endg\u00fcltig gel\u00f6scht werden.
+tool.reset.data.message=Wollen Sie wirklich alle Bewertungen l\u00f6schen? Es wurden bereits {0} Benutzer bewertet. Die Daten k\u00f6nnen nicht wieder hergestellt werden!
+tool.reset.data.title=Daten von Bewertungen zur\u00fccksetzen
tool.stats=Statistik
-tool.stats.empty=Diese Tabelle enth\u00E4lt keine Daten.
+tool.stats.empty=Diese Tabelle enth\u00e4lt keine Daten.
tool.stats.sliders.enabled=Fragen anzeigen
tool.stats.table.footer=Durchschnitt
tool.stats.table.title.blank=
@@ -81,4 +82,4 @@ tool.stats.table.title.rubric=R{0}
tool.stats.table.title.slider=F{0}.{1}
tool.stats.table.title.total=Total
tool.stats.table.title.username=Benutzername
-warn.nodedelete=Achtung\: Alle bisher angefallenen Daten dieses Kursbausteines werden gel\u00F6scht.
+warn.nodedelete=Achtung\: Alle bisher angefallenen Daten dieses Kursbausteines werden gel\u00f6scht.
diff --git a/src/main/java/org/olat/course/nodes/ms/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/nodes/ms/_i18n/LocalStrings_en.properties
index 8008e1fea0fe4b8e90d1179a11a8f68279cec022..598ae945ca544cbf582d1f92698dfabfd9cf950c 100644
--- a/src/main/java/org/olat/course/nodes/ms/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/nodes/ms/_i18n/LocalStrings_en.properties
@@ -40,6 +40,7 @@ form.score.eval.avg=Transfer average from rubric questionnaire
form.score.eval.sum=Transfer sum from rubric questionnaire
form.score.manual=Set points manually
form.score.none=No points
+form.title={0}
form.yes=Yes
in.review=In review
info.title=Assessment information
diff --git a/src/main/java/org/olat/course/nodes/portfolio/PortfolioCourseNodeEditController.java b/src/main/java/org/olat/course/nodes/portfolio/PortfolioCourseNodeEditController.java
index 4b629d3b37ef0183adbae708947b12282ee2817b..e5a97615348e22ca0855990f0300df0eb75d9f89 100644
--- a/src/main/java/org/olat/course/nodes/portfolio/PortfolioCourseNodeEditController.java
+++ b/src/main/java/org/olat/course/nodes/portfolio/PortfolioCourseNodeEditController.java
@@ -79,7 +79,7 @@ public class PortfolioCourseNodeEditController extends ActivateableTabbableDefau
configForm = new PortfolioConfigForm(ureq, wControl, stackPanel, course, node);
listenTo(configForm);
- scoringController = new MSEditFormController(ureq, wControl, config);
+ scoringController = new MSEditFormController(ureq, wControl, config, translate("pane.tab.portfolio_scoring"), "Creating Portfolio Tasks");
scoringContent = scoringController.getInitialComponent();
listenTo(scoringController);
textForm = new PortfolioTextForm(ureq, wControl, course, node);
diff --git a/src/main/java/org/olat/course/nodes/scorm/ScormEditController.java b/src/main/java/org/olat/course/nodes/scorm/ScormEditController.java
index c85c152ec13796cc7d33576adaef6d4718877f9d..bf291107d795cd8e2b956f5e66b27965863e18d9 100644
--- a/src/main/java/org/olat/course/nodes/scorm/ScormEditController.java
+++ b/src/main/java/org/olat/course/nodes/scorm/ScormEditController.java
@@ -228,7 +228,8 @@ public class ScormEditController extends ActivateableTabbableDefaultController i
listenTo(accessibilityCondContr);
DeliveryOptions deliveryOptions = (DeliveryOptions)config.get(CONFIG_DELIVERY_OPTIONS);
- deliveryOptionsCtrl = new DeliveryOptionsConfigurationController(ureq, getWindowControl(), deliveryOptions, "Knowledge Transfer#_scorm_layout" , parentConfig);
+ deliveryOptionsCtrl = new DeliveryOptionsConfigurationController(ureq, getWindowControl(), deliveryOptions,
+ "Course Element: SCORM Learning Content#_scorm_layout", parentConfig);
listenTo(deliveryOptionsCtrl);
main.setContent(cpConfigurationVc);
@@ -346,6 +347,7 @@ public class ScormEditController extends ActivateableTabbableDefaultController i
/**
* @see org.olat.core.gui.control.generic.tabbable.TabbableDefaultController#addTabs(org.olat.core.gui.components.TabbedPane)
*/
+ @Override
public void addTabs(TabbedPane tabbedPane) {
myTabbedPane = tabbedPane;
tabbedPane.addTab(translate(PANE_TAB_ACCESSIBILITY), accessibilityCondContr.getWrappedDefaultAccessConditionVC(translate(NLS_CONDITION_ACCESSIBILITY_TITLE)));
@@ -401,14 +403,17 @@ public class ScormEditController extends ActivateableTabbableDefaultController i
/**
* @see org.olat.core.gui.control.DefaultController#doDispose(boolean)
*/
+ @Override
protected void doDispose() {
//child controllers registered with listenTo() get disposed in BasicController
}
+ @Override
public String[] getPaneKeys() {
return paneKeys;
}
+ @Override
public TabbedPane getTabbedPane() {
return myTabbedPane;
}
diff --git a/src/main/java/org/olat/course/nodes/scorm/_content/edit.html b/src/main/java/org/olat/course/nodes/scorm/_content/edit.html
index 33f058b51384ab9e6aa4a5bd1057a224b7da325a..3f7bd65ebb2d94382debac9a2d0fdf19301a03a1 100644
--- a/src/main/java/org/olat/course/nodes/scorm/_content/edit.html
+++ b/src/main/java/org/olat/course/nodes/scorm/_content/edit.html
@@ -1,5 +1,5 @@
<fieldset class="o_form form-horizontal clearfix">
- <legend>$r.contextHelpWithWrapper("Knowledge Transfer#_scorm_kursbaustein")
+ <legend>$r.contextHelpWithWrapper("Course Element: SCORM Learning Content")
$r.translate("header")</legend>
#if ($showPreviewButton)
diff --git a/src/main/java/org/olat/course/nodes/sp/SPEditController.java b/src/main/java/org/olat/course/nodes/sp/SPEditController.java
index bd29b9c2ce117f695cd0d26a1f8b963a41216086..a1adc34d03b31cb43831ab1cb30911f51faa88fe 100644
--- a/src/main/java/org/olat/course/nodes/sp/SPEditController.java
+++ b/src/main/java/org/olat/course/nodes/sp/SPEditController.java
@@ -155,7 +155,8 @@ public class SPEditController extends ActivateableTabbableDefaultController impl
// Delivery options form
DeliveryOptions deliveryOptions = (DeliveryOptions)moduleConfiguration.get(CONFIG_KEY_DELIVERYOPTIONS);
- deliveryOptionsCtrl = new DeliveryOptionsConfigurationController(ureq, getWindowControl(), deliveryOptions, "Knowledge Transfer#_splayout");
+ deliveryOptionsCtrl = new DeliveryOptionsConfigurationController(ureq, getWindowControl(), deliveryOptions,
+ "Course Element: Single Page#_splayout");
listenTo(deliveryOptionsCtrl);
}
diff --git a/src/main/java/org/olat/course/nodes/sp/_content/edit.html b/src/main/java/org/olat/course/nodes/sp/_content/edit.html
index c5ff3fe7cc7b9eee25c6366b7ae889692e16695d..7bae038d251f4c8536d0c9b609aadf4791716fc1 100644
--- a/src/main/java/org/olat/course/nodes/sp/_content/edit.html
+++ b/src/main/java/org/olat/course/nodes/sp/_content/edit.html
@@ -1,6 +1,6 @@
<fieldset>
<legend>
- $r.contextHelpWithWrapper("Knowledge Transfer#_einzelseite")
+ $r.contextHelpWithWrapper("Course Element: Single Page")
$fieldSetLegend
</legend>
$r.render("combiCtr")
diff --git a/src/main/java/org/olat/course/nodes/st/_content/scoreedit.html b/src/main/java/org/olat/course/nodes/st/_content/scoreedit.html
index 12d0ec7dd1599c31cb8c720069bcd0129270b332..a4d810a71e4313e9455df15b73fb3a9d349e6f04 100644
--- a/src/main/java/org/olat/course/nodes/st/_content/scoreedit.html
+++ b/src/main/java/org/olat/course/nodes/st/_content/scoreedit.html
@@ -1,5 +1,5 @@
<fieldset class="o_sel_structure_score">
- <legend>$r.contextHelpWithWrapper("Knowledge Transfer#_displayscore")
+ <legend>$r.contextHelpWithWrapper("Course Element: Structure#_displayscore")
$r.translate("score.fieldset.title")</legend>
#if ($isExpertMode)