moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 02:16:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Sam Hemelryk 2012-02-20 17:04:45 +13:00
commit 6007f8d8d8
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
mod/scorm/module.js
View file

@ -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 left = scorm_layout_widget.getUnitByPosition('left');
var maxwidth = parseInt(YAHOO.util.Dom.getStyle('scorm_layout', 'width')); 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'); var cwidth = left.get('width');
if (cwidth > (maxwidth - 10)) { if (cwidth > (maxwidth - 1)) {
left.set('width', (maxwidth - 10)); left.set('width', (maxwidth - 50));
} }
scorm_layout_widget.setStyle('height', '100%'); 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%'); center.setStyle('height', '100%');
// calculate the rough new height // calculate the rough new height
newheight = YAHOO.util.Dom.getViewportHeight() *.82; newheight = YAHOO.util.Dom.getViewportHeight() -5;
if (newheight < 600) { if (newheight < 600) {
newheight = 600; newheight = 600;
} }
@ -247,7 +247,7 @@ M.mod_scorm.init = function(Y, hide_nav, hide_toc, toc_title, window_name, launc
} }
} }
else { else {
obj.style.width = (content.offsetWidth - 6)+'px'; obj.style.width = (content.offsetWidth)+'px';
obj.style.height = (content.offsetHeight - 10)+'px'; obj.style.height = (content.offsetHeight - 10)+'px';
} }
} }

1
mod/scorm/styles.css
View file

@ -26,6 +26,7 @@
#page-mod-scorm-player #altfinishlink {font-size: 140%;border: 0px; padding: 0px; } #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 #altpopuplink {position: left; padding: 5px; border: 0px; }
#page-mod-scorm-player #scormmode {float: left; 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 .scorm-center { display:none;}
.path-mod-scorm.forcejavascript .toc { display:none;} .path-mod-scorm.forcejavascript .toc { display:none;}