diff --git a/src/main/java/org/olat/course/nodes/CheckListCourseNode.java b/src/main/java/org/olat/course/nodes/CheckListCourseNode.java
index a358ece778d99bb1b4cb7efb94c8ac428252629b..8f085d5b720b107caad329af71516ee702069abb 100644
--- a/src/main/java/org/olat/course/nodes/CheckListCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/CheckListCourseNode.java
@@ -67,10 +67,10 @@ import org.olat.course.nodes.cl.CheckListAssessmentConfig;
import org.olat.course.nodes.cl.CheckboxManager;
import org.olat.course.nodes.cl.model.Checkbox;
import org.olat.course.nodes.cl.model.CheckboxList;
+import org.olat.course.nodes.cl.ui.CheckListAssessmentController;
import org.olat.course.nodes.cl.ui.CheckListEditController;
import org.olat.course.nodes.cl.ui.CheckListExcelExport;
import org.olat.course.nodes.cl.ui.CheckListRunController;
-import org.olat.course.nodes.cl.ui.CheckListRunForCoachController;
import org.olat.course.properties.CoursePropertyManager;
import org.olat.course.run.navigation.NodeRunConstructionResult;
import org.olat.course.run.scoring.ScoreEvaluation;
@@ -139,7 +139,7 @@ public class CheckListCourseNode extends AbstractAccessableCourseNode {
String message = trans.translate("guestnoaccess.message");
ctrl = MessageUIFactory.createInfoMessage(ureq, wControl, title, message);
} else if(userCourseEnv.isCoach() || userCourseEnv.isAdmin()) {
- ctrl = new CheckListRunForCoachController(ureq, wControl, userCourseEnv, ores, this);
+ ctrl = new CheckListAssessmentController(ureq, wControl, userCourseEnv, ores, this);
} else {
ctrl = new CheckListRunController(ureq, wControl, userCourseEnv, ores, this);
}
diff --git a/src/main/java/org/olat/course/nodes/cl/ui/CheckListRunForCoachController.java b/src/main/java/org/olat/course/nodes/cl/ui/CheckListRunForCoachController.java
deleted file mode 100644
index da5aa23e4e46e6105a977928ad5b698b944ebfc3..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/cl/ui/CheckListRunForCoachController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
- * <a href="http://www.openolat.org">
- * OpenOLAT - Online Learning and Training</a><br>
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); <br>
- * you may not use this file except in compliance with the License.<br>
- * You may obtain a copy of the License at the
- * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
- * <p>
- * Unless required by applicable law or agreed to in writing,<br>
- * software distributed under the License is distributed on an "AS IS" BASIS, <br>
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
- * See the License for the specific language governing permissions and <br>
- * limitations under the License.
- * <p>
- * Initial code contributed and copyrighted by<br>
- * frentix GmbH, http://www.frentix.com
- * <p>
- */
-package org.olat.course.nodes.cl.ui;
-
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.components.Component;
-import org.olat.core.gui.components.link.Link;
-import org.olat.core.gui.components.link.LinkFactory;
-import org.olat.core.gui.components.segmentedview.SegmentViewComponent;
-import org.olat.core.gui.components.segmentedview.SegmentViewEvent;
-import org.olat.core.gui.components.segmentedview.SegmentViewFactory;
-import org.olat.core.gui.components.velocity.VelocityContainer;
-import org.olat.core.gui.control.Controller;
-import org.olat.core.gui.control.Event;
-import org.olat.core.gui.control.WindowControl;
-import org.olat.core.gui.control.controller.BasicController;
-import org.olat.core.id.OLATResourceable;
-import org.olat.course.nodes.CheckListCourseNode;
-import org.olat.course.run.userview.UserCourseEnvironment;
-
-/**
- *
- * Initial date: 07.02.2014<br>
- * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
- *
- */
-public class CheckListRunForCoachController extends BasicController {
-
- private final VelocityContainer mainVC;
-
- private final Link runLink, coachLink;
- private final SegmentViewComponent segmentView;
-
- private CheckListRunController runController;
- private CheckListAssessmentController assessmentController;
-
- private final OLATResourceable courseOres;
- private final CheckListCourseNode courseNode;
- private final UserCourseEnvironment userCourseEnv;
-
- public CheckListRunForCoachController(UserRequest ureq, WindowControl wControl,
- UserCourseEnvironment userCourseEnv, OLATResourceable courseOres, CheckListCourseNode courseNode) {
- super(ureq, wControl);
-
- this.courseOres = courseOres;
- this.courseNode = courseNode;
- this.userCourseEnv = userCourseEnv;
- mainVC = createVelocityContainer("segments");
-
- segmentView = SegmentViewFactory.createSegmentView("segments", mainVC, this);
- runLink = LinkFactory.createLink("run.run", mainVC, this);
- segmentView.addSegment(runLink, true);
- coachLink = LinkFactory.createLink("run.coach", mainVC, this);
- segmentView.addSegment(coachLink, false);
-
- doOpenRun(ureq);
-
- mainVC.put("segments", segmentView);
- putInitialPanel(mainVC);
- }
-
- @Override
- protected void doDispose() {
- //
- }
-
- @Override
- protected void event(UserRequest ureq, Component source, Event event) {
- if(source == segmentView) {
- if(event instanceof SegmentViewEvent) {
- SegmentViewEvent sve = (SegmentViewEvent)event;
- String segmentCName = sve.getComponentName();
- Component clickedLink = mainVC.getComponent(segmentCName);
- if (clickedLink == runLink) {
- doOpenRun(ureq);
- } else if (clickedLink == coachLink) {
- doOpenCoach(ureq);
- }
- }
- }
- }
-
- @Override
- protected void event(UserRequest ureq, Controller source, Event event) {
- if(runController == source) {
- if(event == Event.CHANGED_EVENT) {
- fireEvent(ureq, event);
- }
- }
- super.event(ureq, source, event);
- }
-
- private void doOpenRun(UserRequest ureq) {
- if(runController == null) {
- runController = new CheckListRunController(ureq, getWindowControl(), userCourseEnv, courseOres, courseNode);
- listenTo(runController);
- }
- mainVC.put("segmentCmp", runController.getInitialComponent());
- }
-
- private void doOpenCoach(UserRequest ureq) {
- if(assessmentController == null) {
- assessmentController = new CheckListAssessmentController(ureq, getWindowControl(), userCourseEnv, courseOres, courseNode);
- listenTo(assessmentController);
- }
- mainVC.put("segmentCmp", assessmentController.getInitialComponent());
- }
-}
diff --git a/src/main/java/org/olat/course/nodes/cl/ui/_content/segments.html b/src/main/java/org/olat/course/nodes/cl/ui/_content/segments.html
deleted file mode 100644
index 3a8932a78c272982dff57845ee5c1656d3a7b28d..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/cl/ui/_content/segments.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="clearfix">
- $r.render("segments")
- #if($r.available("segmentCmp"))
- <div class="o_segments_content">
- $r.render("segmentCmp")
- </div>
- #end
-</div>
\ No newline at end of file
diff --git a/src/main/java/org/olat/course/nodes/cl/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/nodes/cl/ui/_i18n/LocalStrings_de.properties
index 5892b6ab9c800af3bae96673107ac886e7eff41a..78aed71db1dadcb32bb27de36305bbb2f244fdbd 100644
--- a/src/main/java/org/olat/course/nodes/cl/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/nodes/cl/ui/_i18n/LocalStrings_de.properties
@@ -85,12 +85,10 @@ points=Punkte
release=Freigabe
release.coachOnly=Nur Betreuer
release.userAndCoach=Benutzer und Betreuer
-run.coach=Checklisten Verwaltung
run.due.date=Abgabedatum\: <span class\="o_cl_duedate">{0}</span>
run.due.date.desc=Diese Checkliste ist mit einem Abgabedatum versehen. Nach dem Abgabedatum kann die Checkliste nicht mehr von Ihnen ver\u00E4ndert werden.
run.info=Information
run.mark=Markierung
-run.run=Pers\u00F6nliche Checkliste
score.max=$org.olat.course.nodes.ms\:score.max
score.min=$org.olat.course.nodes.ms\:score.min
score.noscore=$org.olat.course.nodes.ms\:score.noscore
diff --git a/src/main/java/org/olat/course/nodes/cl/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/nodes/cl/ui/_i18n/LocalStrings_en.properties
index 0ecda6906e63415ed3a22a5b02ef673b8e944d7e..533cb970c1f9b9b43906eb540b4b54e96c4101e2 100644
--- a/src/main/java/org/olat/course/nodes/cl/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/nodes/cl/ui/_i18n/LocalStrings_en.properties
@@ -85,12 +85,10 @@ points=Score
release=Access
release.coachOnly=Coach only
release.userAndCoach=Participant and coach
-run.coach=Manage checklists
run.due.date=Deadline\: <span class\="o_cl_duedate">{0}</span>
run.due.date.desc=Please notice that this checklist has a deadline. You will not be able to make changes to the checklist after the deadline expiration.
run.info=Information
run.mark=Check marks
-run.run=My checklist
score.max=$org.olat.course.nodes.ms\:score.max
score.min=$org.olat.course.nodes.ms\:score.min
score.noscore=$org.olat.course.nodes.ms\:score.noscore
diff --git a/src/main/java/org/olat/course/nodes/cl/ui/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/course/nodes/cl/ui/_i18n/LocalStrings_fr.properties
index 62eb8caed4c91751b8b85b7358b81cf0be685d79..00835af52b8ee4c160d40f7c889f840580102cbd 100644
--- a/src/main/java/org/olat/course/nodes/cl/ui/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/course/nodes/cl/ui/_i18n/LocalStrings_fr.properties
@@ -85,12 +85,10 @@ points=Note
release=Acc\u00E8s
release.coachOnly=Seulement le coach
release.userAndCoach=Participant et coach
-run.coach=G\u00E9rer les listes de contr\u00F4le
run.due.date=D\u00E9lai\: <span class\="o_cl_duedate">{0}</span>
run.due.date.desc=Veuillez noter que cette liste de contr\u00F4le dispose d'un d\u00E9lai. Vous ne serez plus en mesure de la modifier apr\u00E8s la date limite d'expiration.
run.info=Informations
run.mark=Coches
-run.run=Mes listes de contr\u00F4le
score.max=$org.olat.course.nodes.ms\:score.max
score.min=$org.olat.course.nodes.ms\:score.min
score.noscore=$org.olat.course.nodes.ms\:score.noscore
diff --git a/src/main/java/org/olat/course/nodes/cl/ui/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/course/nodes/cl/ui/_i18n/LocalStrings_it.properties
index 20145886bdd25489c96adde42b5744b675b9c413..36ecb2a8ddbbce49ffec104932874bcea89ad876 100644
--- a/src/main/java/org/olat/course/nodes/cl/ui/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/course/nodes/cl/ui/_i18n/LocalStrings_it.properties
@@ -77,12 +77,10 @@ points=Punteggio
release=Accesso
release.coachOnly=Solo il tutore
release.userAndCoach=Partecipante e tutore
-run.coach=Gestire le checklist
run.due.date=Scadenza\: <span class\="o_cl_duedate">{0}</span>
run.due.date.desc=Prego notare che questa checklist ha una scadenza. Non potrai effettuare cambiamenti alla checklist dopo la scadenza.
run.info=Informazioni
run.mark=Selezioni
-run.run=Le mie checklist
score.max=$org.olat.course.nodes.ms\:score.max
score.min=$org.olat.course.nodes.ms\:score.min
score.noscore=$org.olat.course.nodes.ms\:score.noscore
diff --git a/src/main/java/org/olat/course/nodes/cl/ui/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/course/nodes/cl/ui/_i18n/LocalStrings_pt_BR.properties
index 09cc730351543366d3296364141e711e30f6acaf..0705837c72d7acdcfe2c866bd2bdc5257c34a04b 100644
--- a/src/main/java/org/olat/course/nodes/cl/ui/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/course/nodes/cl/ui/_i18n/LocalStrings_pt_BR.properties
@@ -85,12 +85,10 @@ points=Pontua\u00E7\u00E3o
release=Acesso
release.coachOnly=Apenas tutor
release.userAndCoach=Participante e tutor
-run.coach=Gerenciar checklists
run.due.date=Prazo\: <span class\="o_cl_duedate">{0}</span>
run.due.date.desc=Por favor note que esta lista tem um prazo. Voc\u00EA n\u00E3o ser\u00E1 capaz de fazer altera\u00E7\u00F5es na lista ap\u00F3s a expira\u00E7\u00E3o prazo.
run.info=Informa\u00E7\u00F5es
run.mark=Marca\u00E7\u00F5es de verifica\u00E7\u00E3o
-run.run=Meus checklists
score.max=$org.olat.course.nodes.ms\:score.max
score.min=$org.olat.course.nodes.ms\:score.min
score.noscore=$org.olat.course.nodes.ms\:score.noscore