SCORM MDL-21333 remove link to allow manual opening of window as JS communication can fail and no grades are reported from the object. Remove old strings no longer required.

This commit is contained in:
Dan Marsden 2010-07-22 01:52:25 +00:00
parent a73e2664fb
commit 5d21c26076
3 changed files with 3 additions and 20 deletions

View File

@ -196,8 +196,7 @@ $string['passed'] = 'Passed';
$string['php5'] = 'PHP 5 (DOMXML native library)';
$string['pluginname'] = 'SCORM package';
$string['popup'] = 'New window';
$string['popupblocked'] = 'If a new window does not appear, {$a}';
$string['popupblockedlinkname'] = 'click here to launch the activity';
$string['popupblockmessage'] = 'If a pop-up window doesn\'t appear, please enable pop-ups in your browser.';
$string['popupmenu'] = 'In a drop down menu';
$string['popupopen'] = 'Open package in a new window';
$string['position_error'] = 'The {$a->tag} tag can\'t be child of {$a->parent} tag';

View File

@ -185,18 +185,6 @@
}
}, 1000);
}
removelink();
}
function removelink() {
try {
if (window.opener.document.getElementById('altpopuplink')) {
window.opener.document.getElementById('altpopuplink').style.display='none';
} else {
window.opener.document.all['altpopuplink'].style.display='none';
}
} catch(error) {
// nothing to be done
}
}
//]]>
</script>

View File

@ -179,8 +179,9 @@
<?php
if ($result->prerequisites) {
if ($scorm->popup != 0) {
//Added incase javascript popups are blocked we don't provide a direct link to the pop-up as JS communication can fail - the user must disable their pop-up blocker.
$linkcourse = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$scorm->course.'">' . get_string('finishscormlinkname','scorm') . '</a>';
echo $OUTPUT->box(get_string('finishscorm','scorm',$linkcourse), 'generalbox', 'altfinishlink');
echo $OUTPUT->box(get_string('popupblockmessage','scorm'). ' '. get_string('finishscorm','scorm',$linkcourse), 'generalbox', 'altfinishlink');
}
}
?>
@ -245,11 +246,6 @@
<![endif]-->
</noscript>
<?php
//Added incase javascript popups are blocked
$link = '<a href="'.$CFG->wwwroot.'/mod/scorm/loadSCO.php?id='.$cm->id.$scoidstr.$modestr.'" target="_blank">'.get_string('popupblockedlinkname','scorm').'</a>';
echo $OUTPUT->box(get_string('popupblocked','scorm',$link), 'generalbox', 'altpopuplink');
//$linkcourse = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$scorm->course.'">' . get_string('finishscormlinkname','scorm') . '</a>';
//echo $OUTPUT->box(get_string('finishscorm','scorm',$linkcourse), 'generalbox', 'altfinishlink');
}
} else {
echo $OUTPUT->box(get_string('noprerequisites','scorm'));