Index: lams_central/web/lessonIntro.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lessonIntro.jsp,v
diff -u -r1.8.2.7 -r1.8.2.8
--- lams_central/web/lessonIntro.jsp	7 Nov 2016 04:42:26 -0000	1.8.2.7
+++ lams_central/web/lessonIntro.jsp	11 Nov 2016 15:52:12 -0000	1.8.2.8
@@ -12,15 +12,8 @@
 <lams:head>
 	<TITLE><fmt:message key="title.learner.window"/></TITLE>
 	<link rel="stylesheet" href="css/defaultHTML_learner.css" type="text/css" media="screen" />
-	<link rel="stylesheet" href="css/thickbox.css" type="text/css" media="screen">
 	
-	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="includes/javascript/thickbox.js"></script>
-	
-	<style media="screen,projection" type="text/css">
-		#TB_iframeContent {width: 820px !important}
-	</style>	
-	
+	<script type="text/javascript" src="includes/javascript/jquery.js"></script>	
 	<c:if test="${displayDesignImage}">
 		<script>
 		var originalThumbnailWidth = 0,
Index: lams_central/web/css/thickbox.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/thickbox.css,v
diff -u -r1.2.2.3 -r1.2.2.4
--- lams_central/web/css/thickbox.css	10 Nov 2016 13:20:30 -0000	1.2.2.3
+++ lams_central/web/css/thickbox.css	11 Nov 2016 15:52:12 -0000	1.2.2.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/thickbox.js,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_central/web/includes/javascript/thickbox.js	10 Nov 2016 13:20:30 -0000	1.1.2.3
+++ lams_central/web/includes/javascript/thickbox.js	11 Nov 2016 15:52:12 -0000	1.1.2.4
@@ -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("<a href='' id='TB_ImageOff' title='Close'><img id='TB_Image' src='"+url+"' width='"+imageWidth+"' height='"+imageHeight+"' alt='"+caption+"'/></a>" + "<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><a href='#' id='TB_closeWindowButton' title='Close'>close</a> or Esc Key</div>"); 		
+			$("#TB_window").append("<a href='' id='TB_ImageOff' title='Close'><img id='TB_Image' src='"+url+"' alt='"+caption+"'/></a>" + "<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><a href='#' id='TB_closeWindowButton' title='Close'>close</a> or Esc Key</div>"); 		
 			
 			$("#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("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton' title='Close'>close</a> or Esc Key</div></div><iframe frameborder='0' hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;' > </iframe>");
+						$("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton' title='Close'>close</a> or Esc Key</div></div><iframe frameborder='0' hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()'> </iframe>");
 					}else{//iframe modal
-					$("#TB_overlay").unbind();
-						$("#TB_window").append("<iframe frameborder='0' hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;'> </iframe>");
+						$("#TB_overlay").unbind();
+						$("#TB_window").append("<iframe frameborder='0' hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()'> </iframe>");
 					}
 			}else{// not an iframe, ajax
 					if($("#TB_window").css("display") != "block"){
 						if(params['modal'] != "true"){//ajax no modal
-						$("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton'>close</a> or Esc Key</div></div><div id='TB_ajaxContent' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px'></div>");
+						$("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton'>close</a> or Esc Key</div></div><div id='TB_ajaxContent'></div>");
 						}else{//ajax modal
 						$("#TB_overlay").unbind();
-						$("#TB_window").append("<div id='TB_ajaxContent' class='TB_modal' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px;'></div>");	
+						$("#TB_window").append("<div id='TB_ajaxContent' class='TB_modal'></div>");	
 						}
 					}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_tool_assessment/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/basic.jsp,v
diff -u -r1.19.2.5 -r1.19.2.6
--- lams_tool_assessment/web/pages/authoring/basic.jsp	10 Nov 2016 13:21:07 -0000	1.19.2.5
+++ lams_tool_assessment/web/pages/authoring/basic.jsp	11 Nov 2016 15:52:08 -0000	1.19.2.6
@@ -106,13 +106,10 @@
 		location.href="<c:url value='/authoring/exportQuestions.do'/>" + param;
 	};
 
-	//autoresize Thickbox iframe on window resizing
-	window.onresize = resizeThickbox;
-
 	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)
 	};
 	function refreshThickbox(){
Index: lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/parts/addessay.jsp,v
diff -u -r1.20.2.6 -r1.20.2.7
--- lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	10 Nov 2016 13:21:07 -0000	1.20.2.6
+++ lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	11 Nov 2016 15:52:08 -0000	1.20.2.7
@@ -105,7 +105,7 @@
 		
 </lams:head>
 	
-<body onload="parent.resizeThickbox();">
+<body>
 	<div class="panel panel-default add-file">
 		<div class="panel-heading panel-title">
 			<fmt:message key="label.authoring.basic.type.essay" />
Index: lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp,v
diff -u -r1.1.2.8 -r1.1.2.9
--- lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp	10 Nov 2016 13:21:07 -0000	1.1.2.8
+++ lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp	11 Nov 2016 15:52:08 -0000	1.1.2.9
@@ -87,7 +87,7 @@
  	</script>
 		
 </lams:head>
-<body onload="parent.resizeThickbox();">
+<body>
 	<div class="panel panel-default add-file">
 		<div class="panel-heading panel-title">
 			<fmt:message key="label.authoring.basic.type.multiple.choice" />
Index: lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp,v
diff -u -r1.20.2.6 -r1.20.2.7
--- lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	10 Nov 2016 13:21:07 -0000	1.20.2.6
+++ lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	11 Nov 2016 15:52:08 -0000	1.20.2.7
@@ -88,7 +88,7 @@
 		
 </lams:head>
 
-<body onload="parent.resizeThickbox();">
+<body>
 	<div class="panel panel-default add-file">
 		<div class="panel-heading panel-title">
 			<fmt:message key="label.authoring.basic.type.matching.pairs" />
Index: lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp,v
diff -u -r1.21.2.7 -r1.21.2.8
--- lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	10 Nov 2016 13:21:07 -0000	1.21.2.7
+++ lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	11 Nov 2016 15:52:08 -0000	1.21.2.8
@@ -109,7 +109,7 @@
    		}    
 	</script>
 </lams:head>
-<body onload="parent.resizeThickbox();">
+<body>
 	<div class="panel panel-default add-file">
 		<div class="panel-heading panel-title">
 			<fmt:message key="label.authoring.basic.type.multiple.choice" />
Index: lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp,v
diff -u -r1.19.2.6 -r1.19.2.7
--- lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	10 Nov 2016 13:21:07 -0000	1.19.2.6
+++ lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	11 Nov 2016 15:52:08 -0000	1.19.2.7
@@ -158,7 +158,7 @@
 		
 	</lams:head>
 	
-<body onload="parent.resizeThickbox();">
+<body>
 	<div class="panel panel-default add-file">
 		<div class="panel-heading panel-title">
 			<fmt:message key="label.authoring.numerical.question" />
Index: lams_tool_assessment/web/pages/authoring/parts/addordering.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/parts/addordering.jsp,v
diff -u -r1.18.2.6 -r1.18.2.7
--- lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	10 Nov 2016 13:21:07 -0000	1.18.2.6
+++ lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	11 Nov 2016 15:52:08 -0000	1.18.2.7
@@ -90,7 +90,7 @@
   		</script>
 		
 </lams:head>
-<body onload="parent.resizeThickbox();">
+<body>
 	<div class="panel panel-default add-file">
 		<div class="panel-heading panel-title">
 			<fmt:message key="label.authoring.basic.type.ordering" />
Index: lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp,v
diff -u -r1.19.2.6 -r1.19.2.7
--- lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	10 Nov 2016 13:21:07 -0000	1.19.2.6
+++ lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	11 Nov 2016 15:52:08 -0000	1.19.2.7
@@ -98,7 +98,7 @@
 		
 </lams:head>
 	
-<body onload="parent.resizeThickbox();">
+<body>
 	<div class="panel panel-default add-file">
 		<div class="panel-heading panel-title">
 			<fmt:message key="label.authoring.basic.type.short.answer" />
Index: lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp,v
diff -u -r1.16.2.6 -r1.16.2.7
--- lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	10 Nov 2016 13:21:07 -0000	1.16.2.6
+++ lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	11 Nov 2016 15:52:08 -0000	1.16.2.7
@@ -73,7 +73,7 @@
   		</script>
 		
 </lams:head>
-<body onload="parent.resizeThickbox();">
+<body>
 	<div class="panel panel-default add-file">
 		<div class="panel-heading panel-title">
 			<fmt:message key="label.authoring.true.false.question" />
Index: lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp,v
diff -u -r1.7.2.6 -r1.7.2.7
--- lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	9 Nov 2016 17:14:08 -0000	1.7.2.6
+++ lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	11 Nov 2016 15:52:08 -0000	1.7.2.7
@@ -132,7 +132,7 @@
 		</div>
 		<div class="btn-group btn-group-xs pull-right roffset5" role="group">		
 			<c:set var="importInitUrl" >
-				<c:url value='/authoring/importInit.do'/>?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true&height=240&width=650
+				<c:url value='/authoring/importInit.do'/>?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true
 			</c:set>
 			<a href="${importInitUrl}" class="btn btn-default btn-xs loffset5 thickbox" id="importButton">  
 				<fmt:message key="label.authoring.basic.import.questions" />
@@ -191,7 +191,7 @@
 				
 				<td class="text-right">
 					<c:set var="editQuestionUrl" >
-						<c:url value='/authoring/editQuestion.do'/>?sessionMapID=${sessionMapID}&questionIndex=${status.index}&KeepThis=true&TB_iframe=true&height=540&width=850&modal=true
+						<c:url value='/authoring/editQuestion.do'/>?sessionMapID=${sessionMapID}&questionIndex=${status.index}&KeepThis=true&TB_iframe=true&modal=true
 					</c:set>
 					
 					<a href="${editQuestionUrl}" class="thickbox roffset5" style="margin-left: 20px;"> 
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/summary.jsp,v
diff -u -r1.25.2.6 -r1.25.2.7
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	1 Jun 2016 14:05:16 -0000	1.25.2.6
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	11 Nov 2016 15:52:08 -0000	1.25.2.7
@@ -34,7 +34,7 @@
 			   		var userId = jQuery("#list${sessionDto.sessionId}").getCell(rowid, 'userId');
 			   		var sessionId = jQuery("#list${sessionDto.sessionId}").getCell(rowid, 'sessionId');
 					var userSummaryUrl = '<c:url value="/monitoring/userSummary.do?sessionMapID=${sessionMapID}"/>';
-					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 = '<c:url value="/monitoring/questionSummary.do?sessionMapID=${sessionMapID}"/>';
-				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;
 </script>
 
 <div class="panel">
Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp,v
diff -u -r1.12.2.9 -r1.12.2.10
--- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	15 Jun 2016 08:01:14 -0000	1.12.2.9
+++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	11 Nov 2016 15:52:08 -0000	1.12.2.10
@@ -129,7 +129,7 @@
   		</script>
 	</lams:head>
 	
-<body class="stripes" onload="parent.resizeIframe();">
+<body class="stripes">
 
 	<div class="panel panel-default">
 		<div class="panel-heading">
Index: lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp,v
diff -u -r1.16.2.6 -r1.16.2.7
--- lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	15 Jun 2016 08:01:14 -0000	1.16.2.6
+++ lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	11 Nov 2016 15:52:08 -0000	1.16.2.7
@@ -137,7 +137,7 @@
   		</script>
 	</lams:head>
 	
-<body class="stripes" onload="parent.resizeIframe();">
+<body class="stripes">
 
 	<div class="panel panel-default">
 		<div class="panel-heading">
Index: lams_tool_imscc/build.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/build.properties,v
diff -u -r1.3.2.1 -r1.3.2.2
--- lams_tool_imscc/build.properties	8 Sep 2015 07:15:05 -0000	1.3.2.1
+++ lams_tool_imscc/build.properties	11 Nov 2016 15:52:22 -0000	1.3.2.2
@@ -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 1.1.2.1 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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/authoring/authoring.jsp,v
diff -u -r1.6.2.2 -r1.6.2.3
--- lams_tool_imscc/web/pages/authoring/authoring.jsp	18 May 2016 17:47:29 -0000	1.6.2.2
+++ lams_tool_imscc/web/pages/authoring/authoring.jsp	11 Nov 2016 15:52:22 -0000	1.6.2.3
@@ -8,7 +8,7 @@
 	
 	<%@ include file="/common/tabbedheader.jsp"%>
 	
-	<link rel="stylesheet" type="text/css" href="<html:rewrite page='/includes/css/thickbox.css'/>" />
+	<link rel="stylesheet" type="text/css" href="${lams}/css/thickbox.css" />
 	
  	<script type="text/javascript" src="${lams}includes/javascript/thickbox.js"></script>
 	<script>
Index: lams_tool_imscc/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/authoring/basic.jsp,v
diff -u -r1.5.2.1 -r1.5.2.2
--- lams_tool_imscc/web/pages/authoring/basic.jsp	18 May 2016 17:47:29 -0000	1.5.2.1
+++ lams_tool_imscc/web/pages/authoring/basic.jsp	11 Nov 2016 15:52:22 -0000	1.5.2.2
@@ -42,24 +42,6 @@
 	function refreshThickbox() {   
 		tb_init('a.thickbox, area.thickbox, input.thickbox');//pass where to apply thickbox
 	};
-	
-	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;
 
 </script>
 
@@ -91,7 +73,7 @@
 		<fmt:message key="label.authoring.basic.add.basiclti.tool" />
 	</a>
 -->	
-	<a href="<html:rewrite page="/authoring/newItemInit.do?sessionMapID=${formBean.sessionMapID}&itemType=2"/>&KeepThis=true&TB_iframe=true&height=540&width=580&modal=true" class="btn btn-default btn-sm thickbox">
+	<a href="<html:rewrite page="/authoring/newItemInit.do?sessionMapID=${formBean.sessionMapID}&itemType=2"/>&KeepThis=true&TB_iframe=true&modal=true" class="btn btn-default btn-sm thickbox">
 		<fmt:message key="label.authoring.basic.upload.common.cartridge" />
 	</a>
 </p>
Index: lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp,v
diff -u -r1.3.2.3 -r1.3.2.4
--- lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp	18 May 2016 17:47:29 -0000	1.3.2.3
+++ lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp	11 Nov 2016 15:52:22 -0000	1.3.2.4
@@ -20,7 +20,7 @@
 	</script>
 </lams:head>
 	
-<body class="stripes" onload="parent.resizeIframe();">
+<body class="stripes">
 	<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="commonCartridgeItemForm">
 		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 	
Index: lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp,v
diff -u -r1.3.2.3 -r1.3.2.4
--- lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp	18 May 2016 17:47:29 -0000	1.3.2.3
+++ lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp	11 Nov 2016 15:52:22 -0000	1.3.2.4
@@ -8,7 +8,7 @@
 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/commonCartridgeItem.js'/>"></script>
 </lams:head>
 	
-<body class="stripes" onload="parent.resizeIframe();">
+<body class="stripes">
 	<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="commonCartridgeItemForm" enctype="multipart/form-data">
 		<c:set var="itemAttachment" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 	
Index: lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp,v
diff -u -r1.6.2.4 -r1.6.2.5
--- lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp	20 Oct 2016 22:26:02 -0000	1.6.2.4
+++ lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp	11 Nov 2016 15:52:22 -0000	1.6.2.5
@@ -29,7 +29,7 @@
 						</td>
 						<td width="5%">
 							<c:set var="editItemUrl" >
-								<c:url value='/authoring/editItemInit.do'/>?sessionMapID=${sessionMapID}&itemIndex=${status.index}&KeepThis=true&TB_iframe=true&height=540&width=850&modal=true
+								<c:url value='/authoring/editItemInit.do'/>?sessionMapID=${sessionMapID}&itemIndex=${status.index}&KeepThis=true&TB_iframe=true&modal=true
 							</c:set>		
 							<a href="${editItemUrl}" class="thickbox" style="border-style: none;"> 
 								<i class="fa fa-pencil"	title="<fmt:message key="label.authoring.basic.resource.edit" />"></i>
Index: lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp,v
diff -u -r1.5.2.3 -r1.5.2.4
--- lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp	18 May 2016 17:47:29 -0000	1.5.2.3
+++ lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp	11 Nov 2016 15:52:22 -0000	1.5.2.4
@@ -24,7 +24,7 @@
 	</script>
 </lams:head>
 
-<body class="stripes" onload="parent.resizeIframe();">
+<body class="stripes">
 <form id="itemForm" name="itemForm" action="<c:url value='/authoring/selectResources.do'/>">
 	<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 	
Index: lams_tool_kaltura/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/pages/authoring/basic.jsp,v
diff -u -r1.8.2.2 -r1.8.2.3
--- lams_tool_kaltura/web/pages/authoring/basic.jsp	3 Jun 2016 08:58:43 -0000	1.8.2.2
+++ lams_tool_kaltura/web/pages/authoring/basic.jsp	11 Nov 2016 15:52:31 -0000	1.8.2.3
@@ -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;
 
 </script>
 
Index: lams_tool_kaltura/web/pages/authoring/itemlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/pages/authoring/itemlist.jsp,v
diff -u -r1.5.2.3 -r1.5.2.4
--- lams_tool_kaltura/web/pages/authoring/itemlist.jsp	21 Oct 2016 01:04:34 -0000	1.5.2.3
+++ lams_tool_kaltura/web/pages/authoring/itemlist.jsp	11 Nov 2016 15:52:31 -0000	1.5.2.4
@@ -22,7 +22,7 @@
 				
 					<td width="100px">
 						<c:set var="previewUrl" >
-							<c:url value='/authoring.do'/>?dispatch=preview&sessionMapID=${sessionMapID}&itemIndex=${status.index}&KeepThis=true&TB_iframe=true&height=340&width=650
+							<c:url value='/authoring.do'/>?dispatch=preview&sessionMapID=${sessionMapID}&itemIndex=${status.index}&KeepThis=true&TB_iframe=true
 						</c:set>
 					
 						<a href="${previewUrl}" class="thickbox" title="<fmt:message key="label.item.preview" />">
Index: lams_tool_kaltura/web/pages/authoring/preview.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/pages/authoring/preview.jsp,v
diff -u -r1.3.2.3 -r1.3.2.4
--- lams_tool_kaltura/web/pages/authoring/preview.jsp	3 Jun 2016 08:58:43 -0000	1.3.2.3
+++ lams_tool_kaltura/web/pages/authoring/preview.jsp	11 Nov 2016 15:52:31 -0000	1.3.2.4
@@ -56,7 +56,7 @@
 		</script>
 	</lams:head>
 
-	<body class="stripes" onload="parent.resizeIframe();">
+	<body class="stripes">
 		<lams:Page type="learner" title="${item.title}">
 			
 			<div id="kplayer">
Index: lams_tool_kaltura/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/pages/learning/learning.jsp,v
diff -u -r1.11.2.1 -r1.11.2.2
--- lams_tool_kaltura/web/pages/learning/learning.jsp	18 Mar 2016 18:45:05 -0000	1.11.2.1
+++ lams_tool_kaltura/web/pages/learning/learning.jsp	11 Nov 2016 15:52:31 -0000	1.11.2.2
@@ -257,7 +257,7 @@
 		
 			<div id="add-new-item">
 				<c:if test="${sessionMap.isAllowUpload && (not finishedLock)}">
-					<a href="<c:url value='/pages/learning/uploaditem.jsp'/>?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true&height=570&width=740&modal=true" class="btn btn-sm btn-default thickbox">  
+					<a href="<c:url value='/pages/learning/uploaditem.jsp'/>?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true&modal=true" class="btn btn-sm btn-default thickbox">  
 						<fmt:message key="label.learning.add.new.image" />
 					</a>
 				</c:if>
Index: lams_tool_kaltura/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/pages/monitoring/summary.jsp,v
diff -u -r1.4.2.3 -r1.4.2.4
--- lams_tool_kaltura/web/pages/monitoring/summary.jsp	3 Jun 2016 08:58:43 -0000	1.4.2.3
+++ lams_tool_kaltura/web/pages/monitoring/summary.jsp	11 Nov 2016 15:52:31 -0000	1.4.2.4
@@ -59,7 +59,7 @@
 		<c:forEach var="session" items="${sessionDTOs}">
 			<tr>
 				<td>
-					<a href="<c:url value="/monitoring.do"/>?dispatch=showGroupLearning&toolSessionID=${session.sessionID}&TB_iframe=true&height=630&width=800" class="btn btn-default btn-sm thickbox" title="<fmt:message key='heading.notebookEntry' />">
+					<a href="<c:url value="/monitoring.do"/>?dispatch=showGroupLearning&toolSessionID=${session.sessionID}&TB_iframe=true" class="btn btn-default btn-sm thickbox" title="<fmt:message key='heading.notebookEntry' />">
 						${session.sessionName}
 					</a>
 				</td>
Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/BasicContent.jsp,v
diff -u -r1.50.2.4 -r1.50.2.5
--- lams_tool_lamc/web/authoring/BasicContent.jsp	10 Nov 2016 00:42:01 -0000	1.50.2.4
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	11 Nov 2016 15:52:37 -0000	1.50.2.5
@@ -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 @@
 </div>
   
 <p>
-	<a href="<html:rewrite page="/authoring.do"/>?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"
+	<a href="<html:rewrite page="/authoring.do"/>?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"> 
 		<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.save.question" /> 
 	</a>
Index: lams_tool_lamc/web/authoring/editQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/editQuestionBox.jsp,v
diff -u -r1.18.2.6 -r1.18.2.7
--- lams_tool_lamc/web/authoring/editQuestionBox.jsp	30 Sep 2016 01:04:22 -0000	1.18.2.6
+++ lams_tool_lamc/web/authoring/editQuestionBox.jsp	11 Nov 2016 15:52:37 -0000	1.18.2.7
@@ -149,7 +149,7 @@
 		</script>
 	</lams:head>
 
-<body class="stripes" onload="parent.resizeIframe();">
+<body class="stripes">
 
 	<html:form action="/authoring?validate=false" styleId="newQuestionForm" enctype="multipart/form-data" method="POST">
 
Index: lams_tool_lamc/web/authoring/itemlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/itemlist.jsp,v
diff -u -r1.12.2.2 -r1.12.2.3
--- lams_tool_lamc/web/authoring/itemlist.jsp	10 Nov 2016 00:42:01 -0000	1.12.2.2
+++ lams_tool_lamc/web/authoring/itemlist.jsp	11 Nov 2016 15:52:37 -0000	1.12.2.3
@@ -78,7 +78,7 @@
 
 				<td align="center" style="width:5%">
 					<c:set var="editItemUrl" >
-						<html:rewrite page="/authoring.do"/>?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
+						<html:rewrite page="/authoring.do"/>?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
 					</c:set>
 					<a href="${editItemUrl}" class="thickbox"> 
 						<i class="fa fa-pencil" title="<fmt:message key='label.tip.editQuestion'/>"></i>
Index: lams_tool_lamc/web/authoring/newQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/newQuestionBox.jsp,v
diff -u -r1.18.2.8 -r1.18.2.9
--- lams_tool_lamc/web/authoring/newQuestionBox.jsp	8 Nov 2016 06:22:01 -0000	1.18.2.8
+++ lams_tool_lamc/web/authoring/newQuestionBox.jsp	11 Nov 2016 15:52:37 -0000	1.18.2.9
@@ -145,7 +145,7 @@
 		</script>
 	</lams:head>
 
-<body class="stripes" onload="parent.resizeIframe();">
+<body class="stripes">
 
 	<html:form action="/authoring?validate=false" styleId="newQuestionForm" enctype="multipart/form-data" method="POST">
 		<html:hidden property="dispatch" value="addSingleQuestion" />
Index: lams_tool_lamc/web/common/monitoringheader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/common/Attic/monitoringheader.jsp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_lamc/web/common/monitoringheader.jsp	24 May 2016 13:45:13 -0000	1.1.2.1
+++ lams_tool_lamc/web/common/monitoringheader.jsp	11 Nov 2016 15:52:37 -0000	1.1.2.2
@@ -8,12 +8,10 @@
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
 
 <lams:css/>
-<link href="<lams:LAMSURL/>css/thickbox.css" rel="stylesheet" type="text/css" media="screen">
 
 <!-- ********************  javascript ********************** -->
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/thickbox.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
Index: lams_tool_leader/web/pages/monitoring/headItems.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/web/pages/monitoring/headItems.jsp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_leader/web/pages/monitoring/headItems.jsp	30 May 2016 11:26:41 -0000	1.1.2.1
+++ lams_tool_leader/web/pages/monitoring/headItems.jsp	11 Nov 2016 15:52:27 -0000	1.1.2.2
@@ -18,21 +18,4 @@
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
 <script type="text/javascript" src="${tool}includes/javascript/monitoring.js"></script>
-<script type="text/javascript">
-	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;
-</script>
 
Index: lams_tool_leader/web/pages/monitoring/manageLeaders.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/web/pages/monitoring/manageLeaders.jsp,v
diff -u -r1.2.2.2 -r1.2.2.3
--- lams_tool_leader/web/pages/monitoring/manageLeaders.jsp	30 May 2016 11:26:41 -0000	1.2.2.2
+++ lams_tool_leader/web/pages/monitoring/manageLeaders.jsp	11 Nov 2016 15:52:27 -0000	1.2.2.3
@@ -30,7 +30,7 @@
 		
 	</lams:head>
 	
-	<body class="stripes" onload="parent.resizeIframe();">
+	<body class="stripes">
 
 	<c:set var="title"><fmt:message key="label.plese.select.leaders" /></c:set>
 	<lams:Page type="learner" title="${title}">
Index: lams_tool_leader/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/web/pages/monitoring/summary.jsp,v
diff -u -r1.4.2.1 -r1.4.2.2
--- lams_tool_leader/web/pages/monitoring/summary.jsp	30 May 2016 11:26:41 -0000	1.4.2.1
+++ lams_tool_leader/web/pages/monitoring/summary.jsp	11 Nov 2016 15:52:27 -0000	1.4.2.2
@@ -76,7 +76,7 @@
 </div> 
 </c:if>
 
-<a href="<c:url value='/monitoring.do'/>?dispatch=manageLeaders&sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true&height=400&width=650" class="btn btn-default thickbox" title="<fmt:message key="label.manage.leaders" />">
+<a href="<c:url value='/monitoring.do'/>?dispatch=manageLeaders&sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true" class="btn btn-default thickbox" title="<fmt:message key="label.manage.leaders" />">
 	<fmt:message key="label.manage.leaders" />
 </a>
 
Index: lams_tool_scratchie/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/authoring/basic.jsp,v
diff -u -r1.7.2.2 -r1.7.2.3
--- lams_tool_scratchie/web/pages/authoring/basic.jsp	10 Nov 2016 00:17:24 -0000	1.7.2.2
+++ lams_tool_scratchie/web/pages/authoring/basic.jsp	11 Nov 2016 15:52:42 -0000	1.7.2.3
@@ -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 @@
 	
 	<div>
 		<c:set var="addItemUrl" >
-			<c:url value='/authoring/addItem.do'/>?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true&height=540&width=850&modal=true
+			<c:url value='/authoring/addItem.do'/>?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true&modal=true
 		</c:set>
 		<a href="${addItemUrl}" class="btn btn-default btn-sm thickbox">
 			<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.basic.add.another.scratchie" /> 
Index: lams_tool_scratchie/web/pages/authoring/parts/additem.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/authoring/parts/additem.jsp,v
diff -u -r1.3.4.4 -r1.3.4.5
--- lams_tool_scratchie/web/pages/authoring/parts/additem.jsp	22 Aug 2016 01:04:43 -0000	1.3.4.4
+++ lams_tool_scratchie/web/pages/authoring/parts/additem.jsp	11 Nov 2016 15:52:42 -0000	1.3.4.5
@@ -207,7 +207,7 @@
 		
 	</lams:head>
 	
-	<body class="stripes" onload="parent.resizeIframe();">
+	<body class="stripes">
 	
 	<div class="row no-gutter">
 		<div class="col-xs-12">
Index: lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp,v
diff -u -r1.3.2.3 -r1.3.2.4
--- lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp	10 Nov 2016 00:36:16 -0000	1.3.2.3
+++ lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp	11 Nov 2016 15:52:42 -0000	1.3.2.4
@@ -35,7 +35,7 @@
 					
 					<td align="center" style="width:5%">
 						<c:set var="editItemUrl" >
-							<c:url value='/authoring/editItem.do'/>?sessionMapID=${sessionMapID}&itemIndex=${status.index}&KeepThis=true&TB_iframe=true&height=540&width=850&modal=true
+							<c:url value='/authoring/editItem.do'/>?sessionMapID=${sessionMapID}&itemIndex=${status.index}&KeepThis=true&TB_iframe=true&modal=true
 						</c:set>		
 						<a href="${editItemUrl}" class="thickbox"> 
 							<i class="fa fa-pencil"	title="<fmt:message key='label.edit' />"/></i>
Index: lams_tool_scratchie/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/monitoring/summary.jsp,v
diff -u -r1.14.2.8 -r1.14.2.9
--- lams_tool_scratchie/web/pages/monitoring/summary.jsp	3 Jun 2016 01:33:13 -0000	1.14.2.8
+++ lams_tool_scratchie/web/pages/monitoring/summary.jsp	11 Nov 2016 15:52:42 -0000	1.14.2.9
@@ -178,7 +178,7 @@
 			var itemUid = $(this).val();
 			if (itemUid != -1) {
 				var itemSummaryUrl = '<c:url value="/monitoring/itemSummary.do?sessionMapID=${sessionMapID}"/>';
-				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 = "<c:url value='/monitoring/exportExcel.do'/>?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: '<lams:LAMSURL />',
Index: lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp,v
diff -u -r1.5.2.3 -r1.5.2.4
--- lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp	1 Jun 2016 04:21:36 -0000	1.5.2.3
+++ lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp	11 Nov 2016 15:52:42 -0000	1.5.2.4
@@ -81,7 +81,7 @@
 		
 	</lams:head>
 	
-	<body class="stripes" onload="parent.resizeIframe();">
+	<body class="stripes">
 	
 		<c:set var="title"><fmt:message key="label.monitoring.summary.report.for" >
 					<fmt:param>${fn:escapeXml(item.title)}</fmt:param>