Merge branch 'master_MDL-58863' of https://github.com/danmarsden/moodle

This commit is contained in:
David Monllao
2017-07-18 09:03:35 +02:00
2 changed files with 4 additions and 2 deletions
+2 -1
View File
@@ -272,7 +272,8 @@ if (empty($scorm->popup) || $displaymode == 'popup') {
$scorm->hidetoc, $collapsetocwinsize, $result->toctitle, $name, $sco->id, $adlnav), false, $jsmodule);
}
if (!empty($forcejs)) {
echo $OUTPUT->box(get_string("forcejavascriptmessage", "scorm"), "generalbox boxaligncenter forcejavascriptmessage");
$message = $OUTPUT->box(get_string("forcejavascriptmessage", "scorm"), "generalbox boxaligncenter forcejavascriptmessage");
echo html_writer::tag('noscript', $message);
}
if (file_exists($CFG->dirroot.'/mod/scorm/datamodels/'.$scorm->version.'.php')) {
+2 -1
View File
@@ -176,7 +176,8 @@ if ($available && empty($launch)) {
scorm_print_launch($USER, $scorm, 'view.php?id='.$cm->id, $cm);
}
if (!empty($forcejs)) {
echo $OUTPUT->box(get_string("forcejavascriptmessage", "scorm"), "container forcejavascriptmessage");
$message = $OUTPUT->box(get_string("forcejavascriptmessage", "scorm"), "container forcejavascriptmessage");
echo html_writer::tag('noscript', $message);
}
if (!empty($scorm->popup)) {