Merge remote-tracking branch 'origin/OpenOLAT_15.2' into OpenOLAT_15.3

src/main/java/org/olat/ims/qti21/ui/editor/AssessmentSectionExpertOptionsEditorController.java

@@ -61,11 +61,6 @@ public class AssessmentSectionExpertOptionsEditorController extends ItemSessionC
 		}
 		
 		super.initForm(formLayout, listener, ureq);
-		limitAttemptsEl.setHelpUrlForManualPage("Configure tests#_config_expert");
-		allowSkippingEl.setHelpUrlForManualPage("Configure tests#_config_expert");
-		allowCommentEl.setHelpUrlForManualPage("Configure tests#_config_expert");
-		allowReviewEl.setHelpUrlForManualPage("Configure tests#_config_expert");
-		showSolutionEl.setHelpUrlForManualPage("Configure tests#_config_expert");
 		
 		//visible
 		String[] yesnoValues = new String[]{ translate("yes"), translate("no") };

src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestPartEditorController.java

@@ -56,7 +56,7 @@ public class AssessmentTestPartEditorController extends ItemSessionControlContro
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormTitle("assessment.testpart.config");
-		setFormContextHelp("Test editor QTI 2.1 in detail#details_testeditor_test");
+		setFormContextHelp("Configure tests#_config_expert");
 		if(!editable) {
 			setFormWarning("warning.alien.assessment.test");
 		}
@@ -69,13 +69,8 @@ public class AssessmentTestPartEditorController extends ItemSessionControlContro
 		navigationModeEl.select(mode, true);
 		navigationModeEl.setEnabled(!restrictedEdit);
 		navigationModeEl.setHelpText(translate("form.testPart.navigationMode.hint"));
-		navigationModeEl.setHelpUrlForManualPage("Test editor QTI 2.1 in detail#details_testeditor_test");
 		
 		super.initForm(formLayout, listener, ureq);
-		allowSkippingEl.setHelpUrlForManualPage("Test editor QTI 2.1 in detail#details_testeditor_test");
-		allowCommentEl.setHelpUrlForManualPage("Test editor QTI 2.1 in detail#details_testeditor_test");
-		allowReviewEl.setHelpUrlForManualPage("Test editor QTI 2.1 in detail#details_testeditor_test");
-		showSolutionEl.setHelpUrlForManualPage("Test editor QTI 2.1 in detail#details_testeditor_test");
 
 		FormLayoutContainer buttonsCont = FormLayoutContainer.createButtonLayout("buttons", getTranslator());
 		formLayout.add(buttonsCont);

src/main/java/org/olat/ims/qti21/ui/editor/ItemSessionControlController.java

@@ -64,14 +64,14 @@ public abstract class ItemSessionControlController extends FormBasicController {
 	private static final String[] yesNoInheritKeys = new String[] { YES, NO, INHERIT };
 
 	private TextElement maxAttemptsEl;
-	protected SingleSelection limitAttemptsEl;
+	private SingleSelection limitAttemptsEl;
 	private FormLink inheritMaxAttemptsButton;
 	private FormLayoutContainer maxAttemptsWarningLayout;
 	
-	protected SingleSelection allowReviewEl;
-	protected SingleSelection showSolutionEl;
-	protected SingleSelection allowSkippingEl;
-	protected SingleSelection allowCommentEl;
+	private SingleSelection allowReviewEl;
+	private SingleSelection showSolutionEl;
+	private SingleSelection allowSkippingEl;
+	private SingleSelection allowCommentEl;
 	
 	private DialogBoxController attemptsWarningCtrl;