Index: lams_tool_eadventure/web/pages/authoring/basic.jsp
===================================================================
diff -u -r2373c8f900d13fe819e24ad5ba34a30cbdc1fd8d -r0e1a123434691d9876f2c7a50c0f18fef94647be
--- lams_tool_eadventure/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 2373c8f900d13fe819e24ad5ba34a30cbdc1fd8d)
+++ lams_tool_eadventure/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 0e1a123434691d9876f2c7a50c0f18fef94647be)
@@ -20,7 +20,6 @@
 		var area=document.getElementById("reourceInputArea");
 		if(area != null){
 			area.style.width="650px";
-			area.style.height="100%";
 			area.src=url;
 			area.style.display="block";
 		}
Index: lams_tool_eadventure/web/pages/learning/learning.jsp
===================================================================
diff -u -rba4176816ca6a61a42916ca1632bde6ce75c1d51 -r0e1a123434691d9876f2c7a50c0f18fef94647be
--- lams_tool_eadventure/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision ba4176816ca6a61a42916ca1632bde6ce75c1d51)
+++ lams_tool_eadventure/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 0e1a123434691d9876f2c7a50c0f18fef94647be)
@@ -58,7 +58,6 @@
 			var area=document.getElementById("reourceInputArea");
 			if(area != null){
 				area.style.width="100%";
-				area.style.height="100%";
 				area.src=url;
 				area.style.display="block";
 			}
Index: lams_tool_forum/web/jsps/authoring/basic.jsp
===================================================================
diff -u -r1221ef505c31384495e181ad07f2d7992c5d18be -r0e1a123434691d9876f2c7a50c0f18fef94647be
--- lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision 1221ef505c31384495e181ad07f2d7992c5d18be)
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision 0e1a123434691d9876f2c7a50c0f18fef94647be)
@@ -12,7 +12,6 @@
 		var area=document.getElementById("messageArea");
 		if(area != null){
 			area.style.width="100%";
-			area.style.height="100%";
 			area.src=url;
 			area.style.display="block";
 		}
Index: lams_tool_images/web/includes/javascript/imageGalleryitem.js
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -r0e1a123434691d9876f2c7a50c0f18fef94647be
--- lams_tool_images/web/includes/javascript/imageGalleryitem.js	(.../imageGalleryitem.js)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_images/web/includes/javascript/imageGalleryitem.js	(.../imageGalleryitem.js)	(revision 0e1a123434691d9876f2c7a50c0f18fef94647be)
@@ -52,7 +52,6 @@
 		
 		if(area != null){
 			area.style.width="650px";
-			area.style.height="100%";
 			area.src=url;
 			area.style.display="block";
 		}
Index: lams_tool_images/web/pages/authoring/basic.jsp
===================================================================
diff -u -rc512a019239e9d3f001e8fa7bebc4bbf7d5f379e -r0e1a123434691d9876f2c7a50c0f18fef94647be
--- lams_tool_images/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision c512a019239e9d3f001e8fa7bebc4bbf7d5f379e)
+++ lams_tool_images/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 0e1a123434691d9876f2c7a50c0f18fef94647be)
@@ -17,7 +17,6 @@
 		var area=document.getElementById("reourceInputArea");
 		if(area != null){
 			area.style.width="100%";
-			area.style.height="100%";
 			area.src=url;
 			area.style.display="block";
 		}
Index: lams_tool_laqa/web/authoring/BasicContent.jsp
===================================================================
diff -u -ra7661f206a3f21114f1c05f9a29f56e20f5e35f0 -r0e1a123434691d9876f2c7a50c0f18fef94647be
--- lams_tool_laqa/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision a7661f206a3f21114f1c05f9a29f56e20f5e35f0)
+++ lams_tool_laqa/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 0e1a123434691d9876f2c7a50c0f18fef94647be)
@@ -9,7 +9,6 @@
 		var area=document.getElementById("messageArea");
 		if(area != null){
 			area.style.width="95%";
-			area.style.height="100%";
 			area.src=url;
 			area.style.display="block";
 		}
@@ -90,7 +89,7 @@
 </p>
 
 <p>
-	<iframe onload="javascript:this.style.height=eval(this.contentWindow.document.body.scrollHeight+300)+'px';"
+	<iframe onload="javascript:this.style.height=eval(this.contentWindow.document.body.scrollHeight+220)+'px';"
 		id="messageArea" name="messageArea"
 		style="width:0px;height:0px;border:0px;display:none" frameborder="no"
 		scrolling="no">
Index: lams_tool_larsrc/web/pages/authoring/basic.jsp
===================================================================
diff -u -re9e2a6b00397afa86d303bfbc6ca3649744a982e -r0e1a123434691d9876f2c7a50c0f18fef94647be
--- lams_tool_larsrc/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision e9e2a6b00397afa86d303bfbc6ca3649744a982e)
+++ lams_tool_larsrc/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 0e1a123434691d9876f2c7a50c0f18fef94647be)
@@ -13,7 +13,6 @@
 		var area=document.getElementById("reourceInputArea");
 		if(area != null){
 			area.style.width="90%";
-			area.style.height="100%";
 			area.src=url;
 			area.style.display="block";
 		}
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -rc325b5f32102c66679ed0d7827c89bcc7671895d -r0e1a123434691d9876f2c7a50c0f18fef94647be
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision c325b5f32102c66679ed0d7827c89bcc7671895d)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 0e1a123434691d9876f2c7a50c0f18fef94647be)
@@ -22,8 +22,8 @@
 	<c:set var="resource" value="${sessionMap.resource}" />
 	<c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 
+<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript">
-	<!--
 		function gotoURL(){
  		    var reqIDVar = new Date();
 			var gurl = "<c:url value="/learning/addurl.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&reqID="+reqIDVar.getTime();
@@ -60,12 +60,10 @@
 			var area=document.getElementById("reourceInputArea");
 			if(area != null){
 				area.style.width="100%";
-				area.style.height="100%";
 				area.src=url;
 				area.style.display="block";
 			}
 		}
-	-->        
     </script>
 </lams:head>
 <body class="stripes">
@@ -178,37 +176,29 @@
 				</div>
 
 				<iframe
-					onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'"
+					onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px';"
 					id="reourceInputArea" name="reourceInputArea"
 					style="width: 0px; height: 0px; border: 0px; display: none"
 					frameborder="no" scrolling="no">
 				</iframe>
 
-
-
 			</c:if>
 
 			<c:choose>
 				<c:when test="${resource.allowAddFiles && resource.allowAddUrls}">
 					<script type="text/javascript">
-					<!--
 						showMessage("<c:url value='/learning/addurl.do'/>?sessionMapID=${sessionMapID}&mode=${mode}");
-					-->
-				</script>
+					</script>
 				</c:when>
 				<c:when test="${resource.allowAddFiles && !resource.allowAddUrls}">
 					<script type="text/javascript">
-					<!--
 						showMessage("<c:url value='/learning/addfile.do'/>?sessionMapID=${sessionMapID}&mode=${mode}");
-					-->
-				</script>
+					</script>
 				</c:when>
 				<c:when test="${!resource.allowAddFiles && resource.allowAddUrls}">
 					<script type="text/javascript">
-					<!--
 						showMessage("<c:url value='/learning/addurl.do'/>?sessionMapID=${sessionMapID}&mode=${mode}");
-					-->
-				</script>
+					</script>
 				</c:when>
 			</c:choose>
 			<%-- end mode != teacher --%>
Index: lams_tool_scribe/web/pages/authoring/basic.jsp
===================================================================
diff -u -r8bb091dd08d8aaab7b82b39a4d65a2f6ef0603ba -r0e1a123434691d9876f2c7a50c0f18fef94647be
--- lams_tool_scribe/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 8bb091dd08d8aaab7b82b39a4d65a2f6ef0603ba)
+++ lams_tool_scribe/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 0e1a123434691d9876f2c7a50c0f18fef94647be)
@@ -9,7 +9,6 @@
 		var area=document.getElementById("iframeArea");
 		if(area != null){
 			area.style.width="685px";
-			area.style.height="100%";
 			area.src=url;
 			area.style.display="block";
 		}
Index: lams_tool_spreadsheet/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rd21e7fac21ab19cb876cdf2673297d3204614828 -r0e1a123434691d9876f2c7a50c0f18fef94647be
--- lams_tool_spreadsheet/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision d21e7fac21ab19cb876cdf2673297d3204614828)
+++ lams_tool_spreadsheet/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 0e1a123434691d9876f2c7a50c0f18fef94647be)
@@ -12,7 +12,6 @@
 		var area=document.getElementById("marksInputArea");
 		if(area != null){
 			area.style.width="650px";
-			area.style.height="100%";
 			area.src=url;
 			area.style.display="block";
 		}
Index: lams_tool_survey/web/pages/authoring/basic.jsp
===================================================================
diff -u -r1aea223e6eb2cd1d28e948bcb8f2a7f104337b1c -r0e1a123434691d9876f2c7a50c0f18fef94647be
--- lams_tool_survey/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 1aea223e6eb2cd1d28e948bcb8f2a7f104337b1c)
+++ lams_tool_survey/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 0e1a123434691d9876f2c7a50c0f18fef94647be)
@@ -12,7 +12,6 @@
 		var area=document.getElementById("questionInputArea");
 		if(area != null){
 			area.style.width="100%";
-			area.style.height="100%";
 			area.src=url;
 			area.style.display="block";
 		}
Index: lams_tool_task/web/pages/authoring/basic.jsp
===================================================================
diff -u -r2586085d75bd13fe199f3144393a87586541c316 -r0e1a123434691d9876f2c7a50c0f18fef94647be
--- lams_tool_task/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 2586085d75bd13fe199f3144393a87586541c316)
+++ lams_tool_task/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 0e1a123434691d9876f2c7a50c0f18fef94647be)
@@ -11,7 +11,6 @@
 		var area=document.getElementById("resourceInputArea");
 		if(area != null){
 			area.style.width="100%";
-			area.style.height="100%";
 			area.src=url;
 			area.style.display="block";
 		}
Index: lams_tool_task/web/pages/learning/learning.jsp
===================================================================
diff -u -r84752e547fb7862d2b61e477e336e1d6bd0f5743 -r0e1a123434691d9876f2c7a50c0f18fef94647be
--- lams_tool_task/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 84752e547fb7862d2b61e477e336e1d6bd0f5743)
+++ lams_tool_task/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 0e1a123434691d9876f2c7a50c0f18fef94647be)
@@ -47,7 +47,6 @@
 			var area=document.getElementById("reourceInputArea");
 			if(area != null){
 				area.style.width="100%";
-				area.style.height="100%";
 				area.src=url;
 				area.style.display="block";
 			}
Index: lams_tool_vote/web/authoring/BasicContent.jsp
===================================================================
diff -u -r5b17b810b5302c90b2daf6a5866bf4f6e85bef6a -r0e1a123434691d9876f2c7a50c0f18fef94647be
--- lams_tool_vote/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 5b17b810b5302c90b2daf6a5866bf4f6e85bef6a)
+++ lams_tool_vote/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 0e1a123434691d9876f2c7a50c0f18fef94647be)
@@ -16,7 +16,6 @@
 		var area=document.getElementById("messageArea");
 		if(area != null){
 			area.style.width="100%";
-			area.style.height="100%";
 			area.src=url;
 			area.style.display="block";
 		}