Merge OpenOLAT 10.5 to OpenOLAT default branch with 8a045b2ca17ff85c54836416f388c6ca19f889eb

src/main/java/org/olat/core/commons/modules/bc/FolderRunController.java

@@ -290,11 +290,12 @@ public class FolderRunController extends BasicController implements Activateable
 		}
 		
 		
+		boolean isGuest = ureq.getUserSession().getRoles().isGuestOnly();
 		folderComponent = new FolderComponent(ureq, "foldercomp", rootContainer, filter, customLinkTreeModel, externContainerForCopy);
-		folderComponent.setCanMail(ureq.getUserSession().getRoles().isGuestOnly() ? false : canMail); // guests can never send mail
+		folderComponent.setCanMail(isGuest ? false : canMail); // guests can never send mail
 		folderComponent.addListener(this);
 		folderContainer.put("foldercomp", folderComponent);
-		if (displayWebDAVLink) {
+		if (displayWebDAVLink && !isGuest) {
 			WebDAVModule webDAVModule = CoreSpringFactory.getImpl(WebDAVModule.class);
 			if (webDAVModule.isEnabled() && webDAVModule.isLinkEnabled() && displayWebDAVLink) {
 				folderContainer.contextPut("webdavhttp", FolderManager.getWebDAVHttp());

src/main/java/org/olat/core/util/session/UserSessionManager.java

@@ -574,16 +574,17 @@ public class UserSessionManager implements GenericEventListener {
 	 * @param sessionTimeoutInSec
 	 */
 	public void setGlobalSessionTimeout(int sessionTimeoutInSec) {
-		authUserSessions.forEach(session -> {
+		UserSession[] currentSessions = authUserSessions.toArray(new UserSession[0]);
+		for(int i=currentSessions.length; i-->0; ) {
 			try{
-				SessionInfo sessionInfo = session.getSessionInfo();
+				SessionInfo sessionInfo = currentSessions[i].getSessionInfo();
 				if(sessionInfo != null && sessionInfo.getSession() != null) {
 					sessionInfo.getSession().setMaxInactiveInterval(sessionTimeoutInSec);
 				}
 			} catch(Throwable th){
 				log.error("error setting sesssionTimeout", th);
 			}
-		});
+		}
 	}
 	
 	/**

src/main/java/org/olat/course/nodes/members/MembersPrintController.java

@@ -19,7 +19,6 @@
  */
 package org.olat.course.nodes.members;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.olat.core.gui.UserRequest;
@@ -57,25 +56,24 @@ public class MembersPrintController extends BasicController {
 		mainVC.contextPut("avatarBaseURL", avatarBaseURL);
 		mainVC.contextPut("userPropertyHandlers", userPropertyHandlers);
 		
-		List<Member> members = new ArrayList<>();
 		if(owners != null && owners.size() > 0) {
-			members.addAll(owners);
+			initFormMemberList("owners", translate("members.owners"), owners);
 		}
 		if(coaches != null && coaches.size() > 0) {
-			members.addAll(coaches);
+			initFormMemberList("coaches", translate("members.coaches"), coaches);
 		}
 		if(participants != null && participants.size() > 0) {
-			members.addAll(participants);
+			initFormMemberList("participants", translate("members.participants"), participants);
 		}
-		initFormMemberList("members", members);
 
 		MainPanel mainPanel = new MainPanel("membersPrintPanel");
 		mainPanel.setContent(mainVC);
 		putInitialPanel(mainPanel);
 	}
 	
-	private void initFormMemberList(String name, List<Member> members) {
+	private void initFormMemberList(String name, String label, List<Member> members) {
 		VelocityContainer listVC = createVelocityContainer("printList");
+		listVC.contextPut("label", label);
 		listVC.contextPut("avatarBaseURL", avatarBaseURL);
 		listVC.contextPut("members", members);
 		listVC.contextPut("userPropertyHandlers", userPropertyHandlers);

src/main/java/org/olat/course/nodes/members/_content/print.html

@@ -3,8 +3,14 @@
 </div>
 <h1>$r.translate("print.title")</h1>
 <h3>$courseTitle</h3>
-#if($r.available("members"))
-	$r.render("members")
+#if($r.available("owners"))
+	$r.render("owners")
+#end
+#if($r.available("coaches"))
+	$r.render("coaches")
+#end
+#if($r.available("participants"))
+	$r.render("participants")
 #end
 <script type='text/javascript'>
 /* <![CDATA[ */

src/main/java/org/olat/course/nodes/members/_content/printList.html

+<div class="clearfix">
+<h4>$label</h4>
 #foreach($member in $members)
 	<div class="o_cmember col-xs-3 col-sm-3 col-md-3">
 		<div class="clearfix">
@@ -26,3 +28,4 @@
 		<div class="clearfix"> </div>
 	#end
 #end
+</div>
\ No newline at end of file

src/main/webapp/static/themes/compiletheme.sh

@@ -50,7 +50,7 @@ doCompile () {
 	UPDATE=$UPDATECMD
 	if [ $1 = "."  ];
 	then
-		TARGET="openolat"
+		TARGET="light"
 	if [[ "--watch" == $UPDATECMD && ! -z $THEMES ]]; then UPDATE="--update"; fi
 	fi
 	echo "Compiling SASS: $TARGET $STYLE"

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

@@ -143,6 +143,7 @@ ul.o_dropdown {
 	.o_thumbnail{
 		width:200px; 
 		height:200px;
+		display: inline-block; /* render centered if title larger than image */
 		background-color: #fff;
 		margin: 0 -5px; /* remove ugly border */
 	}