Merge OpenOLAT-11.4 to OpenOLAT-default with 4e5e103f229d72999a0d5fa38dd39bf6b38c6d49

src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/TextAreaElementRenderer.java

@@ -25,7 +25,6 @@
 */ 
 package org.olat.core.gui.components.form.flexible.impl.elements;
 
-import org.apache.commons.lang.StringEscapeUtils;
 import org.olat.core.gui.components.Component;
 import org.olat.core.gui.components.DefaultComponentRenderer;
 import org.olat.core.gui.components.form.flexible.impl.FormJSHelper;
@@ -34,6 +33,7 @@ import org.olat.core.gui.render.Renderer;
 import org.olat.core.gui.render.StringOutput;
 import org.olat.core.gui.render.URLBuilder;
 import org.olat.core.gui.translator.Translator;
+import org.olat.core.util.StringHelper;
 
 /**
  * Description:<br>
@@ -78,24 +78,26 @@ class TextAreaElementRenderer extends DefaultComponentRenderer {
 			if (buestEffortRowCount > rows) rows = buestEffortRowCount;
 		}
 		// Escape HTMl entities
-		value = StringEscapeUtils.escapeHtml(value);
+		value = StringHelper.escapeHtml(value);
 		//
 		if (!source.isEnabled()) {
-			//read only view
+			//read only view: rendered as fake textarea element for better styling options (e.g. print)
 			sb.append("<span id=\"").append(id).append("\" ")
 			  .append(FormJSHelper.getRawJSFor(te.getRootForm(), id, te.getAction()))
-			  .append(" ><textarea id=\"")
+			  .append(" ><div id=\"")
 			  .append(id)
-			  .append("_disabled\" readonly='readonly' class='form-control o_form_element_disabled' style=''");
+			  .append("_disabled\" class='form-control textarea_disabled o_disabled o_form_element_disabled' style='");
+			/* we do not add the width, not applied to text areas in oo despite configurable 
 			if (teC.getCols() != -1) {
-				sb.append(" cols='").append(teC.getCols()).append("'");
+				sb.append(" width:").append(teC.getCols()).append("em;");
 			}
+			*/
 			if (rows != -1) {
-				sb.append(" rows='").append(rows).append("'");
+				sb.append(" height:").append(rows * 1.5).append("em;"); // line-height is about 1.5
 			}
-			sb.append(">")
+			sb.append("'>")
 			  .append(value)
-			  .append("</textarea></span>");
+			  .append("</div></span>");
 	
 		} else {
 			//read write view

src/main/webapp/static/themes/light/_config.scss

@@ -25,6 +25,7 @@
 	Add your custom font sizes and other bootstrap overrides here. 
 	Full spec here: http://getbootstrap.com/customize/
 */
+$input-bg-disabled				: #fafafa !default; /* lighter than default bootstrap */
 
 /* 	Add standard bootstrap variables to the mix */
 @import "../../bootstrap/stylesheets/bootstrap/variables";

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

@@ -108,6 +108,14 @@
 	.has-feedback.has-error .o_fileinput .o_fakechooser {
 		margin-right:30px;
 	}
+	
+	/* disabled text areas are rendered in div's for improved printing and layouting features */
+	.form-control.textarea_disabled {
+		resize: both;
+		overflow: auto;	
+		white-space: pre-wrap;
+		background: $input-bg-disabled;
+	}
 }
 
 /* centered form labels are still left aligned */

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

@@ -42,6 +42,32 @@
 	.o_print_break_before {
 		page-break-before: always;
 	}
+	
+	/* Hide buttons in forms and print text area with full content */
+	.btn {
+		display: none;
+	}
+	.o_form {
+		/* textarea: can not blow up for now, browsers ignore the height */
+		textarea,
+		.form-control.textarea_disabled {
+			background: #fff;
+			height: auto !important;
+			color: #000 !important;
+			resize: none;
+		}
+	}
+	
+	/* Hide comments form */
+	#o_comment_form_link,
+	.o_comments form {
+			display: none !important;
+	}
+	
+	/* Hide avatar - can not print background css images */
+	.o_avatar {
+		display: none;
+	}
 
 	/* Hide backgrounds */	
 	body.o_dmz {