Permalink
Browse files

Merge branch 'm22_MDL-31381' of git://github.com/danmarsden/moodle in…

…to MOODLE_22_STABLE
  • Loading branch information...
2 parents 3ba632d + bb8d834 commit 5a91cf1e2a53119cdd41f1805845fe2195055ef2 Sam Hemelryk committed Feb 20, 2012
Showing with 6 additions and 5 deletions.
  1. +5 −5 mod/scorm/module.js
  2. +1 −0 mod/scorm/styles.css
View
10 mod/scorm/module.js
@@ -196,18 +196,18 @@ 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%');
var center = scorm_layout_widget.getUnitByPosition('center');
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';
}
}
View
1 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;}

0 comments on commit 5a91cf1

Please sign in to comment.