Merge branch 'm21_MDL-29965' of git://github.com/danmarsden/moodle in…

…to MOODLE_21_STABLE
moodle · Oct 30, 2011 · d612fa3 · d612fa3
2 parents 84ac3ff + 75658ad
commit d612fa3
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/mod/scorm/player.php b/mod/scorm/player.php
@@ -188,18 +188,18 @@
         <div id='scormapi-parent'>
             <script id="external-scormapi" type="text/JavaScript"></script>
         </div>
-        <div id="scormtop">
-        <?php echo $mode == 'browse' ? '<div id="scormmode" class="scorm-left">'.get_string('browsemode','scorm')."</div>\n" : ''; ?>
-        <?php echo $mode == 'review' ? '<div id="scormmode" class="scorm-left">'.get_string('reviewmode','scorm')."</div>\n" : ''; ?>
-            <div id="scormnav" class="scorm-right">
 <?php
-if ($scorm->hidetoc == SCORM_TOC_POPUP) {
-    echo $result->tocmenu;
+if ($scorm->hidetoc == SCORM_TOC_POPUP or $mode=='browse' or $mode=='review') {
+    echo '<div id="scormtop">';
+    echo $mode == 'browse' ? '<div id="scormmode" class="scorm-left">'.get_string('browsemode', 'scorm')."</div>\n" : '';
+    echo $mode == 'review' ? '<div id="scormmode" class="scorm-left">'.get_string('reviewmode', 'scorm')."</div>\n" : '';
+    if ($scorm->hidetoc == SCORM_TOC_POPUP) {
+        echo '<div id="scormnav" class="scorm-right">'.$result->tocmenu.'</div>';
+    }
+    echo '</div>';
 }
 ?>
-            </div> <!-- Scormnav -->
-        </div> <!-- Scormtop -->
-            <div id="toctree" class="generalbox">
+            <div id="toctree">
                 <?php
                 if (empty($scorm->popup) || $displaymode == 'popup') {
                     echo $result->toc;