Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r6a20c448cdfdc7895e72dda22c5359be1234cf47 -r89df49e3798026e1900bff5f29d2e6a36446f58c
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6a20c448cdfdc7895e72dda22c5359be1234cf47)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 89df49e3798026e1900bff5f29d2e6a36446f58c)
@@ -226,7 +226,7 @@
 label.authoring.advanced.notify.on.attempt.completion  =Notify teacher after student completes attempt
 event.learner.completes.attempt.subject  =LAMS: Learner completed attempt in Assessment tool
 event.learner.completes.attempt.body  =The learner {0} completed attempt in Assessment tool.\n\nThis message was send automatically, following tool''s advanced settings.
-message.alertContentEdit  =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information.
+message.alertContentEdit  =Note: One of more learners have accessed this activity and it cannot longer be changed.
 warning.msg.authoring.do.you.want.to.delete  =Do you really want to delete this question?
 
 
Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r6a20c448cdfdc7895e72dda22c5359be1234cf47 -r89df49e3798026e1900bff5f29d2e6a36446f58c
--- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 6a20c448cdfdc7895e72dda22c5359be1234cf47)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 89df49e3798026e1900bff5f29d2e6a36446f58c)
@@ -226,7 +226,7 @@
 label.authoring.advanced.notify.on.attempt.completion  =Notify teacher after student completes attempt
 event.learner.completes.attempt.subject  =LAMS: Learner completed attempt in Assessment tool
 event.learner.completes.attempt.body  =The learner {0} completed attempt in Assessment tool.\n\nThis message was send automatically, following tool''s advanced settings.
-message.alertContentEdit  =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information.
+message.alertContentEdit  =Note: One of more learners have accessed this activity and it cannot longer be changed.
 warning.msg.authoring.do.you.want.to.delete  =Do you really want to delete this question?
 
 
Index: lams_tool_assessment/conf/language/rams/ApplicationResources.properties
===================================================================
diff -u -r6a20c448cdfdc7895e72dda22c5359be1234cf47 -r89df49e3798026e1900bff5f29d2e6a36446f58c
--- lams_tool_assessment/conf/language/rams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6a20c448cdfdc7895e72dda22c5359be1234cf47)
+++ lams_tool_assessment/conf/language/rams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 89df49e3798026e1900bff5f29d2e6a36446f58c)
@@ -226,7 +226,7 @@
 label.authoring.advanced.notify.on.attempt.completion  =Notify teacher after student completes attempt
 event.learner.completes.attempt.subject  =LAMS: Learner completed attempt in Assessment tool
 event.learner.completes.attempt.body  =The learner {0} completed attempt in Assessment tool.\n\nThis message was send automatically, following tool''s advanced settings.
-message.alertContentEdit  =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information.
+message.alertContentEdit  =Note: One of more learners have accessed this activity and it cannot longer be changed.
 warning.msg.authoring.do.you.want.to.delete  =Do you really want to delete this question?
 
 
Index: lams_tool_assessment/conf/language/rams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r6a20c448cdfdc7895e72dda22c5359be1234cf47 -r89df49e3798026e1900bff5f29d2e6a36446f58c
--- lams_tool_assessment/conf/language/rams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 6a20c448cdfdc7895e72dda22c5359be1234cf47)
+++ lams_tool_assessment/conf/language/rams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 89df49e3798026e1900bff5f29d2e6a36446f58c)
@@ -226,7 +226,7 @@
 label.authoring.advanced.notify.on.attempt.completion  =Notify teacher after student completes attempt
 event.learner.completes.attempt.subject  =LAMS: Learner completed attempt in Assessment tool
 event.learner.completes.attempt.body  =The learner {0} completed attempt in Assessment tool.\n\nThis message was send automatically, following tool''s advanced settings.
-message.alertContentEdit  =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information.
+message.alertContentEdit  =Note: One of more learners have accessed this activity and it cannot longer be changed.
 warning.msg.authoring.do.you.want.to.delete  =Do you really want to delete this question?
 
 
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
===================================================================
diff -u -r6e6db32c93f144dc842f21601eb37745cdd7ca60 -r89df49e3798026e1900bff5f29d2e6a36446f58c
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6e6db32c93f144dc842f21601eb37745cdd7ca60)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 89df49e3798026e1900bff5f29d2e6a36446f58c)
@@ -416,8 +416,10 @@
 	}
 	
 	// ************************* Handle assessment overall feedbacks *******************
-	TreeSet<AssessmentOverallFeedback> overallFeedbackList = getOverallFeedbacksFromForm(request, true);
-	assessmentPO.setOverallFeedbacks(overallFeedbackList);
+	 if (mode.isAuthor()) {
+	     TreeSet<AssessmentOverallFeedback> overallFeedbackList = getOverallFeedbacksFromForm(request, true);
+	     assessmentPO.setOverallFeedbacks(overallFeedbackList);
+	 }
 
 	// **********************************************
 	// finally persist assessmentPO again
Index: lams_tool_assessment/web/pages/authoring/definelater.jsp
===================================================================
diff -u -rc56857991e269aa7f5bd250a05b52c767a9957ad -r89df49e3798026e1900bff5f29d2e6a36446f58c
--- lams_tool_assessment/web/pages/authoring/definelater.jsp	(.../definelater.jsp)	(revision c56857991e269aa7f5bd250a05b52c767a9957ad)
+++ lams_tool_assessment/web/pages/authoring/definelater.jsp	(.../definelater.jsp)	(revision 89df49e3798026e1900bff5f29d2e6a36446f58c)
@@ -8,17 +8,21 @@
 <%Set tabs = new HashSet();
 			tabs.add("label.authoring.heading.basic");
 			pageContext.setAttribute("tabs", tabs);
-
 			%>
 <lams:html>
 <lams:head>
 	<title><fmt:message key="label.author.title" /></title>
 
 	<%@ include file="/common/tabbedheader.jsp"%>
 	<%@ include file="/common/fckeditorheader.jsp"%>
+	<link rel="stylesheet" type="text/css" href="<html:rewrite page='/includes/css/thickbox.css'/>" />
+	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/jquery-1.2.6.pack.js'/>"></script>
+	<script type="text/javascript"> 
+		var pathToImageFolder = "<html:rewrite page='/includes/images/'/>"; 
+	</script>
+ 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/thickbox.js'/>"></script>
 
 	<script>
-        
         function init(){
             selectTab(1); //select the default tab;
             
@@ -36,13 +40,9 @@
 	    	// end optional tab controller stuff
 	    	selectTab(tabId);
         } 
-        
-       
     </script>
-	<!-- ******************** END FCK Editor related javascript & HTML ********************** -->
-
-
 </lams:head>
+
 <body class="stripes" onLoad="init()">
 <div id="page">
 	<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
Index: lams_tool_assessment/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -rc56857991e269aa7f5bd250a05b52c767a9957ad -r89df49e3798026e1900bff5f29d2e6a36446f58c
--- lams_tool_assessment/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision c56857991e269aa7f5bd250a05b52c767a9957ad)
+++ lams_tool_assessment/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 89df49e3798026e1900bff5f29d2e6a36446f58c)
@@ -29,15 +29,17 @@
 		</td>
 	</tr>
 
-	<tr>
-		<td colspan="2">
-			<c:url  var="authoringUrl" value="/definelater.do">
-				<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
-				<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
-			</c:url>
-			<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="button">
-				<fmt:message key="label.monitoring.edit.activity.edit" />
-			</html:link>
-		</td>
-	</tr>
+	<c:if test="${! sessionMap.isPageEditable}">
+		<tr>
+			<td colspan="2">
+				<c:url  var="authoringUrl" value="/definelater.do">
+					<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
+					<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
+				</c:url>
+				<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="button">
+					<fmt:message key="label.monitoring.edit.activity.edit" />
+				</html:link>
+			</td>
+		</tr>
+	</c:if>	
 </table>