Merge remote-tracking branch 'origin/OpenOLAT_14.2'

src/main/java/org/olat/modules/lecture/manager/LectureBlockDAO.java

@@ -580,7 +580,9 @@ public class LectureBlockDAO {
 
 		if(StringHelper.containsNonWhitespace(searchParams.getSearchString())) {
 			sb.and()
-			  .append(" (entry.externalRef=:searchString or ")
+			  .append("(")
+			  .likeFuzzy("entry.externalRef", "fuzzySearchString", dbInstance.getDbVendor())
+			  .append(" or ")
 			  .likeFuzzy("entry.displayname", "fuzzySearchString", dbInstance.getDbVendor())
 			  .append(" or ")
 			  .likeFuzzy("block.title", "fuzzySearchString", dbInstance.getDbVendor())
@@ -648,9 +650,7 @@ public class LectureBlockDAO {
 		}
 		
 		if(StringHelper.containsNonWhitespace(searchParams.getSearchString())) {
-			String searchString = searchParams.getSearchString();
-			query.setParameter("searchString", searchString);
-			String fuzzySearchString = PersistenceHelper.makeFuzzyQueryString(searchString);
+			String fuzzySearchString = PersistenceHelper.makeFuzzyQueryString(searchParams.getSearchString());
 			query.setParameter("fuzzySearchString", fuzzySearchString);
 		}
 		if(searchParams.getStartDate() != null) {

src/main/java/org/olat/modules/lecture/ui/LecturesMainController.java

@@ -63,7 +63,8 @@ public class LecturesMainController extends MainLayoutBasicController implements
 		listenTo(columnLayoutCtr); // auto dispose later
 		putInitialPanel(columnLayoutCtr.getInitialComponent());
 		
-		content.rootController("[ROOT]", lectureCoachingCtrl);
+		String title = translate("coach.lectures");
+		content.rootController(title, lectureCoachingCtrl);
 	}
 
 	@Override

src/main/java/org/olat/modules/lecture/ui/TeacherToolOverviewController.java

@@ -52,7 +52,7 @@ public class TeacherToolOverviewController extends AbstractTeacherOverviewContro
 	private LectureService lectureService;
 	
 	public TeacherToolOverviewController(UserRequest ureq, WindowControl wControl, LecturesSecurityCallback secCallback) {
-		super(ureq, wControl, false, "Lectures::UserTools", true, false);
+		super(ureq, wControl, secCallback.viewAs() == LectureRoles.lecturemanager, "Lectures::UserTools", true, false);
 		this.secCallback = secCallback;
 		initTables(ureq, false, false);
 		

src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_de.properties

@@ -380,7 +380,7 @@ search.form.status.closed=$\:closed
 search.form.status.open=$\:open
 search.form.status.reopen=$\:reopen
 search.form.string=Suche
-search.form.string.hint=In der Suche k\u00F6nnen Sie nach Titeln eines Lektionenblockes oder nach der Externen Referenz suchen. Bei der Suche mit der Externen Referenz werden nur exakte Treffer angezeigt.
+search.form.string.hint=In der Suche k\u00F6nnen Sie nach Titeln eines Lektionenblockes oder nach dem Kennzeichen suchen. Bei der Suche mit dem Kennzeichen werden nur exakte Treffer angezeigt.
 search.form.till=bis
 search.form.type=Art
 search.participants=Suche nach Teilnehmern

src/main/webapp/static/themes/light/modules/_lecture.scss

@@ -93,4 +93,8 @@
 .o_rollcall_portrait>div {
 	margin: 0 auto 10px auto;
 	width: 100px;
-}
\ No newline at end of file
+}
+
+.o_lectures div#o_main_toolbar.o_toolbar {
+	margin-top: 0px;
+}