MDL-8872 Merged "course" fixes from 1.8

diff --git a/lang/en_utf8/scorm.php b/lang/en_utf8/scorm.php
index b3bde60516f7b961c796779819cc711ce6f7ddc3..7e954ee66b4ce857c10722025e8e7ac3c126e494 100644 (file)
--- a/lang/en_utf8/scorm.php
+++ b/lang/en_utf8/scorm.php
@@ -19,6 +19,7 @@ $string['browserepository'] = 'Browse repository';
 $string['chooseapacket'] = 'Choose or update a package';
 $string['completed'] = 'Completed';
 $string['confirmloosetracks'] = 'WARNING: The package seems to be changed or modified. If the package structure is changed, some users tracks may be lost during update process.';
+$string['contents'] = 'Contents';
 $string['coursepacket'] = 'Course package';
 $string['coursestruct'] = 'Course structure';
 $string['datadir'] = 'Filesystem Error: Can\'t create course data directory';

diff --git a/mod/scorm/player.php b/mod/scorm/player.php
index 0756e8d3dffc3d677bb4d846b6fc68da439c2a8b..a1d3715b5503d315e40409ff44bcfe77e73b6e9f 100755 (executable)
--- a/mod/scorm/player.php
+++ b/mod/scorm/player.php
@@ -133,10 +133,10 @@
     if ($scorm->popup == 1) {
         $bodyscript = 'onunload="main.close();"';
     }
-    $exitlink = '(<a href="'.$CFG->wwwroot.'/course/view.php?id='.$cm->course.'">'.get_string('exit','scorm').'</a>)&nbsp;';
+
     print_header($pagetitle, $course->fullname,
                  "$navigation <a $CFG->frametarget href=\"view.php?id=$cm->id\">".format_string($scorm->name,true)."</a>",
-                 '', '', true, $exitlink.update_module_button($cm->id, $course->id, $strscorm), '', false, $bodyscript);
+                 '', '', true, update_module_button($cm->id, $course->id, $strscorm), '', false, $bodyscript);
     if ($sco->scormtype == 'sco') {
 ?>
     <script type="text/javascript" src="request.js"></script>
@@ -161,7 +161,7 @@
     if ($scorm->hidetoc == 0) {
 ?>
         <div id="tocbox" class="generalbox">
-            <div id="tochead" class="header"><?php print_string('coursestruct','scorm') ?></div>
+            <div id="tochead" class="header"><?php print_string('contents','scorm') ?></div>
             <div id="toctree">
             <?php echo $result->toc; ?>
             </div>