Index: lams_tool_eadventure/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/pages/authoring/basic.jsp,v
diff -u -r1.4 -r1.4.2.1
--- lams_tool_eadventure/web/pages/authoring/basic.jsp	14 Dec 2011 07:13:11 -0000	1.4
+++ lams_tool_eadventure/web/pages/authoring/basic.jsp	12 Sep 2014 21:20:35 -0000	1.4.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/pages/learning/learning.jsp,v
diff -u -r1.6 -r1.6.2.1
--- lams_tool_eadventure/web/pages/learning/learning.jsp	27 Mar 2014 14:34:08 -0000	1.6
+++ lams_tool_eadventure/web/pages/learning/learning.jsp	12 Sep 2014 21:20:35 -0000	1.6.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/basic.jsp,v
diff -u -r1.37.2.1 -r1.37.2.2
--- lams_tool_forum/web/jsps/authoring/basic.jsp	3 Sep 2014 12:52:08 -0000	1.37.2.1
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	12 Sep 2014 21:20:29 -0000	1.37.2.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/includes/javascript/imageGalleryitem.js,v
diff -u -r1.4 -r1.4.2.1
--- lams_tool_images/web/includes/javascript/imageGalleryitem.js	26 Jul 2013 13:17:16 -0000	1.4
+++ lams_tool_images/web/includes/javascript/imageGalleryitem.js	12 Sep 2014 21:20:31 -0000	1.4.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/authoring/basic.jsp,v
diff -u -r1.11 -r1.11.2.1
--- lams_tool_images/web/pages/authoring/basic.jsp	17 Dec 2012 14:47:25 -0000	1.11
+++ lams_tool_images/web/pages/authoring/basic.jsp	12 Sep 2014 21:20:31 -0000	1.11.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/BasicContent.jsp,v
diff -u -r1.42 -r1.42.2.1
--- lams_tool_laqa/web/authoring/BasicContent.jsp	3 Jun 2014 16:22:21 -0000	1.42
+++ lams_tool_laqa/web/authoring/BasicContent.jsp	12 Sep 2014 21:20:36 -0000	1.42.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/basic.jsp,v
diff -u -r1.28 -r1.28.2.1
--- lams_tool_larsrc/web/pages/authoring/basic.jsp	28 Nov 2013 18:39:48 -0000	1.28
+++ lams_tool_larsrc/web/pages/authoring/basic.jsp	12 Sep 2014 21:20:41 -0000	1.28.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/learning.jsp,v
diff -u -r1.53 -r1.53.2.1
--- lams_tool_larsrc/web/pages/learning/learning.jsp	2 Jun 2014 10:27:11 -0000	1.53
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	12 Sep 2014 21:20:41 -0000	1.53.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/authoring/basic.jsp,v
diff -u -r1.9 -r1.9.2.1
--- lams_tool_scribe/web/pages/authoring/basic.jsp	6 Aug 2012 16:32:45 -0000	1.9
+++ lams_tool_scribe/web/pages/authoring/basic.jsp	12 Sep 2014 21:20:42 -0000	1.9.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/monitoring/summary.jsp,v
diff -u -r1.7 -r1.7.2.1
--- lams_tool_spreadsheet/web/pages/monitoring/summary.jsp	1 Apr 2014 17:49:23 -0000	1.7
+++ lams_tool_spreadsheet/web/pages/monitoring/summary.jsp	12 Sep 2014 21:20:32 -0000	1.7.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/authoring/basic.jsp,v
diff -u -r1.14 -r1.14.2.1
--- lams_tool_survey/web/pages/authoring/basic.jsp	28 Feb 2012 08:33:40 -0000	1.14
+++ lams_tool_survey/web/pages/authoring/basic.jsp	12 Sep 2014 21:20:39 -0000	1.14.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/authoring/basic.jsp,v
diff -u -r1.6 -r1.6.2.1
--- lams_tool_task/web/pages/authoring/basic.jsp	4 Jan 2012 16:36:31 -0000	1.6
+++ lams_tool_task/web/pages/authoring/basic.jsp	12 Sep 2014 21:20:43 -0000	1.6.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/learning/learning.jsp,v
diff -u -r1.25 -r1.25.2.1
--- lams_tool_task/web/pages/learning/learning.jsp	3 Apr 2014 18:41:34 -0000	1.25
+++ lams_tool_task/web/pages/learning/learning.jsp	12 Sep 2014 21:20:43 -0000	1.25.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/BasicContent.jsp,v
diff -u -r1.51 -r1.51.2.1
--- lams_tool_vote/web/authoring/BasicContent.jsp	26 May 2014 22:44:39 -0000	1.51
+++ lams_tool_vote/web/authoring/BasicContent.jsp	12 Sep 2014 21:20:38 -0000	1.51.2.1
@@ -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";
 		}