Merge OpenOLAT 11.5 to OpenOLAT 12.0 with ac04695f0cf4ba88bb51a785287cc8e6c55a8f75

src/main/java/org/olat/core/gui/components/progressbar/ProgressBar.java

@@ -133,11 +133,13 @@ public class ProgressBar extends AbstractComponent {
 	}
 
 	public boolean isWidthInPercent() {
-		width = 100;
 		return widthInPercent;
 	}
 
 	public void setWidthInPercent(boolean widthInPercent) {
+		if(widthInPercent) {
+			width = 100;
+		}
 		this.widthInPercent = widthInPercent;
 	}
 

src/main/java/org/olat/ims/qti21/ui/editor/interactions/_content/match_score.html

@@ -10,7 +10,7 @@
 	<tbody>
 	#foreach($sourceChoice in $sourceChoices)
 		<tr>
-			<th>${sourceChoice.getSummary()}</th>
+			<th>${r.render($sourceChoice.getSummaryEl())}</th>
 			#set($sourceIndex = ${foreach.index})
 			#foreach($targetChoice in $targetChoices)
 				<td class="o_sel_match_${sourceIndex}_${foreach.index}">