Merge branch 'master_MDL-47500' of git://github.com/danmarsden/moodle

mod/scorm/module.js

@@ -298,9 +298,11 @@ M.mod_scorm.init = function(Y, nav_display, navposition_left, navposition_top, h
             }
 
             // Calculate the rough new height from the viewport height.
-            newheight = Y.one('body').get('winHeight') - 5;
-            if (newheight < 600) {
-                newheight = 600;
+            var newheight = Y.one('body').get('winHeight') - 5
+                - Y.one('#scorm_layout').getY()
+                - window.pageYOffset;
+            if (newheight < 680 || isNaN(newheight)) {
+                newheight = 680;
             }
             Y.one('#scorm_layout').setStyle('height', newheight);
 

mod/scorm/styles.css

@@ -269,6 +269,10 @@
     word-spacing: -0.43em;
 }
 
+#scorm_layout {
+    margin-bottom: 50px;
+}
+
 /**
 * Opera as of 12 on Windows needs word-spacing.
 * The ".opera-only" selector is used to prevent actual prefocus styling