Merge remote-tracking branch 'upstream/OpenOLAT_14.2' into OpenOLAT_14.2.uibk

.gitignore

@@ -38,3 +38,4 @@ src/test/java/org/olat/selenium/SeleniumTest.java
 
 .factorypath
 dependency_tree.txt
+**/*/.sass-cache

src/main/java/org/olat/modules/fo/ui/MessageEditController.java

@@ -179,6 +179,8 @@ public class MessageEditController extends FormBasicController {
 		bodyEl.setMaxLength(MAX_BODY_LENGTH);
 		bodyEl.setNotLongerThanCheck(MAX_BODY_LENGTH, "input.toolong");
 		bodyEl.getEditorConfiguration().enableCharCount();
+		bodyEl.getEditorConfiguration().setRelativeUrls(false);
+		bodyEl.getEditorConfiguration().setRemoveScriptHost(false);
 		
 		setEditPermissions(message);
 		// list existing attachments. init attachment layout now, to place it in

src/main/webapp/static/themes/compiletheme.sh

@@ -50,7 +50,7 @@ doCompile () {
 	fi
 	echo "Compiling SASS: $TARGET $STYLE"
 	sass --version
-	sass --style $STYLE --no-cache $UPDATE $TARGET:$TARGET --load-path light light/modules
+	sass --style $STYLE $UPDATE $TARGET:$TARGET --load-path light light/modules
 	echo "sass --style $STYLE $UPDATE $TARGET:$TARGET --load-path light light/modules"
 	echo "done"
 }
@@ -62,7 +62,7 @@ control_c () {
 while getopts ":fhw" opt; do
   case $opt in
     f)
-      UPDATECMD="--update --force"
+      UPDATECMD=""
       ;;
     w)
       UPDATECMD="--watch"

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

@@ -35,9 +35,9 @@
 */
 $fa-font-path		: "../../font-awesome/fonts" !default;
 $fa-css-prefix		: "o_icon" !default;
-@import "../../../font-awesome/scss/variables";
-@import "../../../font-awesome/scss/path";
-@import "../../../font-awesome/scss/core";
+@import "../../font-awesome/scss/variables";
+@import "../../font-awesome/scss/path";
+@import "../../font-awesome/scss/core";
 
 /* 
 	OpenOLAT includes 

src/main/webapp/static/themes/themes.README

@@ -64,10 +64,13 @@ A good way is to start with a copy of "openolat" (i.e. copy openolat to mytheme)
 - Rename mytheme/_openolat_config.scss to mytheme/_mytheme_config.scss
 - Rename mytheme/_openolat_theme.scss to mytheme/_mytheme_theme.scss
 - Rename mytheme/_openolat_content.scss to mytheme/_mytheme_content.scss
+- Rename mytheme/_openolat_email.scss to mytheme/_mytheme_email.scss
 - Open mytheme/theme.sass and replace the references to the files you just renamed 
   (openolat_config -> mytheme_config, openolat_theme -> mytheme_theme)
 - Open mytheme/content.sass and replace the references to the files you just renamed
   (openolat_config -> mytheme_config, openolat_content -> mytheme_content)
+- Open mytheme/email.sass and replace the references to the files you just renamed
+  (openolat_config -> mytheme_config, openolat_email -> mytheme_email)
 - Open mytheme/_mytheme_config.scss and add all bootstrap and OpenOLAT SASS variables you want to 
   override. As references yo can look at the following files:
   - for all bootstrap variables: ../../bootstrap/stylesheets/bootstrap/_variables.scss