Merge remote-tracking branch 'origin/OpenOLAT_12.5' into OpenOLAT_13.2

src/main/java/org/olat/core/commons/fullWebApp/_content/fullwebapplayout.html

@@ -257,7 +257,7 @@ $r.renderForce("development")
 </div>
 #end
 ## ---- END #o_header ---	
-
+<a id='o_top'></a>
 ## ---- START #o_navbar ---
 #if($screenMode.standardScreen)
 <div id="o_offcanvas_right" class="o_navbar o_navbar-offcanvas " role="navigation">
@@ -268,7 +268,6 @@ $r.renderForce("development")
 		#end
 	</div>
 </div>
-<a id='o_top'></a>
 <div id="o_navbar_wrapper" class="o_navbar" role="navigation">
 	<div id="o_navbar_container" class="o_container_offcanvas container-fluid">
 		#set($logoLinkUri = $logoInfos.logoLinkUri)

src/main/java/org/olat/ims/qti21/ui/components/_content/matchInteraction_kprim.html

@@ -16,14 +16,14 @@
 		<thead>
 			<tr>
 			#if($r.classContains($interaction,"choiceright"))
-				<th class="o_qti_item_kprim_text"/>
+				<th class="o_qti_item_kprim_text"> </th>
 			#end
             #foreach($choice2 in $orderedSet2)
             	#set($set2Identifier = $r.toString($choice2.identifier))
 				<th class="o_qti_item_kprim_input o_qti_item_kprim_input_${set2Identifier}">$r.renderKprimSpecialFlowStatics($choice2.getFlowStatics())</th>
 			#end
 			#if(!$r.classContains($interaction,"choiceright"))
-				<th class="o_qti_item_kprim_text"/>
+				<th class="o_qti_item_kprim_text"> </th>
 			#end
 			</tr>
         </thead>