Skip to content
Snippets Groups Projects
Commit cf89979a authored by srosse's avatar srosse
Browse files

Merge OpenOLAT 11.0 to OpenOLAT default branch with 16b6f431adf2306956f3ded0f118dc569cc6428e

parents 8b0a81b5 638c39c7
No related branches found
No related tags found
No related merge requests found
......@@ -604,7 +604,7 @@ public abstract class AssessmentObjectComponentRenderer extends DefaultComponent
if(data != null && !data.startsWith("http://") && !data.startsWith("https://")) {
String relativePath = component.relativePathTo(resolvedAssessmentItem);
String src = Settings.getServerContextPathURI() + component.getMapperUri() + relativePath + "/" + data;
String src = Settings.createServerURI() + component.getMapperUri() + relativePath + "/" + data;
dataMovie = dataMovie.replace(data, src);
}
......@@ -620,7 +620,9 @@ public abstract class AssessmentObjectComponentRenderer extends DefaultComponent
}
sb.append("<span id=\"").append(id).append("\" class=\"olatFlashMovieViewer\" style=\"display:block;border:solid 1px #000; width:").append(width).append("px; height:").append(height).append("px;\">\n")
.append(" <script src=\"/raw/fx-111111x11/movie/player.js\" type=\"text/javascript\"></script>\n")
.append(" <script src=\"");
Renderer.renderStaticURI(sb, "movie/player.js");
sb.append("\" type=\"text/javascript\"></script>\n")
.append(" <script type=\"text/javascript\" defer=\"defer\">// <![CDATA[\n")
.append(" BPlayer.insertPlayer(").append(dataMovie).append(");\n")
.append(" // ]]></script>\n")
......
......@@ -8,7 +8,7 @@
#set($checkJavaScript = $r.checkJavaScript($responseDeclaration,$interaction.patternmask))
<input name="qtiworks_presented_${responseIdentifier}" type="hidden" value="1"/>
<span class="$localName">
<input id="od_${responseIdentifier}" type="text" name="qtiworks_response_${responseIdentifier}" #if($responseInputString && !$responseInputString.isEmpty()) value="$responseInputString" #else value="" #end #if(!$r.isItemSessionEnded()) $r.placeholder($interaction) #end #if($r.isItemSessionEnded()) disabled #end #if($isBadResponse) class='badResponse' #end #if($interaction.expectedLength) size='$interaction.expectedLength' #end #if($checks && $checks.size() > 0) onchange='$checkJavaScript' #end autocomplete="off"/>
<input id="od_${responseIdentifier}" type="text" name="qtiworks_response_${responseIdentifier}" #if($responseInputString && !$responseInputString.isEmpty()) value="$r.escapeHtml($responseInputString)" #else value="" #end #if(!$r.isItemSessionEnded()) $r.placeholder($interaction) #end #if($r.isItemSessionEnded()) disabled #end #if($isBadResponse) class='badResponse' #end #if($interaction.expectedLength) size='$interaction.expectedLength' #end #if($checks && $checks.size() > 0) onchange='$checkJavaScript' #end autocomplete="off"/>
#if($isBadResponse)
<span class="badResponse">
#if($responseDeclaration.cardinality.toQtiString() == "record")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment