Commit ebba556a authored by Andrew Nicols's avatar Andrew Nicols Committed by Dan Poltawski
Browse files

Merge branch 'MDL-56844-master' of git://github.com/damyon/moodle

parents 92ba7648 f25185d7
......@@ -897,7 +897,7 @@ function scorm_print_launch ($user, $scorm, $action, $cm) {
$organization = optional_param('organization', '', PARAM_INT);
if ($scorm->displaycoursestructure == 1) {
echo $OUTPUT->box_start('generalbox boxaligncenter toc', 'toc');
echo $OUTPUT->box_start('generalbox boxaligncenter toc container', 'toc');
echo html_writer::div(get_string('contents', 'scorm'), 'structurehead');
}
if (empty($organization)) {
......@@ -946,7 +946,8 @@ function scorm_print_launch ($user, $scorm, $action, $cm) {
echo html_writer::start_div('scorm-center');
echo html_writer::start_tag('form', array('id' => 'scormviewform',
'method' => 'post',
'action' => $CFG->wwwroot.'/mod/scorm/player.php'));
'action' => $CFG->wwwroot.'/mod/scorm/player.php',
'class' => 'container'));
if ($scorm->hidebrowse == 0) {
print_string('mode', 'scorm');
echo ': '.html_writer::empty_tag('input', array('type' => 'radio', 'id' => 'b', 'name' => 'mode',
......
......@@ -6,10 +6,6 @@
text-align: left;
}
.path-mod-scorm .scorm-center {
text-align: center;
}
.path-mod-scorm .scorm-right {
text-align: right;
}
......@@ -187,10 +183,6 @@
overflow: auto;
}
.path-mod-scorm.forcejavascript .scorm-center {
display: none;
}
.path-mod-scorm.forcejavascript .toc {
display: none;
}
......@@ -203,10 +195,6 @@
display: none;
}
.path-mod-scorm.jsenabled .scorm-center {
display: block;
}
.path-mod-scorm.jsenabled .toc {
display: block;
}
......
......@@ -156,20 +156,20 @@ if (empty($launch) && ($scorm->displayattemptstatus == SCORM_DISPLAY_ATTEMPTSTAT
$scorm->displayattemptstatus == SCORM_DISPLAY_ATTEMPTSTATUS_ENTRY)) {
$attemptstatus = scorm_get_attempt_status($USER, $scorm, $cm);
}
echo $OUTPUT->box(format_module_intro('scorm', $scorm, $cm->id).$attemptstatus, 'generalbox boxaligncenter boxwidthwide', 'intro');
echo $OUTPUT->box(format_module_intro('scorm', $scorm, $cm->id).$attemptstatus, 'container', 'intro');
// Check if SCORM available.
list($available, $warnings) = scorm_get_availability_status($scorm);
if (!$available) {
$reason = current(array_keys($warnings));
echo $OUTPUT->box(get_string($reason, "scorm", $warnings[$reason]), "generalbox boxaligncenter");
echo $OUTPUT->box(get_string($reason, "scorm", $warnings[$reason]), "container");
}
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"), "generalbox boxaligncenter forcejavascriptmessage");
echo $OUTPUT->box(get_string("forcejavascriptmessage", "scorm"), "container forcejavascriptmessage");
}
if (!empty($scorm->popup)) {
......
......@@ -12,6 +12,7 @@ select {
.path-mod-feedback .feedback_form .col-form-label {
display: block !important; /* stylelint-disable-line declaration-no-important */
}
// Feedback module
.path-mod-feedback .itemactions {
float: right;
......
......@@ -911,3 +911,17 @@ div#dock {
background-color: @grayLight;
}
}
// Scorm.
.path-mod-scorm .scorm-center {
text-align: center;
}
.path-mod-scorm.forcejavascript .scorm-center {
display: none;
}
.path-mod-scorm.jsenabled .scorm-center {
display: block;
}
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment