Index: lams_tool_spreadsheet/web/common/header.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/common/header.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_spreadsheet/web/common/header.jsp	4 Jul 2008 07:40:31 -0000	1.1
+++ lams_tool_spreadsheet/web/common/header.jsp	9 Oct 2014 14:52:00 -0000	1.2
@@ -3,15 +3,13 @@
 <c:set var="tool"><lams:WebAppURL/></c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
 
- 	<!-- ********************  CSS ********************** -->
-	<link href="<html:rewrite page='/includes/css/spreadsheet.css'/>" rel="stylesheet" type="text/css">
-	<lams:css />
+<!-- ********************  CSS ********************** -->
+<link href="<html:rewrite page='/includes/css/spreadsheet.css'/>" rel="stylesheet" type="text/css">
+<lams:css />
 
+<!-- ********************  javascript ********************** -->
+<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+<script type="text/javascript" src="<html:rewrite page='/includes/javascript/spreadsheetcommon.js'/>"></script>
+<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
 
- 	<!-- ********************  javascript ********************** -->
-	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
-	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/spreadsheetcommon.js'/>"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
-
 	
Index: lams_tool_spreadsheet/web/common/tabbedheader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/common/tabbedheader.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_spreadsheet/web/common/tabbedheader.jsp	4 Jul 2008 07:40:31 -0000	1.1
+++ lams_tool_spreadsheet/web/common/tabbedheader.jsp	9 Oct 2014 14:52:00 -0000	1.2
@@ -3,15 +3,14 @@
 <c:set var="tool"><lams:WebAppURL/></c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
 
- 	<!-- ********************  CSS ********************** -->
-	<link href="<html:rewrite page='/includes/css/spreadsheet.css'/>" rel="stylesheet" type="text/css">
-	<lams:css style="tabbed"/>
+ <!-- ********************  CSS ********************** -->
+<link href="<html:rewrite page='/includes/css/spreadsheet.css'/>" rel="stylesheet" type="text/css">
+<lams:css style="tabbed"/>
 
+<!-- ********************  javascript ********************** -->
+<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
+<script type="text/javascript" src="<html:rewrite page='/includes/javascript/spreadsheetcommon.js'/>"></script>
+<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
 
- 	<!-- ********************  javascript ********************** -->
-	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
-	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/spreadsheetcommon.js'/>"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
-
 	
Index: lams_tool_spreadsheet/web/includes/javascript/spreadsheetcommon.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/includes/javascript/spreadsheetcommon.js,v
diff -u -r1.1 -r1.2
--- lams_tool_spreadsheet/web/includes/javascript/spreadsheetcommon.js	4 Jul 2008 07:40:26 -0000	1.1
+++ lams_tool_spreadsheet/web/includes/javascript/spreadsheetcommon.js	9 Oct 2014 14:52:00 -0000	1.2
@@ -1,10 +1,10 @@
-	function showBusy(targetDiv){
-		if($(targetDiv+"_Busy") != null){
-			Element.show(targetDiv+"_Busy");
-		}
+function showBusy(targetDiv){
+	if($(targetDiv+"_Busy") != null){
+		Element.show(targetDiv+"_Busy");
 	}
-	function hideBusy(targetDiv){
-		if($(targetDiv+"_Busy") != null){
-			Element.hide(targetDiv+"_Busy");
-		}				
-	}
+}
+function hideBusy(targetDiv){
+	if($(targetDiv+"_Busy") != null){
+		Element.hide(targetDiv+"_Busy");
+	}				
+}
Index: lams_tool_spreadsheet/web/pages/learning/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/learning/definelater.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_spreadsheet/web/pages/learning/definelater.jsp	4 Jul 2008 07:40:28 -0000	1.1
+++ lams_tool_spreadsheet/web/pages/learning/definelater.jsp	9 Oct 2014 14:52:00 -0000	1.2
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@include file="/common/taglibs.jsp"%>
 
Index: lams_tool_spreadsheet/web/pages/learning/finish.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/learning/finish.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_spreadsheet/web/pages/learning/finish.jsp	4 Jul 2008 07:40:28 -0000	1.1
+++ lams_tool_spreadsheet/web/pages/learning/finish.jsp	9 Oct 2014 14:52:00 -0000	1.2
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
-		"http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 <%-- This page just for : redir finish page to parent rather that part of the frame --%>
Index: lams_tool_spreadsheet/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/learning/learning.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_spreadsheet/web/pages/learning/learning.jsp	7 Apr 2014 22:21:53 -0000	1.9
+++ lams_tool_spreadsheet/web/pages/learning/learning.jsp	9 Oct 2014 14:52:00 -0000	1.10
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
@@ -8,6 +7,7 @@
 		<fmt:message key="label.learning.title" />
 	</title>
 	<%@ include file="/common/header.jsp"%>
+	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
 
 	<%-- param has higher level for request attribute --%>
 	<c:if test="${not empty param.sessionMapID}">
Index: lams_tool_spreadsheet/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/learning/notebook.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_spreadsheet/web/pages/learning/notebook.jsp	1 Apr 2014 17:49:23 -0000	1.6
+++ lams_tool_spreadsheet/web/pages/learning/notebook.jsp	9 Oct 2014 14:52:00 -0000	1.7
@@ -1,21 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <%@ include file="/common/taglibs.jsp"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
 
 <lams:html>
 <lams:head>
-	<title><fmt:message key="label.learning.title" />
-	</title>
+	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/header.jsp"%>
 	
 	<script type="text/javascript">
 		function disableFinishButton() {
 			document.getElementById("finishButton").disabled = true;
 		}
-	         function submitForm(methodName){
-	                var f = document.getElementById('messageForm');
-	                f.submit();
-	        }
+		
+		function submitForm(methodName){
+			var f = document.getElementById('messageForm');
+			f.submit();
+		}
 	</script>
 </lams:head>
 <body class="stripes">
Index: lams_tool_spreadsheet/web/pages/learning/start.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/learning/start.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_spreadsheet/web/pages/learning/start.jsp	4 Jul 2008 07:40:28 -0000	1.1
+++ lams_tool_spreadsheet/web/pages/learning/start.jsp	9 Oct 2014 14:52:00 -0000	1.2
@@ -1,7 +1,6 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
-		"http://www.w3.org/TR/html4/loose.dtd">
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <%@ include file="/common/taglibs.jsp"%>
+
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <html>
 	<body class="stripes">
Index: lams_tool_spreadsheet/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_spreadsheet/web/pages/monitoring/monitoring.jsp	17 Jan 2014 22:12:26 -0000	1.3
+++ lams_tool_spreadsheet/web/pages/monitoring/monitoring.jsp	9 Oct 2014 14:52:00 -0000	1.4
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.spreadsheet.SpreadsheetConstants"%>
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.8 -r1.9
--- lams_tool_spreadsheet/web/pages/monitoring/summary.jsp	9 Sep 2014 21:16:19 -0000	1.8
+++ lams_tool_spreadsheet/web/pages/monitoring/summary.jsp	9 Oct 2014 14:52:00 -0000	1.9
@@ -2,23 +2,17 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
 <c:set var="spreadsheet" value="${sessionMap.spreadsheet}"/>
-<c:set var="tool">
-	<lams:WebAppURL />
-</c:set>
+<c:set var="tool"><lams:WebAppURL /></c:set>
 
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/monitorToolSummaryAdvanced.js"></script>
 <script type="text/javascript">
 	function showMessage(url) {
 		var area=document.getElementById("marksInputArea");
 		if(area != null){
-			area.style.width="650px";
+			area.style.width="95%";
 			area.src=url;
 			area.style.display="block";
 		}
-		var elem = document.getElementById("saveCancelButtons");
-		if (elem != null) {
-			elem.style.display="none";
-		}
 		location.hash = "marksInputArea";
 	}
 	function hideMessage(){
@@ -28,10 +22,6 @@
 			area.style.height="0px";
 			area.style.display="none";
 		}
-		var elem = document.getElementById("saveCancelButtons");
-		if (elem != null) {
-			elem.style.display="block";
-		}
 	}
 	
 	function editMark(userUid){
@@ -108,105 +98,12 @@
 <c:if test="${spreadsheet.markingEnabled}">	
 	<p>
 		<iframe
-			onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'"
+			onload="javascript:this.style.height=eval(this.contentWindow.document.body.scrollHeight+220)+'px'"
 			id="marksInputArea" name="marksInputArea"
 			style="width:0px;height:0px;border:0px;display:none" frameborder="no"
 			scrolling="no">
 		</iframe>
 	</p>
 </c:if>
 
-
-
-<h1>
-
-	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
-
-	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'),'<lams:LAMSURL/>');" >
-		<fmt:message key="label.monitoring.summary.advanced.settings"/>
-	</a>
-</h1>
-<br />
-
-<%-- Overall TaskList information  --%>
-<div class="monitoring-advanced" id="advancedDiv" style="display:none">
-	<table class="alternative-color">
-		<tr>
-			<td>
-				<fmt:message key="label.monitoring.summary.lock.when.finished" />
-			</td>
-			
-			<td>
-				<c:choose>
-					<c:when test="${spreadsheet.lockWhenFinished}">
-						<fmt:message key="label.on" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="label.off" />
-					</c:otherwise>
-				</c:choose>	
-			</td>	
-		</tr>
-		
-		<tr>
-			<td>
-				<fmt:message key="label.monitoring.summary.individual.spreadsheets" />
-			</td>
-			
-			<td>
-				<c:choose>
-					<c:when test="${spreadsheet.learnerAllowedToSave}">
-						<fmt:message key="label.on" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="label.off" />
-					</c:otherwise>
-				</c:choose>
-			</td>	
-		</tr>
-		
-		<tr>
-			<td>
-				<fmt:message key="label.monitoring.summary.marking.enabled" />
-			</td>
-			
-			<td>
-				<c:choose>
-					<c:when test="${spreadsheet.markingEnabled}">
-						<fmt:message key="label.on" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="label.off" />
-					</c:otherwise>
-				</c:choose>
-			</td>	
-		</tr>
-		
-		<tr>
-			<td>
-				<fmt:message key="label.monitoring.summary.notebook.reflection" />
-			</td>
-			
-			<td>
-				<c:choose>
-					<c:when test="${spreadsheet.reflectOnActivity}">
-						<fmt:message key="label.on" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="label.off" />
-					</c:otherwise>
-				</c:choose>	
-			</td>	
-		</tr>
-		<c:if test="${spreadsheet.reflectOnActivity}">
-		<tr>
-			<td>
-				<fmt:message key="label.monitoring.summary.notebook.reflection" />
-			</td>
-			<td>
-				<lams:out value="${spreadsheet.reflectInstructions}" escapeHtml="true"/>
-			</td>	
-		</tr>
-		</c:if>		
-	</table>
-</div>
+<%@ include file="parts/advanceoptions.jsp"%>
Index: lams_tool_spreadsheet/web/pages/monitoring/parts/advanceoptions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/monitoring/parts/advanceoptions.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_spreadsheet/web/pages/monitoring/parts/advanceoptions.jsp	9 Oct 2014 14:52:00 -0000	1.1
@@ -0,0 +1,91 @@
+<h1>
+	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
+
+	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'),'<lams:LAMSURL/>');" >
+		<fmt:message key="label.monitoring.summary.advanced.settings"/>
+	</a>
+</h1>
+<br />
+
+<%-- Overall TaskList information  --%>
+<div class="monitoring-advanced" id="advancedDiv" style="display:none">
+	<table class="alternative-color">
+		<tr>
+			<td>
+				<fmt:message key="label.monitoring.summary.lock.when.finished" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${spreadsheet.lockWhenFinished}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>	
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="label.monitoring.summary.individual.spreadsheets" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${spreadsheet.learnerAllowedToSave}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>
+			</td>	
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="label.monitoring.summary.marking.enabled" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${spreadsheet.markingEnabled}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>
+			</td>	
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="label.monitoring.summary.notebook.reflection" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${spreadsheet.reflectOnActivity}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>	
+		</tr>
+		<c:if test="${spreadsheet.reflectOnActivity}">
+		<tr>
+			<td>
+				<fmt:message key="label.monitoring.summary.notebook.reflection" />
+			</td>
+			<td>
+				<lams:out value="${spreadsheet.reflectInstructions}" escapeHtml="true"/>
+			</td>	
+		</tr>
+		</c:if>		
+	</table>
+</div>
Index: lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp	11 Sep 2014 19:35:04 -0000	1.6
+++ lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp	9 Oct 2014 14:52:00 -0000	1.7
@@ -1,11 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
-		"http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <%@ include file="/common/taglibs.jsp"%>
 
 <lams:html>
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
+		
+		<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
 		<script type="text/javascript"> 
 			function callHideMessage() {
 				if (window.parent && window.parent.hideMessage) {
@@ -14,6 +15,16 @@
 					window.top.hideMessage();
 				}
 			}
+			
+			$(function() {
+				//change size of an iframe on ckeditor's autogrow 
+				CKEDITOR.instances.comments.on("instanceReady", function(e) {
+				    e.editor.on('resize',function(reEvent){
+				    	var iframe = window.parent.document.getElementById("marksInputArea");
+				    	iframe.style.height=eval(iframe.contentWindow.document.body.scrollHeight)+'px';
+				    });
+				});
+			});
 		</script>
 	</lams:head>
 	<body class="tabpart">
@@ -53,7 +64,7 @@
 			<a href="#" onclick="markForm.submit();" class="button space-left">
 				<fmt:message key="label.monitoring.summary.marking.update.marks" /> 
 			</a>
-			<a href="javascript:;" onclick="javascript:callHideMessage" class="button space-left">
+			<a href="javascript:;" onclick="javascript:callHideMessage()" class="button space-left">
 				<fmt:message key="label.cancel" /> 
 			</a>
 		</lams:ImgButtonWrapper>
Index: lams_tool_spreadsheet/web/pages/reviewitem/reviewitem.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/reviewitem/reviewitem.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_spreadsheet/web/pages/reviewitem/reviewitem.jsp	23 Jul 2008 04:19:15 -0000	1.2
+++ lams_tool_spreadsheet/web/pages/reviewitem/reviewitem.jsp	9 Oct 2014 14:52:00 -0000	1.3
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>