L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-87245-405' of https://github.com/junpataleta/moodle into MOODLE_405_STABLE

Browse Source
This commit is contained in:
Mihail Geshoski
2025-12-03 23:50:40 +08:00
parent 4b36673cd5 be8600ab99
commit 8aececb06e
2 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/en/moodle.php
+1
View File
@@ -1617,6 +1617,7 @@ $string['oneitemfound'] = 'There is 1 item found.';
$string['opendrawerblocks'] = 'Open block drawer';
$string['opendrawerindex'] = 'Open course index';
$string['opensinnewwindow'] = 'Opens in new window';
$string['opensinnewwindowbracketed'] = '(Opens in new window)';
$string['operator_and'] = 'and';
$string['operator_andnot'] = 'and';
$string['operator_or'] = 'or';
mod/scorm/locallib.php
+30 -13
View File
@@ -1001,22 +1001,39 @@ function scorm_print_launch($user, $scorm, $action, $cm) {
// Do not give the player launch FORM if the SCORM object is locked after the final attempt.
if ($scorm->lastattemptlock == 0 || $result->attemptleft > 0) {
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'));
echo html_writer::start_div('scorm-center');
echo html_writer::start_tag('form', [
'id' => 'scormviewform',
'method' => 'post',
'action' => $CFG->wwwroot . '/mod/scorm/player.php',
]);
$haspopup = !empty($scorm->popup);
$popuphtml = '';
if ($haspopup) {
$popuphtml = html_writer::span(get_string('opensinnewwindowbracketed'), 'sr-only')
. $OUTPUT->pix_icon('i/externallink', '', 'moodle', ['class' => 'ms-1 me-0']);
}
if ($scorm->hidebrowse == 0) {
echo html_writer::tag('button', get_string('browse', 'scorm'),
['class' => 'btn btn-secondary me-1', 'name' => 'mode',
'type' => 'submit', 'id' => 'b', 'value' => 'browse'])
. html_writer::end_tag('button');
$previewbuttonparams = [
'class' => 'btn btn-secondary me-1',
'name' => 'mode',
'type' => 'submit',
'id' => 'b',
'value' => 'browse',
];
echo html_writer::tag('button', get_string('browse', 'scorm') . $popuphtml, $previewbuttonparams);
} else {
echo html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'mode', 'value' => 'normal'));
}
echo html_writer::tag('button', get_string('enter', 'scorm'),
['class' => 'btn btn-primary mx-1', 'name' => 'mode',
'type' => 'submit', 'id' => 'n', 'value' => 'normal'])
. html_writer::end_tag('button');
$enterbuttonparams = [
'class' => 'btn btn-primary mx-1',
'name' => 'mode',
'type' => 'submit',
'id' => 'n',
'value' => 'normal',
];
echo html_writer::tag('button', get_string('enter', 'scorm') . $popuphtml, $enterbuttonparams);
if (!empty($scorm->forcenewattempt)) {
if ($scorm->forcenewattempt == SCORM_FORCEATTEMPT_ALWAYS ||
($scorm->forcenewattempt == SCORM_FORCEATTEMPT_ONCOMPLETE && $incomplete === false)) {
@@ -1028,7 +1045,7 @@ function scorm_print_launch($user, $scorm, $action, $cm) {
echo html_writer::label(get_string('newattempt', 'scorm'), 'a', true, ['class' => 'ps-1']);
echo html_writer::end_div();
}
if (!empty($scorm->popup)) {
if ($haspopup) {
echo html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'display', 'value' => 'popup'));
}