From 1c6df63d5c4caaa76c25c7bfba3e4c4e99a95749 Mon Sep 17 00:00:00 2001 From: Dan Marsden Date: Thu, 26 Jan 2012 20:41:41 +1300 Subject: [PATCH] SCORM MDL-31381 decrease max width of TOC to prevent SCORM content from being hidden, remove padding from pop-up and improve maxheight calculation --- mod/scorm/module.js | 10 +++++----- mod/scorm/styles.css | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mod/scorm/module.js b/mod/scorm/module.js index de48e1130a4..c7f11cbf433 100644 --- a/mod/scorm/module.js +++ b/mod/scorm/module.js @@ -196,10 +196,10 @@ M.mod_scorm.init = function(Y, hide_nav, hide_toc, toc_title, window_name, launc var left = scorm_layout_widget.getUnitByPosition('left'); var maxwidth = parseInt(YAHOO.util.Dom.getStyle('scorm_layout', 'width')); - left.set('maxWidth', (maxwidth - 10)); + left.set('maxWidth', (maxwidth - 50)); var cwidth = left.get('width'); - if (cwidth > (maxwidth - 10)) { - left.set('width', (maxwidth - 10)); + if (cwidth > (maxwidth - 1)) { + left.set('width', (maxwidth - 50)); } scorm_layout_widget.setStyle('height', '100%'); @@ -207,7 +207,7 @@ M.mod_scorm.init = function(Y, hide_nav, hide_toc, toc_title, window_name, launc center.setStyle('height', '100%'); // calculate the rough new height - newheight = YAHOO.util.Dom.getViewportHeight() *.82; + newheight = YAHOO.util.Dom.getViewportHeight() -5; if (newheight < 600) { newheight = 600; } @@ -247,7 +247,7 @@ M.mod_scorm.init = function(Y, hide_nav, hide_toc, toc_title, window_name, launc } } else { - obj.style.width = (content.offsetWidth - 6)+'px'; + obj.style.width = (content.offsetWidth)+'px'; obj.style.height = (content.offsetHeight - 10)+'px'; } } diff --git a/mod/scorm/styles.css b/mod/scorm/styles.css index 3298fa9b0cc..736afa55cc2 100644 --- a/mod/scorm/styles.css +++ b/mod/scorm/styles.css @@ -26,6 +26,7 @@ #page-mod-scorm-player #altfinishlink {font-size: 140%;border: 0px; padding: 0px; } #page-mod-scorm-player #altpopuplink {position: left; padding: 5px; border: 0px; } #page-mod-scorm-player #scormmode {float: left; border: 0px; } +#page-mod-scorm-player.pagelayout-popup #page-content .region-content {padding: 0px; } .path-mod-scorm.forcejavascript .scorm-center { display:none;} .path-mod-scorm.forcejavascript .toc { display:none;}