Index: lams_central/web/css/thickbox.css =================================================================== diff -u -r71ee774107e638c288ec369356769efc7e0db9ce -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_central/web/css/thickbox.css (.../thickbox.css) (revision 71ee774107e638c288ec369356769efc7e0db9ce) +++ lams_central/web/css/thickbox.css (.../thickbox.css) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -36,10 +36,6 @@ -moz-opacity: 0.75; opacity: 0.75; } -* html #TB_overlay { /* ie6 hack */ - position: absolute; - height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); -} #TB_window { position: fixed; background: #ffffff; @@ -48,13 +44,12 @@ display:none; border: 4px solid #525252; text-align:left; - top:50%; - left:50%; + margin-left: auto; + margin-right: auto; + left: 0; + right: 0; + top: 0; } -* html #TB_window { /* ie6 hack */ -position: absolute; -margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); -} #TB_window img#TB_Image { display:block; margin: 15px 0 0 15px; @@ -112,10 +107,6 @@ margin: -6px 0 0 -104px; /* -height/2 0 0 -width/2 */ background-image: url(../images/loadingAnimation.gif); /* modified by LAMS */ } -* html #TB_load { /* ie6 hack */ -position: absolute; -margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); -} #TB_HideSelect{ z-index:99; position:fixed; @@ -129,23 +120,22 @@ height:100%; width:100%; } -* html #TB_HideSelect { /* ie6 hack */ - position: absolute; - height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); -} #TB_iframeContent{ clear:both; border:none; margin-bottom:-1px; - margin-top:1px; _margin-bottom:1px; } /* Added by LAMS. Enables scrolling on iOS devices. */ #TB_window { + height:100%; + width:90%; + max-width: 1200px; +} +#TB_iframeContent { overflow-y: auto !important; -webkit-overflow-scrolling: touch !important; + height:100%; + width:100%; } -#TB_iframeContent, #TB_overlay, #TB_window { - height:100% !important; -} Index: lams_central/web/includes/javascript/thickbox.js =================================================================== diff -u -r71ee774107e638c288ec369356769efc7e0db9ce -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_central/web/includes/javascript/thickbox.js (.../thickbox.js) (revision 71ee774107e638c288ec369356769efc7e0db9ce) +++ lams_central/web/includes/javascript/thickbox.js (.../thickbox.js) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -97,33 +97,8 @@ imgPreloader = new Image(); imgPreloader.onload = function(){ imgPreloader.onload = null; - - // Resizing large images - orginal by Christian Montoya edited by me. - var pagesize = tb_getPageSize(); - var x = pagesize[0] - 150; - var y = pagesize[1] - 150; - var imageWidth = imgPreloader.width; - var imageHeight = imgPreloader.height; - if (imageWidth > x) { - imageHeight = imageHeight * (x / imageWidth); - imageWidth = x; - if (imageHeight > y) { - imageWidth = imageWidth * (y / imageHeight); - imageHeight = y; - } - } else if (imageHeight > y) { - imageWidth = imageWidth * (y / imageHeight); - imageHeight = y; - if (imageWidth > x) { - imageHeight = imageHeight * (x / imageWidth); - imageWidth = x; - } - } - // End Resizing - TB_WIDTH = imageWidth + 30; - TB_HEIGHT = imageHeight + 60; - $("#TB_window").append(""+caption+"" + "
"+caption+"
" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "
close or Esc Key
"); + $("#TB_window").append(""+caption+"" + "
"+caption+"
" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "
close or Esc Key
"); $("#TB_closeWindowButton").click(tb_remove); @@ -170,7 +145,6 @@ } }; - tb_position(); $("#TB_load").remove(); $("#TB_ImageOff").click(tb_remove); $("#TB_window").css({display:"block"}); //for safari using css instead of show @@ -181,32 +155,40 @@ var queryString = url.replace(/^[^\?]+\??/,''); var params = tb_parseQuery( queryString ); - - TB_WIDTH = (params['width']*1) + 30 || 630; //defaults to 630 if no paramaters were added to URL - TB_HEIGHT = (params['height']*1) + 40 || 440; //defaults to 440 if no paramaters were added to URL - ajaxContentW = TB_WIDTH - 30; - ajaxContentH = TB_HEIGHT - 45; + if ((params['width']*1)) { + var ajaxContentW = (params['width']*1); + if (url.indexOf('TB_iframe') != -1) { + ajaxContentW += 29; + } + $("#TB_window").css("width", ajaxContentW + "px"); + } + if ((params['height']*1)) { + var ajaxContentH = (params['height']*1) - 5; + if (url.indexOf('TB_iframe') != -1) { + ajaxContentH += 17; + } + $("#TB_window").css("height", ajaxContentH + "px"); + } + if(url.indexOf('TB_iframe') != -1){// either iframe or ajax window urlNoQuery = url.split('TB_'); $("#TB_iframeContent").remove(); if(params['modal'] != "true"){//iframe no modal - $("#TB_window").append("
"+caption+"
close or Esc Key
"); + $("#TB_window").append("
"+caption+"
close or Esc Key
"); }else{//iframe modal - $("#TB_overlay").unbind(); - $("#TB_window").append(""); + $("#TB_overlay").unbind(); + $("#TB_window").append(""); } }else{// not an iframe, ajax if($("#TB_window").css("display") != "block"){ if(params['modal'] != "true"){//ajax no modal - $("#TB_window").append("
"+caption+"
close or Esc Key
"); + $("#TB_window").append("
"+caption+"
close or Esc Key
"); }else{//ajax modal $("#TB_overlay").unbind(); - $("#TB_window").append("
"); + $("#TB_window").append("
"); } }else{//this means the window is already up, we are just loading new content via ajax - $("#TB_ajaxContent")[0].style.width = ajaxContentW +"px"; - $("#TB_ajaxContent")[0].style.height = ajaxContentH +"px"; $("#TB_ajaxContent")[0].scrollTop = 0; $("#TB_ajaxWindowTitle").html(caption); } @@ -219,18 +201,15 @@ $("#TB_window").unload(function () { $('#' + params['inlineId']).append( $("#TB_ajaxContent").children() ); // move elements back when you're finished }); - tb_position(); $("#TB_load").remove(); $("#TB_window").css({display:"block"}); }else if(url.indexOf('TB_iframe') != -1){ - tb_position(); if($.browser.safari){//safari needs help because it will not fire iframe onload $("#TB_load").remove(); $("#TB_window").css({display:"block"}); } }else{ $("#TB_ajaxContent").load(url += "&random=" + (new Date().getTime()),function(){//to do a post change this load method - tb_position(); $("#TB_load").remove(); tb_init("#TB_ajaxContent a.thickbox"); $("#TB_window").css({display:"block"}); @@ -283,11 +262,6 @@ return false; } -function tb_position() { - jQuery("#TB_window").css({marginLeft: '-' + parseInt((TB_WIDTH / 2),10) + 'px', width: TB_WIDTH + 'px'}); - $("#TB_window").css({marginTop: '-' + parseInt((TB_HEIGHT / 2),10) + 'px'}); -} - function tb_parseQuery ( query ) { var Params = {}; if ( ! query ) {return Params;}// return empty object @@ -303,35 +277,9 @@ return Params; } -function tb_getPageSize(){ - var de = document.documentElement; - var w = window.innerWidth || self.innerWidth || (de&&de.clientWidth) || document.body.clientWidth; - var h = window.innerHeight || self.innerHeight || (de&&de.clientHeight) || document.body.clientHeight; - arrayPageSize = [w,h]; - return arrayPageSize; -} - function tb_detectMacXFF() { var userAgent = navigator.userAgent.toLowerCase(); if (userAgent.indexOf('mac') != -1 && userAgent.indexOf('firefox')!=-1) { return true; } } - -//Aded by LAMS -function resizeThickbox() { - if (document.getElementById('TB_iframeContent') != null) { - var height = top.window.innerHeight; - if ( height == undefined || height == 0 ) { - // IE doesn't use window.innerHeight. - height = document.documentElement.clientHeight; - // alert("using clientHeight"); - } - // alert("doc height "+height); - height -= document.getElementById('TB_iframeContent').offsetTop + 140; - document.getElementById('TB_iframeContent').style.height = height +"px"; - - TB_HEIGHT = height - 32; - tb_position(); - } -}; \ No newline at end of file Index: lams_central/web/lessonIntro.jsp =================================================================== diff -u -rd1bd9bd5e64acfc2e661fccd282079b1e60c7c7f -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_central/web/lessonIntro.jsp (.../lessonIntro.jsp) (revision d1bd9bd5e64acfc2e661fccd282079b1e60c7c7f) +++ lams_central/web/lessonIntro.jsp (.../lessonIntro.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -12,15 +12,8 @@ <fmt:message key="title.learner.window"/> - - - - - - + - +
Index: lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp =================================================================== diff -u -rbec787cd93e748839d54b0ae8b8d55c729ec2240 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp (.../addmatchingpairs.jsp) (revision bec787cd93e748839d54b0ae8b8d55c729ec2240) +++ lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp (.../addmatchingpairs.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -88,7 +88,7 @@ - +
Index: lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp =================================================================== diff -u -rbec787cd93e748839d54b0ae8b8d55c729ec2240 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp (.../addmultiplechoice.jsp) (revision bec787cd93e748839d54b0ae8b8d55c729ec2240) +++ lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp (.../addmultiplechoice.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -109,7 +109,7 @@ } - +
Index: lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp =================================================================== diff -u -rbec787cd93e748839d54b0ae8b8d55c729ec2240 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp (.../addnumerical.jsp) (revision bec787cd93e748839d54b0ae8b8d55c729ec2240) +++ lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp (.../addnumerical.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -158,7 +158,7 @@ - +
Index: lams_tool_assessment/web/pages/authoring/parts/addordering.jsp =================================================================== diff -u -rbec787cd93e748839d54b0ae8b8d55c729ec2240 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_assessment/web/pages/authoring/parts/addordering.jsp (.../addordering.jsp) (revision bec787cd93e748839d54b0ae8b8d55c729ec2240) +++ lams_tool_assessment/web/pages/authoring/parts/addordering.jsp (.../addordering.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -90,7 +90,7 @@ - +
Index: lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp =================================================================== diff -u -rbec787cd93e748839d54b0ae8b8d55c729ec2240 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp (.../addshortanswer.jsp) (revision bec787cd93e748839d54b0ae8b8d55c729ec2240) +++ lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp (.../addshortanswer.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -98,7 +98,7 @@ - +
Index: lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp =================================================================== diff -u -rbec787cd93e748839d54b0ae8b8d55c729ec2240 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp (.../addtruefalse.jsp) (revision bec787cd93e748839d54b0ae8b8d55c729ec2240) +++ lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp (.../addtruefalse.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -73,7 +73,7 @@ - +
Index: lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp =================================================================== diff -u -rc033158fe4987791d7a8902d16316b4d6a3cf1ef -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp (.../questionlist.jsp) (revision c033158fe4987791d7a8902d16316b4d6a3cf1ef) +++ lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp (.../questionlist.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -132,7 +132,7 @@
- ?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true&height=240&width=650 + ?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true @@ -191,7 +191,7 @@ - ?sessionMapID=${sessionMapID}&questionIndex=${status.index}&KeepThis=true&TB_iframe=true&height=540&width=850&modal=true + ?sessionMapID=${sessionMapID}&questionIndex=${status.index}&KeepThis=true&TB_iframe=true&modal=true Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp =================================================================== diff -u -ra78be3f1e9a9f6b7b69d12d63ca3a14f3c80b931 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp (.../questionsummary.jsp) (revision a78be3f1e9a9f6b7b69d12d63ca3a14f3c80b931) +++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp (.../questionsummary.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -129,7 +129,7 @@ - +
Index: lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp =================================================================== diff -u -ra78be3f1e9a9f6b7b69d12d63ca3a14f3c80b931 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp (.../usersummary.jsp) (revision a78be3f1e9a9f6b7b69d12d63ca3a14f3c80b931) +++ lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp (.../usersummary.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -137,7 +137,7 @@ - +
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp =================================================================== diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_assessment/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision fb2d35766faadf7fa8e0247feb943da34f8fba4f) +++ lams_tool_assessment/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -34,7 +34,7 @@ var userId = jQuery("#list${sessionDto.sessionId}").getCell(rowid, 'userId'); var sessionId = jQuery("#list${sessionDto.sessionId}").getCell(rowid, 'sessionId'); var userSummaryUrl = ''; - var newUserSummaryHref = userSummaryUrl + "&userID=" + userId + "&sessionId=" + sessionId + "&KeepThis=true&TB_iframe=true&height=540&width=750&modal=true"; + var newUserSummaryHref = userSummaryUrl + "&userID=" + userId + "&sessionId=" + sessionId + "&KeepThis=true&TB_iframe=true&modal=true"; $("#userSummaryHref").attr("href", newUserSummaryHref); $("#userSummaryHref").click(); }, @@ -144,7 +144,7 @@ var questionUid = $("#questionUid").val(); if (questionUid != -1) { var questionSummaryUrl = ''; - var questionSummaryHref = questionSummaryUrl + "&questionUid=" + questionUid + "&KeepThis=true&TB_iframe=true&height=400&width=750&modal=true"; + var questionSummaryHref = questionSummaryUrl + "&questionUid=" + questionUid + "&KeepThis=true&TB_iframe=true&modal=true"; $("#questionSummaryHref").attr("href", questionSummaryHref); $("#questionSummaryHref").click(); } @@ -166,31 +166,6 @@ url = url + param; location.href=url; }; - - function resizeIframe() { - if (document.getElementById('TB_iframeContent') != null) { - var height = top.window.innerHeight; - if ( height == undefined || height == 0 ) { - // IE doesn't use window.innerHeight. - height = document.documentElement.clientHeight; - } - height -= document.getElementById('TB_iframeContent').offsetTop + 60; - document.getElementById('TB_iframeContent').style.height = height +"px"; - TB_HEIGHT = height + 28; - - var width = top.window.innerWidth; - if ( width == undefined || width == 0 ) { - // IE doesn't use window.innerWidth. - width = document.documentElement.clientWidth; - } - width -= document.getElementById('TB_iframeContent').offsetLeft + 60; - document.getElementById('TB_iframeContent').style.width = width +"px"; - TB_WIDTH = width + 1; - - tb_position(); - } - }; - window.onresize = resizeIframe;
Index: lams_tool_imscc/build.properties =================================================================== diff -u -rdfc0b58933316e2e56513b81463e54d72b43e224 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_imscc/build.properties (.../build.properties) (revision dfc0b58933316e2e56513b81463e54d72b43e224) +++ lams_tool_imscc/build.properties (.../build.properties) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -3,5 +3,5 @@ signature=laimsc11 tool.version=20110511 -tool.hide=true +tool.hide=false tool.short.name=commonCartridge \ No newline at end of file Fisheye: Tag d28a91914e8858e0fbc045fc9313e3b50a309c45 refers to a dead (removed) revision in file `lams_tool_imscc/web/includes/css/thickbox.css'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_imscc/web/pages/authoring/authoring.jsp =================================================================== diff -u -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_imscc/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) +++ lams_tool_imscc/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -8,7 +8,7 @@ <%@ include file="/common/tabbedheader.jsp"%> - + @@ -91,7 +73,7 @@ --> - &KeepThis=true&TB_iframe=true&height=540&width=580&modal=true" class="btn btn-default btn-sm thickbox"> + &KeepThis=true&TB_iframe=true&modal=true" class="btn btn-default btn-sm thickbox">

Index: lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp =================================================================== diff -u -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp (.../addbasiclti.jsp) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) +++ lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp (.../addbasiclti.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -20,7 +20,7 @@ - + Index: lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp =================================================================== diff -u -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp (.../addcommoncartridge.jsp) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) +++ lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp (.../addcommoncartridge.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -8,7 +8,7 @@ - + Index: lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp =================================================================== diff -u -ra95a149633c884052a9d1a916f6d0fb2039dc503 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp (.../itemlist.jsp) (revision a95a149633c884052a9d1a916f6d0fb2039dc503) +++ lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp (.../itemlist.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -29,7 +29,7 @@ - ?sessionMapID=${sessionMapID}&itemIndex=${status.index}&KeepThis=true&TB_iframe=true&height=540&width=850&modal=true + ?sessionMapID=${sessionMapID}&itemIndex=${status.index}&KeepThis=true&TB_iframe=true&modal=true "> Index: lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp =================================================================== diff -u -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp (.../selectResources.jsp) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) +++ lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp (.../selectResources.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -24,7 +24,7 @@ - +
Index: lams_tool_kaltura/web/pages/authoring/basic.jsp =================================================================== diff -u -re535a51e19cbc72d07bda00b019c947847d869b0 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_kaltura/web/pages/authoring/basic.jsp (.../basic.jsp) (revision e535a51e19cbc72d07bda00b019c947847d869b0) +++ lams_tool_kaltura/web/pages/authoring/basic.jsp (.../basic.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -201,24 +201,6 @@ } ); } - - function resizeIframe() { - if (document.getElementById('TB_iframeContent') != null) { - var height = top.window.innerHeight; - if ( height == undefined || height == 0 ) { - // IE doesn't use window.innerHeight. - height = document.documentElement.clientHeight; - // alert("using clientHeight"); - } - // alert("doc height "+height); - height -= document.getElementById('TB_iframeContent').offsetTop + 60; - document.getElementById('TB_iframeContent').style.height = height +"px"; - - TB_HEIGHT = height + 28; - tb_position(); - } - }; - window.onresize = resizeIframe; Index: lams_tool_kaltura/web/pages/authoring/itemlist.jsp =================================================================== diff -u -re72b9e207de21220c57906a9a95ae6590b351b19 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_kaltura/web/pages/authoring/itemlist.jsp (.../itemlist.jsp) (revision e72b9e207de21220c57906a9a95ae6590b351b19) +++ lams_tool_kaltura/web/pages/authoring/itemlist.jsp (.../itemlist.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -22,7 +22,7 @@ - ?dispatch=preview&sessionMapID=${sessionMapID}&itemIndex=${status.index}&KeepThis=true&TB_iframe=true&height=340&width=650 + ?dispatch=preview&sessionMapID=${sessionMapID}&itemIndex=${status.index}&KeepThis=true&TB_iframe=true "> Index: lams_tool_kaltura/web/pages/authoring/preview.jsp =================================================================== diff -u -re535a51e19cbc72d07bda00b019c947847d869b0 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_kaltura/web/pages/authoring/preview.jsp (.../preview.jsp) (revision e535a51e19cbc72d07bda00b019c947847d869b0) +++ lams_tool_kaltura/web/pages/authoring/preview.jsp (.../preview.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -56,7 +56,7 @@ - +
Index: lams_tool_kaltura/web/pages/learning/learning.jsp =================================================================== diff -u -ref2f3057445dd3f802b958ab67a77abe6dbc54c0 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_kaltura/web/pages/learning/learning.jsp (.../learning.jsp) (revision ef2f3057445dd3f802b958ab67a77abe6dbc54c0) +++ lams_tool_kaltura/web/pages/learning/learning.jsp (.../learning.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -257,7 +257,7 @@
- + Index: lams_tool_kaltura/web/pages/monitoring/summary.jsp =================================================================== diff -u -re535a51e19cbc72d07bda00b019c947847d869b0 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_kaltura/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision e535a51e19cbc72d07bda00b019c947847d869b0) +++ lams_tool_kaltura/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -59,7 +59,7 @@ - ?dispatch=showGroupLearning&toolSessionID=${session.sessionID}&TB_iframe=true&height=630&width=800" class="btn btn-default btn-sm thickbox" title=""> + ?dispatch=showGroupLearning&toolSessionID=${session.sessionID}&TB_iframe=true" class="btn btn-default btn-sm thickbox" title=""> ${session.sessionName} Index: lams_tool_lamc/web/authoring/BasicContent.jsp =================================================================== diff -u -r1423caabe2970a570dc048146e1813ae07f92b19 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_lamc/web/authoring/BasicContent.jsp (.../BasicContent.jsp) (revision 1423caabe2970a570dc048146e1813ae07f92b19) +++ lams_tool_lamc/web/authoring/BasicContent.jsp (.../BasicContent.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -30,24 +30,6 @@ }); } - function resizeIframe() { - if (document.getElementById('TB_iframeContent') != null) { - var height = top.window.innerHeight; - if ( height == undefined || height == 0 ) { - // IE doesn't use window.innerHeight. - height = document.documentElement.clientHeight; - // alert("using clientHeight"); - } - // alert("doc height "+height); - height -= document.getElementById('TB_iframeContent').offsetTop + 260; - document.getElementById('TB_iframeContent').style.height = height +"px"; - - TB_HEIGHT = height + 28; - tb_position(); - } - }; - window.onresize = resizeIframe; - function refreshThickbox(){ tb_init('a.thickbox, area.thickbox, input.thickbox');//pass where to apply thickbox }; @@ -89,7 +71,7 @@

- ?dispatch=newQuestionBox&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&sln=${mcGeneralAuthoringDTO.sln}&showMarks=${mcGeneralAuthoringDTO.showMarks}&randomize=${mcGeneralAuthoringDTO.randomize}&questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&retries=${mcGeneralAuthoringDTO.retries}&KeepThis=true&TB_iframe=true&height=540&width=950&modal=true" + ?dispatch=newQuestionBox&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&sln=${mcGeneralAuthoringDTO.sln}&showMarks=${mcGeneralAuthoringDTO.showMarks}&randomize=${mcGeneralAuthoringDTO.randomize}&questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&retries=${mcGeneralAuthoringDTO.retries}&KeepThis=true&TB_iframe=true&modal=true" class="btn btn-default btn-sm thickbox">   Index: lams_tool_lamc/web/authoring/editQuestionBox.jsp =================================================================== diff -u -r2adc76b37e28820736a7a35934142d124c831392 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_lamc/web/authoring/editQuestionBox.jsp (.../editQuestionBox.jsp) (revision 2adc76b37e28820736a7a35934142d124c831392) +++ lams_tool_lamc/web/authoring/editQuestionBox.jsp (.../editQuestionBox.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -149,7 +149,7 @@ - + Index: lams_tool_lamc/web/authoring/itemlist.jsp =================================================================== diff -u -r1423caabe2970a570dc048146e1813ae07f92b19 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_lamc/web/authoring/itemlist.jsp (.../itemlist.jsp) (revision 1423caabe2970a570dc048146e1813ae07f92b19) +++ lams_tool_lamc/web/authoring/itemlist.jsp (.../itemlist.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -78,7 +78,7 @@ - ?dispatch=newEditableQuestionBox&questionIndex=${queIndex}&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&sln=${mcGeneralAuthoringDTO.sln}&showMarks=${mcGeneralAuthoringDTO.showMarks}&randomize=${mcGeneralAuthoringDTO.randomize}&questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&retries=${mcGeneralAuthoringDTO.retries}&reflect=${mcGeneralAuthoringDTO.reflect}&KeepThis=true&TB_iframe=true&height=540&width=950&modal=true + ?dispatch=newEditableQuestionBox&questionIndex=${queIndex}&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&sln=${mcGeneralAuthoringDTO.sln}&showMarks=${mcGeneralAuthoringDTO.showMarks}&randomize=${mcGeneralAuthoringDTO.randomize}&questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&retries=${mcGeneralAuthoringDTO.retries}&reflect=${mcGeneralAuthoringDTO.reflect}&KeepThis=true&TB_iframe=true&modal=true Index: lams_tool_lamc/web/authoring/newQuestionBox.jsp =================================================================== diff -u -r6c7178cb278f5676015a3864b0b49e36a158d5bc -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_lamc/web/authoring/newQuestionBox.jsp (.../newQuestionBox.jsp) (revision 6c7178cb278f5676015a3864b0b49e36a158d5bc) +++ lams_tool_lamc/web/authoring/newQuestionBox.jsp (.../newQuestionBox.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -145,7 +145,7 @@ - + Index: lams_tool_lamc/web/common/monitoringheader.jsp =================================================================== diff -u -r00937d78dacc0993260d5ed7b39e4376e432cf45 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_lamc/web/common/monitoringheader.jsp (.../monitoringheader.jsp) (revision 00937d78dacc0993260d5ed7b39e4376e432cf45) +++ lams_tool_lamc/web/common/monitoringheader.jsp (.../monitoringheader.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -8,12 +8,10 @@ - - Index: lams_tool_leader/web/pages/monitoring/headItems.jsp =================================================================== diff -u -ra6f139bf7f2aeceb96792867e30e3de3959bd1f0 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_leader/web/pages/monitoring/headItems.jsp (.../headItems.jsp) (revision a6f139bf7f2aeceb96792867e30e3de3959bd1f0) +++ lams_tool_leader/web/pages/monitoring/headItems.jsp (.../headItems.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -18,21 +18,4 @@ - Index: lams_tool_leader/web/pages/monitoring/manageLeaders.jsp =================================================================== diff -u -ra6f139bf7f2aeceb96792867e30e3de3959bd1f0 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_leader/web/pages/monitoring/manageLeaders.jsp (.../manageLeaders.jsp) (revision a6f139bf7f2aeceb96792867e30e3de3959bd1f0) +++ lams_tool_leader/web/pages/monitoring/manageLeaders.jsp (.../manageLeaders.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -30,7 +30,7 @@ - + Index: lams_tool_leader/web/pages/monitoring/summary.jsp =================================================================== diff -u -ra6f139bf7f2aeceb96792867e30e3de3959bd1f0 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_leader/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision a6f139bf7f2aeceb96792867e30e3de3959bd1f0) +++ lams_tool_leader/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -76,7 +76,7 @@

-"> +"> Index: lams_tool_scratchie/web/pages/authoring/basic.jsp =================================================================== diff -u -rc115d6660462bb306d5635a4f7d4809b2e4610e5 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_scratchie/web/pages/authoring/basic.jsp (.../basic.jsp) (revision c115d6660462bb306d5635a4f7d4809b2e4610e5) +++ lams_tool_scratchie/web/pages/authoring/basic.jsp (.../basic.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -53,29 +53,11 @@ } ); } - - function resizeIframe() { - if (document.getElementById('TB_iframeContent') != null) { - var height = top.window.innerHeight; - if ( height == undefined || height == 0 ) { - // IE doesn't use window.innerHeight. - height = document.documentElement.clientHeight; - // alert("using clientHeight"); - } - // alert("doc height "+height); - height -= document.getElementById('TB_iframeContent').offsetTop + 260; - document.getElementById('TB_iframeContent').style.height = height +"px"; - - TB_HEIGHT = height + 28; - tb_position(); - } - }; - window.onresize = resizeIframe; function createNewQuestionInitHref() { var questionTypeDropdown = document.getElementById("questionType"); var questionType = questionTypeDropdown.selectedIndex + 1; - var newQuestionInitHref = "${newQuestionInitUrl}&questionType=" + questionType + "&referenceGrades=" + encodeURIComponent(serializeReferenceGrades()) + "&KeepThis=true&TB_iframe=true&height=640&width=950&modal=true"; + var newQuestionInitHref = "${newQuestionInitUrl}&questionType=" + questionType + "&referenceGrades=" + encodeURIComponent(serializeReferenceGrades()) + "&KeepThis=true&TB_iframe=true&modal=true"; $("#newQuestionInitHref").attr("href", newQuestionInitHref) }; @@ -132,7 +114,7 @@
- ?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true&height=540&width=850&modal=true + ?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true&modal=true   Index: lams_tool_scratchie/web/pages/authoring/parts/additem.jsp =================================================================== diff -u -r2ba2822fcab0eef95436978d64dea83ff88b17cc -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_scratchie/web/pages/authoring/parts/additem.jsp (.../additem.jsp) (revision 2ba2822fcab0eef95436978d64dea83ff88b17cc) +++ lams_tool_scratchie/web/pages/authoring/parts/additem.jsp (.../additem.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -207,7 +207,7 @@ - +
Index: lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp =================================================================== diff -u -rc6ad56c04dee27bd0adda2a22d58940d058b72c0 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp (.../itemlist.jsp) (revision c6ad56c04dee27bd0adda2a22d58940d058b72c0) +++ lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp (.../itemlist.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -35,7 +35,7 @@ - ?sessionMapID=${sessionMapID}&itemIndex=${status.index}&KeepThis=true&TB_iframe=true&height=540&width=850&modal=true + ?sessionMapID=${sessionMapID}&itemIndex=${status.index}&KeepThis=true&TB_iframe=true&modal=true Index: lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp =================================================================== diff -u -r9e9c0664745d48fdd504952bb279e5b840675758 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp (.../itemSummary.jsp) (revision 9e9c0664745d48fdd504952bb279e5b840675758) +++ lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp (.../itemSummary.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -81,7 +81,7 @@ - + ${fn:escapeXml(item.title)} Index: lams_tool_scratchie/web/pages/monitoring/summary.jsp =================================================================== diff -u -rc000983f908e613bfc43431de44cdb53f901bee4 -rd28a91914e8858e0fbc045fc9313e3b50a309c45 --- lams_tool_scratchie/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision c000983f908e613bfc43431de44cdb53f901bee4) +++ lams_tool_scratchie/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision d28a91914e8858e0fbc045fc9313e3b50a309c45) @@ -178,7 +178,7 @@ var itemUid = $(this).val(); if (itemUid != -1) { var itemSummaryUrl = ''; - var itemSummaryHref = itemSummaryUrl + "&itemUid=" + itemUid + "&KeepThis=true&TB_iframe=true&height=400&width=650"; + var itemSummaryHref = itemSummaryUrl + "&itemUid=" + itemUid + "&KeepThis=true&TB_iframe=true"; $("#item-summary-href").attr("href", itemSummaryHref); //return; @@ -217,23 +217,7 @@ function exportExcel(){ location.href = "?sessionMapID=${sessionMapID}&reqID=" + (new Date()).getTime(); }; - - function resizeIframe() { - if (document.getElementById('TB_iframeContent') != null) { - var height = top.window.innerHeight; - if ( height == undefined || height == 0 ) { - // IE doesn't use window.innerHeight. - height = document.documentElement.clientHeight; - } - height -= document.getElementById('TB_iframeContent').offsetTop + 60; - document.getElementById('TB_iframeContent').style.height = height +"px"; - TB_HEIGHT = height + 28; - tb_position(); - } - }; - window.onresize = resizeIframe; - // pass settings to monitorToolSummaryAdvanced.js var submissionDeadlineSettings = { lams: '',