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. merged from HEAD

This commit is contained in:
Dan Marsden
2010-07-22 02:20:11 +00:00
parent f467b170b9
commit 039d39243e
3 changed files with 2 additions and 16 deletions
+1 -2
View File
@@ -114,8 +114,7 @@ $string['packagefile'] = 'No package file specified';
$string['passed'] = 'Passed';
$string['php5'] = 'PHP 5 (DOMXML native library)';
$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';
-12
View File
@@ -177,18 +177,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>
+1 -2
View File
@@ -325,8 +325,7 @@
</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>';
print_simple_box(get_string('popupblocked','scorm',$link),'center','','',5,'generalbox','altpopuplink');
print_simple_box(get_string('popupblockmessage','scorm'),'center','','',5,'generalbox','altpopuplink');
$linkcourse = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$scorm->course.'">' . get_string('finishscormlinkname','scorm') . '</a>';
print_simple_box(get_string('finishscorm','scorm',$linkcourse),'center','','',5,'generalbox','altfinishlink');
}