Index: mod/scorm/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/scorm/lib.php,v
retrieving revision 1.135
diff -u -r1.135 lib.php
--- mod/scorm/lib.php	6 May 2010 00:13:54 -0000	1.135
+++ mod/scorm/lib.php	13 May 2010 21:33:13 -0000
@@ -389,7 +389,7 @@
                     if (($nextsco !== false) && ($sco->parent != $nextsco->parent) && (($level==0) || (($level>0) && ($nextsco->parent == $sco->identifier)))) {
                         $sublist++;
                     } else {
-                        $report .= '<img src="'.$OUTPUT->pix_url('pix/spacer', 'scorm').'" alt="" />';
+                        $report .= '<img src="'.$OUTPUT->pix_url('spacer', 'scorm').'" alt="" />';
                     }
 
                     if ($sco->launch) {
@@ -400,12 +400,12 @@
                                 $usertrack->status = 'notattempted';
                             }
                             $strstatus = get_string($usertrack->status,'scorm');
-                            $report .= "<img src='".$OUTPUT->pix_url('pix/'.$usertrack->status, 'scorm')."' alt='$strstatus' title='$strstatus' />";
+                            $report .= "<img src='".$OUTPUT->pix_url($usertrack->status, 'scorm')."' alt='$strstatus' title='$strstatus' />";
                         } else {
                             if ($sco->scormtype == 'sco') {
-                                $report .= '<img src="'.$OUTPUT->pix_url('pix/notattempted', 'scorm').'" alt="'.get_string('notattempted','scorm').'" title="'.get_string('notattempted','scorm').'" />';
+                                $report .= '<img src="'.$OUTPUT->pix_url('notattempted', 'scorm').'" alt="'.get_string('notattempted','scorm').'" title="'.get_string('notattempted','scorm').'" />';
                             } else {
-                                $report .= '<img src="'.$OUTPUT->pix_url('pix/asset', 'scorm').'" alt="'.get_string('asset','scorm').'" title="'.get_string('asset','scorm').'" />';
+                                $report .= '<img src="'.$OUTPUT->pix_url('asset', 'scorm').'" alt="'.get_string('asset','scorm').'" title="'.get_string('asset','scorm').'" />';
                             }
                         }
                         $report .= "&nbsp;$sco->title $score$totaltime</li>\n";
Index: mod/scorm/report.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/scorm/report.php,v
retrieving revision 1.91
diff -u -r1.91 report.php
--- mod/scorm/report.php	3 May 2010 23:23:11 -0000	1.91
+++ mod/scorm/report.php	13 May 2010 21:33:13 -0000
@@ -510,7 +510,7 @@
                                                 $score = $strstatus;
                                             }
                                             if (!$download) {
-                                                $row[] = '<img src="'.$OUTPUT->pix_url('pix/'.$trackdata->status, 'scorm').'" alt="'.$strstatus.'" title="'.$strstatus.'" /><br/>
+                                                $row[] = '<img src="'.$OUTPUT->pix_url($trackdata->status, 'scorm').'" alt="'.$strstatus.'" title="'.$strstatus.'" /><br/>
                                                           <a href="report.php?b='.$sco->id.'&amp;user='.$scouser->userid.'&amp;attempt='.$scouser->attempt.
                                                          '" title="'.get_string('details','scorm').'">'.$score.'</a>';
                                             } else {
@@ -520,7 +520,7 @@
                                             // if we don't have track data, we haven't attempted yet
                                             $strstatus = get_string('notattempted', 'scorm');
                                             if (!$download) {
-                                                $row[] = '<img src="'.$OUTPUT->pix_url('pix/notattempted', 'scorm').'" alt="'.$strstatus.'" title="'.$strstatus.'" /><br/>'.$strstatus;
+                                                $row[] = '<img src="'.$OUTPUT->pix_url('notattempted', 'scorm').'" alt="'.$strstatus.'" title="'.$strstatus.'" /><br/>'.$strstatus;
                                             } else {
                                                 $row[] = $strstatus;
                                             }
@@ -636,7 +636,7 @@
                                     $detailslink = '&nbsp;';
                                 }
                                 $strstatus = get_string($trackdata->status,'scorm');
-                                $row[] = '<img src="'.$OUTPUT->pix_url('pix/' . $trackdata->status, 'scorm').'" alt="'.$strstatus.'" title="'.
+                                $row[] = '<img src="'.$OUTPUT->pix_url($trackdata->status, 'scorm').'" alt="'.$strstatus.'" title="'.
                                          $strstatus.'" />&nbsp;'.format_string($sco->title);
                                 $row[] = get_string($trackdata->status,'scorm');
                                 $row[] = scorm_format_date_time($trackdata->total_time);
@@ -678,7 +678,7 @@
                 $trackdata->total_time = '';
             }
             $strstatus = get_string($trackdata->status,'scorm');
-            echo '<img src="'.$OUTPUT->pix_url('pix/'.$trackdata->status, 'scorm').'" alt="'.$strstatus.'" title="'.
+            echo '<img src="'.$OUTPUT->pix_url($trackdata->status, 'scorm').'" alt="'.$strstatus.'" title="'.
             $strstatus.'" />&nbsp;'.scorm_format_date_time($trackdata->total_time).'<br />'.$scoreview.'<br />';
             echo '</div>'."\n";
             echo '<hr /><h2>'.get_string('details','scorm').'</h2>';
Index: mod/scorm/loadSCO.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/scorm/loadSCO.php,v
retrieving revision 1.59
diff -u -r1.59 loadSCO.php
--- mod/scorm/loadSCO.php	6 May 2010 00:13:54 -0000	1.59
+++ mod/scorm/loadSCO.php	13 May 2010 21:33:13 -0000
@@ -133,21 +133,22 @@
         <title>LoadSCO</title>
         <script type="text/javascript">
         //<![CDATA[
-        var apiHandle = null;
-        var findAPITries = 0;
+        var myApiHandle = null;
+        var myFindAPITries = 0;
 
-        function getAPIHandle() {
-           if (apiHandle == null) {
-              apiHandle = getAPI();
+        function myGetAPIHandle() {
+           myFindAPITries = 0;
+           if (myApiHandle == null) {
+              myApiHandle = myGetAPI();
            }
-           return apiHandle;
+           return myApiHandle;
         }
 
-        function findAPI(win) {
+        function myFindAPI(win) {
            while ((win.<?php echo $LMS_api; ?> == null) && (win.parent != null) && (win.parent != win)) {
-              findAPITries++;
+              myFindAPITries++;
               // Note: 7 is an arbitrary number, but should be more than sufficient
-              if (findAPITries > 7) {
+              if (myFindAPITries > 7) {
                  return null;
               }
               win = win.parent;
@@ -156,10 +157,10 @@
         }
 
         // hun for the API - needs to be loaded before we can launch the package
-        function getAPI() {
-           var theAPI = findAPI(window);
+        function myGetAPI() {
+           var theAPI = myFindAPI(window);
            if ((theAPI == null) && (window.opener != null) && (typeof(window.opener) != "undefined")) {
-              theAPI = findAPI(window.opener);
+              theAPI = myFindAPI(window.opener);
            }
            if (theAPI == null) {
               return null;
@@ -168,15 +169,15 @@
         }
 
        function doredirect() {
-            if (getAPI() != null) {
+            if (myGetAPIHandle() != null) {
                 location = "<?php echo $result ?>";
             }
             else {
-                document.body.innerHTML = "<p><?php echo get_string('activityloading', 'scorm');?> <span id='countdown'><?php echo $delayseconds ?></span> <?php echo get_string('numseconds');?>. &nbsp; <img src='<?php echo $OUTPUT->pix_url('pix/wait', 'scorm') ?>'><p>";
+                document.body.innerHTML = "<p><?php echo get_string('activityloading', 'scorm');?> <span id='countdown'><?php echo $delayseconds ?></span> <?php echo get_string('numseconds', 'moodle', '');?>. &nbsp; <img src='<?php echo $OUTPUT->pix_url('wait', 'scorm') ?>'><p>";
                 var e = document.getElementById("countdown");
                 var cSeconds = parseInt(e.innerHTML);
                 var timer = setInterval(function() {
-                                                if( cSeconds && getAPI() == null ) {
+                                                if( cSeconds && myGetAPIHandle() == null ) {
                                                     e.innerHTML = --cSeconds;
                                                 } else {
                                                     clearInterval(timer);
Index: mod/scorm/rd.js
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/scorm/rd.js,v
retrieving revision 1.8
diff -u -r1.8 rd.js
--- mod/scorm/rd.js	1 Nov 2009 15:24:59 -0000	1.8
+++ mod/scorm/rd.js	13 May 2010 21:33:13 -0000
@@ -45,7 +45,7 @@
     }
 
     var header = document.getElementById('header');
-    var content = document.getElementById('content');
+    var content = document.getElementById('region-content');
     var headerheight = 0;
     if (content) {
         headerheight = content.offsetTop;
@@ -105,14 +105,14 @@
     if (contenti3) {
         contenti3.style.height = (winheight - totalheight + 30) + 'px';
     } else {
-       document.getElementById('content').style.height = (finalheight + 30) + 'px';
+       document.getElementById('region-main-box').style.height = (finalheight + 30) + 'px';
     }
      // resize the content container too to move the footer below the SCORM content
     var contenti3 = document.getElementById('content-i3');
     if (contenti3) {
         contenti3.style.height = (finalheight + 30) + 'px';
     } else {
-        document.getElementById('content').style.height = (finalheight + 30) + 'px';
+        document.getElementById('region-main-box').style.height = (finalheight + 30) + 'px';
     }
 }
 -->
\ No newline at end of file
Index: mod/scorm/player.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/scorm/player.php,v
retrieving revision 1.69
diff -u -r1.69 player.php
--- mod/scorm/player.php	6 May 2010 00:13:54 -0000	1.69
+++ mod/scorm/player.php	13 May 2010 21:33:13 -0000
@@ -303,7 +303,9 @@
     if ($result->prerequisites) {
         if ($scorm->popup == 0) {
             $fullurl="loadSCO.php?id=".$cm->id.$scoidstr.$modestr;
-            echo "                <object id=\"scoframe1\" class=\"scoframe\" type=\"text/html\" data=\"{$fullurl}\"></object>\n";
+            echo "                <iframe id=\"scoframe1\" class=\"scoframe\" name=\"scoframe1\" src=\"{$fullurl}\"></iframe>\n";
+            
+//            echo "                <object id=\"scoframe1\" class=\"scoframe\" type=\"text/html\" data=\"{$fullurl}\"></object>\n";
             $PAGE->requires->js_function_call('scorm_resize');
         } else {
             // Clean the name for the window as IE is fussy
@@ -318,7 +320,8 @@
             echo html_writer::script(js_writer::function_call('scorm_openpopup', Array("loadSCO.php?id=".$cm->id.$scoidpop, $name, $scorm->options, $scorm->width, $scorm->height)));
             ?>
                     <noscript>
-                    <object id="main" class="scoframe" type="text/html" data="loadSCO.php?id=<?php echo $cm->id.$scoidstr.$modestr ?>"></object>
+                    <iframe id="main" class="scoframe" name="main" src="loadSCO.php?id=<?php echo $cm->id.$scoidstr.$modestr ?>"></iframe>
+                    <!--  object id="main" class="scoframe" type="text/html" data="loadSCO.php?id=<?php echo $cm->id.$scoidstr.$modestr ?>"></object -->
                     </noscript>
 <?php
             //Added incase javascript popups are blocked