OO-4080: Multiline sliders labels in rubric

src/main/java/org/olat/modules/forms/ui/EvaluationFormExcelExport.java

@@ -343,6 +343,6 @@ public class EvaluationFormExcelExport {
 		} else if (StringHelper.containsNonWhitespace(slider.getEndLabel())) {
 			sb.append(slider.getEndLabel());
 		}
-		return sb.toString();
+		return FilterFactory.getHtmlTagAndDescapingFilter().filter(sb.toString());
 	}
 }

src/main/java/org/olat/modules/forms/ui/RubricEditorController.java

@@ -35,12 +35,14 @@ import org.olat.core.gui.components.form.flexible.FormItem;
 import org.olat.core.gui.components.form.flexible.FormItemContainer;
 import org.olat.core.gui.components.form.flexible.elements.FormLink;
 import org.olat.core.gui.components.form.flexible.elements.MultipleSelectionElement;
+import org.olat.core.gui.components.form.flexible.elements.RichTextElement;
 import org.olat.core.gui.components.form.flexible.elements.SingleSelection;
 import org.olat.core.gui.components.form.flexible.elements.SliderElement;
 import org.olat.core.gui.components.form.flexible.elements.TextElement;
 import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
 import org.olat.core.gui.components.form.flexible.impl.FormEvent;
 import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
+import org.olat.core.gui.components.form.flexible.impl.elements.richText.TextMode;
 import org.olat.core.gui.components.link.Link;
 import org.olat.core.gui.components.updown.UpDown;
 import org.olat.core.gui.components.updown.UpDownEvent;
@@ -493,11 +495,14 @@ public class RubricEditorController extends FormBasicController implements PageE
 
 	private SliderRow forgeSliderRow(Slider slider) {
 		String startLabel = slider.getStartLabel();
-		TextElement startLabelEl = uifactory.addTextElement("start.label." + count.incrementAndGet(), "start.label", 256, startLabel, flc);
-		startLabelEl.setDomReplacementWrapperRequired(false);
+		RichTextElement startLabelEl = uifactory.addRichTextElementForStringDataMinimalistic(
+				"start.label." + count.incrementAndGet(), null, startLabel, 4, -1, flc, getWindowControl());
+		startLabelEl.getEditorConfiguration().setSimplestTextModeAllowed(TextMode.oneLine);
+
 		String endLabel = slider.getEndLabel();
-		TextElement endLabelEl = uifactory.addTextElement("end.label." + count.incrementAndGet(), "end.label", 256, endLabel, flc);
-		endLabelEl.setDomReplacementWrapperRequired(false);
+		RichTextElement endLabelEl = uifactory.addRichTextElementForStringDataMinimalistic(
+				"end.label." + count.incrementAndGet(), null, endLabel, 4, -1, flc, getWindowControl());
+		endLabelEl.getEditorConfiguration().setSimplestTextModeAllowed(TextMode.oneLine);
 
 		SliderRow row = new SliderRow(slider, startLabelEl, endLabelEl, createSliderEl());
 		if(!restrictedEdit) {

src/main/java/org/olat/modules/forms/ui/RubricTableController.java

@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.olat.core.gui.UserRequest;
+import org.olat.core.gui.components.EscapeMode;
 import org.olat.core.gui.components.form.flexible.FormItemContainer;
 import org.olat.core.gui.components.form.flexible.elements.FlexiTableElement;
 import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
@@ -31,6 +32,7 @@ import org.olat.core.gui.components.form.flexible.impl.elements.table.DefaultFle
 import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiColumnModel;
 import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiTableColumnModel;
 import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiTableDataModelFactory;
+import org.olat.core.gui.components.form.flexible.impl.elements.table.TextFlexiCellRenderer;
 import org.olat.core.gui.control.Controller;
 import org.olat.core.gui.control.WindowControl;
 import org.olat.core.util.CodeHelper;
@@ -78,7 +80,9 @@ public class RubricTableController extends FormBasicController {
 		List<LegendEntry> legendSigns = new ArrayList<>();
 		int columnIndex = 0;
 		FlexiTableColumnModel columnsModel = FlexiTableDataModelFactory.createFlexiTableColumnModel();
-		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(RubricReportCols.startLabel.i18nHeaderKey(), columnIndex++, false, null));
+		DefaultFlexiColumnModel startLabelModel = new DefaultFlexiColumnModel(RubricReportCols.startLabel.i18nHeaderKey(), columnIndex++, false, null);
+		startLabelModel.setCellRenderer(new TextFlexiCellRenderer(EscapeMode.antisamy));
+		columnsModel.addFlexiColumnModel(startLabelModel);
 		
 		if (!rubric.getSliderType().equals(SliderType.continuous)) {
 			ScaleType scaleType = rubric.getScaleType();
@@ -101,6 +105,7 @@ public class RubricTableController extends FormBasicController {
 
 		if (hasEndLabel()) {
 			DefaultFlexiColumnModel columnModel = new DefaultFlexiColumnModel(RubricReportCols.endLabel.i18nHeaderKey(), columnIndex++, false, null);
+			columnModel.setCellRenderer(new TextFlexiCellRenderer(EscapeMode.antisamy));
 			columnsModel.addFlexiColumnModel(columnModel);
 		}
 		if (rubric.isNoResponseEnabled()) {

src/main/java/org/olat/modules/forms/ui/_content/rubric.html

@@ -3,7 +3,7 @@
 #set($hasRightLabels = $element.rightLabels)
 #set($isNoResponseEnabled = $element.noResponseEnabled)
 
-#if($hasLeftLabels || $hasRightLabels)
+#if($hasLeftLabels && $hasRightLabels)
 	#set($colLeft = "col-sm-3")
 	#if($isNoResponseEnabled)
 		#set($colMiddle = "col-sm-5")
@@ -14,25 +14,25 @@
 	#end
 	#set($colRight = "col-sm-3")
 #elseif($hasLeftLabels)
-	#set($colLeft = "col-sm-3")
+	#set($colLeft = "col-sm-6")
 	#if($isNoResponseEnabled)
-		#set($colMiddle = "col-sm-8")
+		#set($colMiddle = "col-sm-5")
 		#set($colNoResponse = "col-sm-1")
 	#else
-		#set($colMiddle = "col-sm-9")
+		#set($colMiddle = "col-sm-6")
 		#set($colNoResponse = "col-sm-0")
 	#end
 	#set($colRight = "col-sm-0")
 #elseif($hasRightLabels)
 	#set($colLeft = "col-sm-0")
 	#if($isNoResponseEnabled)
-		#set($colMiddle = "col-sm-8")
+		#set($colMiddle = "col-sm-5")
 		#set($colNoResponse = "col-sm-1")
 	#else
-		#set($colMiddle = "col-sm-9")
+		#set($colMiddle = "col-sm-6")
 		#set($colNoResponse = "col-sm-0")
 	#end
-	#set($colRight = "col-sm-3")
+	#set($colRight = "col-sm-6")
 #else
 	#set($colLeft = "col-sm-0")
 	#if($isNoResponseEnabled)

src/main/java/org/olat/modules/forms/ui/_content/rubric_editor.html

@@ -62,9 +62,9 @@
 	#foreach($slider in $sliders)
 	<div class="row o_slider_editor">
 		<div class="$colSliderStart">$r.render($slider.startLabelEl)</div>
-		<div class="$colSliderPreview $slider.sliderCss">$r.render($slider.sliderEl)</div>
+		<div class="$colSliderPreview $slider.sliderCss o_slider_top">$r.render($slider.sliderEl)</div>
 		<div class="$colSliderEnd">$r.render($slider.endLabelEl)</div>
-		<div class="$colSliderButtons">
+		<div class="$colSliderButtons o_slider_top">
 			<div class="pull-right">
 				$r.render($slider.upDown)
 				#if($r.isNotNull($slider.deleteButton) && $r.visible($slider.deleteButton))

src/main/java/org/olat/modules/quality/analysis/ui/SliderTrendController.java

@@ -26,6 +26,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.olat.core.gui.UserRequest;
+import org.olat.core.gui.components.EscapeMode;
 import org.olat.core.gui.components.form.flexible.FormItem;
 import org.olat.core.gui.components.form.flexible.FormItemContainer;
 import org.olat.core.gui.components.form.flexible.elements.FlexiTableElement;
@@ -36,6 +37,7 @@ import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
 import org.olat.core.gui.components.form.flexible.impl.elements.table.DefaultFlexiColumnModel;
 import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiTableColumnModel;
 import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiTableDataModelFactory;
+import org.olat.core.gui.components.form.flexible.impl.elements.table.TextFlexiCellRenderer;
 import org.olat.core.gui.components.util.KeyValues;
 import org.olat.core.gui.control.Controller;
 import org.olat.core.gui.control.WindowControl;
@@ -119,7 +121,9 @@ public class SliderTrendController extends FormBasicController {
 	private void updateTable(List<String> temporalHeaders) {
 		int columnIndex = 0;
 		FlexiTableColumnModel columnsModel = FlexiTableDataModelFactory.createFlexiTableColumnModel();
-		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel("slider.trend.table.title.question", columnIndex++));
+		DefaultFlexiColumnModel questionModel = new DefaultFlexiColumnModel("slider.trend.table.title.question", columnIndex++);
+		questionModel.setCellRenderer(new TextFlexiCellRenderer(EscapeMode.antisamy));
+		columnsModel.addFlexiColumnModel(questionModel);
 		for (String header: temporalHeaders) {
 			DefaultFlexiColumnModel columnModel = new DefaultFlexiColumnModel("slider.trend.table.title.question", columnIndex++);
 			columnModel.setHeaderLabel(header);

src/main/webapp/static/themes/light/email.css.map

 {
 "version": 3,
-"mappings": "AAkBA,aAAc,CACb,WAAW,CCq0Be,wGAA8G,CDp0BxI,SAAS,CCq0BgB,KAAK,CDn0B9B,8BAAiB,CAChB,MAAM,CCm0BsB,aAAc,CDl0B1C,YAAY,CCm0BoB,IAAI,CDj0BpC,iCAAG,CACF,gBAAgB,CCu0BK,OAAe,CDt0BpC,KAAK,CCq0BkB,IAAkB,CDp0BzC,OAAO,CAAE,gBAAyC,CAClD,aAAa,CAAE,IAAI,CACnB,WAAW,CAAE,KAA8B,CAC3C,SAAS,CAAE,OAAO,CAGnB,qCAAO,CACN,KAAK,CC8zBgB,OAAe,CD3zBtC,6BAAgB,CACf,SAAS,CAAE,OAAO,CAClB,KAAK,CCszBqB,IAAgB,CDrzB1C,UAAU,CAAE,iBAAmC,CAC/C,OAAO,CAAE,QAAQ,CACjB,UAAU,CAAE,GAAG,CAEf,+BAAE,CACD,KAAK,CCgzBoB,IAAgB,CDzyB3C,6BAAc,CACb,WAAW,CAAE,OAAO,CAWrB,6BAAgB,CACf,KAAK,CC8xBmB,IAAkB,CD7xB1C,gBAAgB,CC8xBM,OAAe,CD7xBrC,YAAY,CC8xBiB,OAAmB,CD7xBhD,aAAa,CC8xBiB,GAAG,CD7xBjC,OAAO,CAAE,QAAQ,CACjB,UAAU,CAAE,MAAM,CAClB,WAAW,CAAE,MAAM,CACnB,cAAc,CAAE,MAAM,CACtB,YAAY,CAAE,YAAY,CAC1B,MAAM,CAAE,OAAO,CACf,eAAe,CAAE,IAAI,CAGtB,mCAAsB,CACrB,UAAU,CAAE,GAAG,CACf,aAAa,CAAE,GAAG,CAClB,UAAU,CAAE,MAAM,CAElB,qCAAE,CACD,YAAY,CAAE,GAAG,CACjB,aAAa,CAAE,KAAK,CACpB,WAAW,CAAE,IAAI,CACjB,gDAAa,CACZ,YAAY,CAAE,CAAC,CAMlB,wCAA2B,CAC1B,UAAU,CAAE,IAAI,CAEjB,yCAA4B,CAC3B,UAAU,CAAE,KAAK",
+"mappings": "AAkBA,aAAc,CACb,WAAW,CCu0Be,wGAA8G,CDt0BxI,SAAS,CCu0BgB,KAAK,CDr0B9B,8BAAiB,CAChB,MAAM,CCq0BsB,aAAc,CDp0B1C,YAAY,CCq0BoB,IAAI,CDn0BpC,iCAAG,CACF,gBAAgB,CCy0BK,OAAe,CDx0BpC,KAAK,CCu0BkB,IAAkB,CDt0BzC,OAAO,CAAE,gBAAyC,CAClD,aAAa,CAAE,IAAI,CACnB,WAAW,CAAE,KAA8B,CAC3C,SAAS,CAAE,OAAO,CAGnB,qCAAO,CACN,KAAK,CCg0BgB,OAAe,CD7zBtC,6BAAgB,CACf,SAAS,CAAE,OAAO,CAClB,KAAK,CCwzBqB,IAAgB,CDvzB1C,UAAU,CAAE,iBAAmC,CAC/C,OAAO,CAAE,QAAQ,CACjB,UAAU,CAAE,GAAG,CAEf,+BAAE,CACD,KAAK,CCkzBoB,IAAgB,CD3yB3C,6BAAc,CACb,WAAW,CAAE,OAAO,CAWrB,6BAAgB,CACf,KAAK,CCgyBmB,IAAkB,CD/xB1C,gBAAgB,CCgyBM,OAAe,CD/xBrC,YAAY,CCgyBiB,OAAmB,CD/xBhD,aAAa,CCgyBiB,GAAG,CD/xBjC,OAAO,CAAE,QAAQ,CACjB,UAAU,CAAE,MAAM,CAClB,WAAW,CAAE,MAAM,CACnB,cAAc,CAAE,MAAM,CACtB,YAAY,CAAE,YAAY,CAC1B,MAAM,CAAE,OAAO,CACf,eAAe,CAAE,IAAI,CAGtB,mCAAsB,CACrB,UAAU,CAAE,GAAG,CACf,aAAa,CAAE,GAAG,CAClB,UAAU,CAAE,MAAM,CAElB,qCAAE,CACD,YAAY,CAAE,GAAG,CACjB,aAAa,CAAE,KAAK,CACpB,WAAW,CAAE,IAAI,CACjB,gDAAa,CACZ,YAAY,CAAE,CAAC,CAMlB,wCAA2B,CAC1B,UAAU,CAAE,IAAI,CAEjB,yCAA4B,CAC3B,UAAU,CAAE,KAAK",
 "sources": ["email.scss","_config.scss"],
 "names": [],
 "file": "email.css"

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

@@ -309,6 +309,9 @@
 		font-size: 90%;
 	}
 	
+	.o_slider_top {
+		margin-top: 23px;
+	}
 }
 
 @media (max-width: $screen-sm-min) {