Merge OpenOLAT 9.4 to OpenOLAT default branch with dc6067ce2aaa68ea31c5824f177c17a5ccf55936

src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java

@@ -1165,6 +1165,18 @@ public class BaseFullWebappController extends BasicController implements ChiefCo
 		}
 	}
 
+	public boolean hasStaticSite(Class<? extends SiteInstance> type) {
+		boolean hasSite = false;
+		if(sites != null && sites.size() > 0) {
+			for(SiteInstance site:sites) {
+				if(site.getClass().equals(type)) {
+					hasSite = true;
+				}
+			}
+		}
+		return hasSite;
+	}
+
 	/**
 	 * [used by velocity] helper for velocity
 	 * 

src/main/java/org/olat/core/gui/control/ChiefController.java

@@ -27,6 +27,7 @@
 package org.olat.core.gui.control;
 
 import org.olat.core.gui.components.Window;
+import org.olat.core.gui.control.navigation.SiteInstance;
 import org.olat.core.gui.components.htmlheader.jscss.CustomCSS;
 /**
  * Description: <br>
@@ -73,5 +74,11 @@ public interface ChiefController extends Controller {
 	 * 
 	 */
 	public void removeCurrentCustomCSSFromView();
-
+	
+	/**
+	 * Check if the static site of a specific type is available
+	 * @param type
+	 * @return
+	 */
+	public boolean hasStaticSite(Class<? extends SiteInstance> type);
 }
\ No newline at end of file

src/main/java/org/olat/core/gui/exception/ExceptionWindowController.java

@@ -44,6 +44,7 @@ import org.olat.core.gui.control.DefaultChiefController;
 import org.olat.core.gui.control.Event;
 import org.olat.core.gui.control.WindowBackOffice;
 import org.olat.core.gui.control.info.WindowControlInfo;
+import org.olat.core.gui.control.navigation.SiteInstance;
 import org.olat.core.gui.translator.PackageTranslator;
 import org.olat.core.gui.translator.Translator;
 import org.olat.core.helpers.Settings;
@@ -256,6 +257,11 @@ public class ExceptionWindowController extends DefaultChiefController {
 		//
 	}
 
+	@Override
+	public boolean hasStaticSite(Class<? extends SiteInstance> type){
+		return false;
+	}
+
 	/**
 	 * @see org.olat.core.gui.control.DefaultController#event(org.olat.core.gui.UserRequest,
 	 *      org.olat.core.gui.components.Component, org.olat.core.gui.control.Event)

src/main/java/org/olat/ims/qti/editor/QTIEditHelper.java

@@ -496,7 +496,9 @@ public class QTIEditHelper {
 				content.getElements().addAll(mat.getElements());
 			}
 			// assure material always has some content
-			if (content.getElements().size() == 0) content.getElements().add(new Mattext("[blank]"));
+			if (content.getElements().size() == 0) {
+				content.getElements().add(new Mattext(""));
+			}
 			choice.setContent(content);
 			choices.add(choice);
 		}

src/main/java/org/olat/shibboleth/MessageWindowController.java

@@ -39,6 +39,7 @@ import org.olat.core.gui.control.ChiefController;
 import org.olat.core.gui.control.DefaultChiefController;
 import org.olat.core.gui.control.Event;
 import org.olat.core.gui.control.WindowBackOffice;
+import org.olat.core.gui.control.navigation.SiteInstance;
 import org.olat.core.gui.translator.Translator;
 import org.olat.core.helpers.Settings;
 import org.olat.core.logging.OLog;
@@ -94,6 +95,11 @@ public class MessageWindowController extends DefaultChiefController {
 		w.setContentPane(msg);
 		setWindow(w);
 	}
+	
+	@Override
+	public boolean hasStaticSite(Class<? extends SiteInstance> type) {
+		return false;
+	}
 
 	@Override
 	public void addBodyCssClass(String cssClass) {