Merge remote-tracking branch 'origin/OpenOLAT_12.5'

src/main/java/org/olat/commons/memberlist/ui/_content/memberList.html

@@ -13,6 +13,9 @@
 					$r.render($member.getChatComponentName())
 				#end
 				$r.render($member.getIdLink().getComponent().getComponentName())
+				#if($r.available($member.getEmailComponentName()))
+					$r.render($member.getEmailComponentName())
+				#end
 				#set ($skipNextBR=false)
 				#foreach($userPropertyHandler in $userPropertyHandlers)
 					#if($userPropertyHandler.name != "firstName" && $userPropertyHandler.name != "lastName") 
@@ -32,10 +35,6 @@
 						<div class="o_prop o_curriculum_root_el_displayname">$member.curriculumRootElementDisplayName</div>
 					#end
 				#end
-				
-				#if($r.available($member.getEmailComponentName()))
-					$r.render($member.getEmailComponentName())
-				#end
 			</div>
 		</div>
 	</div>

src/main/java/org/olat/ims/qti21/ui/components/AssessmentObjectComponentRenderer.java

@@ -1021,9 +1021,13 @@ public abstract class AssessmentObjectComponentRenderer extends DefaultComponent
 			VelocityHelper vh = VelocityHelper.getInstance();
 			vh.mergeContent(page, ctx, sb, null);
 			ctx.remove("r");
+			if(!renderer.isMathJax()) {
+				renderer.setMathJax(fHints.isMathJax());
+			}
 		} catch(IOException e) {
 			log.error("", e);
 		}
+		
 	}
 	
 	private String getInteractionTemplate(QtiNode interaction) {

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

@@ -171,6 +171,7 @@
 			padding-right: $padding-large-vertical;		
 			display: table-cell;
 			vertical-align: top;
+			min-width: 60px;
 			img {
 				width: 50px;
 				height: 50px;