Merge OpenOLAT 10 to OpenOLAT default branch with 2a41e15a1b95be552bf7457da2efc88954334971

src/main/java/org/olat/modules/iq/IQComponentRenderer.java

@@ -230,13 +230,12 @@ public class IQComponentRenderer implements ComponentRenderer {
 			sb.append("\"");
 			if (!displayForm) sb.append(" style=\"display: none;\"");
 			sb.append(" />")
-			  .append("</div><div class='col-md-8'>");
+			  .append("</div><div class='col-md-10'>");
 
 			if (memo && memoId != null) {
-				sb.append("<div class=\"o_qti_item_note_box_title\">");
-				sb.append(translator.translate("qti.memofield"));
 				sb.append("<div class=\"o_qti_item_note_box\">");
-				sb.append("<textarea id=\"o_qti_item_note\" rows=\"2\" spellcheck=\"false\" onchange=\"memo('");
+				sb.append("<label class=\"control-label\" for=\"o_qti_item_note\">").append(translator.translate("qti.memofield")).append("</label>");
+				sb.append("<textarea id=\"o_qti_item_note\" class=\"form-control\" rows=\"4\" spellcheck=\"false\" onchange=\"memo('");
 				sb.append(memoId);
 				sb.append("', this.value);\" onkeyup=\"resize(this);\" onmouseup=\"resize(this);\"");
 				if (isDefaultMemo) {
@@ -245,7 +244,6 @@ public class IQComponentRenderer implements ComponentRenderer {
 				sb.append(">")
 				  .append(memoTx)
 				  .append("</textarea>")
-				  .append("</div>")
 				  .append("</div>");
 			}
 			
@@ -395,8 +393,7 @@ public class IQComponentRenderer implements ComponentRenderer {
 		sb.append(ai.isMarked(itc.getIdent()) ? m : n);
 		sb.append("\">");
 		sb.append(t);
-		sb.append("</div>");
-		sb.append("</td>");
+		sb.append(" </div></td>");
 		
 		return sb;
 	}

src/main/webapp/static/js/openolat/glossaryhighlighter.js

@@ -285,6 +285,9 @@ function o_tm_doHighlightSingle(bodyText, glossaryMainTerm, searchTerm) {
 	// Prevent to highlight twice, by looking after highlight-tags
 	junkBefore = lcBodyText.substring(0,i);
 	if ( junkBefore.lastIndexOf("</textarea") < junkBefore.lastIndexOf("<textarea")
+		//only a because aside, abbr, adress tags breaks the glossary
+		|| junkBefore.lastIndexOf("</a") < junkBefore.lastIndexOf("<a")
+		|| junkBefore.lastIndexOf("</button") < junkBefore.lastIndexOf("<button")
 		|| junkBefore.lastIndexOf("</embed") < junkBefore.lastIndexOf("<embed")
 		|| junkBefore.lastIndexOf("</object") < junkBefore.lastIndexOf("<object")
 		|| junkBefore.lastIndexOf("</option") < junkBefore.lastIndexOf("<option") 

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

@@ -98,6 +98,25 @@ div.o_qti_metadatas .panel-body {
 	border-top:none;
 }
 
+.o_qti_menu_item_attempts:after, .o_qti_menu_item_attempts_marked:after {
+	display: inline-block;
+    font: normal normal normal 14px/1 FontAwesome;
+    font-size: inherit;
+    text-rendering: auto;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale
+} 
+
+.o_qti_menu_item_attempts:after {
+	content: $fa-var-flag-o;
+}
+
+.o_qti_menu_item_attempts_marked:after {
+	content: $fa-var-flag;
+	color: $brand-primary;
+} 
+	
+
 /* onyx   */
 .onyx_iframe {
 	width: 100%;