Index: lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.15 -r1.16
--- lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	3 May 2013 16:12:19 -0000	1.15
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	8 Aug 2013 12:17:05 -0000	1.16
@@ -59,7 +59,7 @@
 page.title.monitoring.view.reflection  =View Notebook Entries
 button.close  =Close
 message.no.reflection.available  =No notebook available
-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 or more learners have accessed this activity and it cannot longer be modified.
 monitoring.label.attachments  =Attachments
 label.on  =On
 label.off  =Off
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20130808.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20130808.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20130808.sql	8 Aug 2013 12:09:49 -0000	1.1
@@ -0,0 +1,13 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+----------------------Put all sql statements below here-------------------------
+
+-- LKC-15 adding a constraint to the scratchie user table so no same user_id and session_id can be repetead 
+ALTER TABLE tl_lascrt11_user ADD UNIQUE INDEX(user_id, session_uid);
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
\ No newline at end of file
Index: lams_tool_scratchie/web/pages/monitoring/editactivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/monitoring/editactivity.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_scratchie/web/pages/monitoring/editactivity.jsp	19 Jul 2012 19:20:10 -0000	1.1
+++ lams_tool_scratchie/web/pages/monitoring/editactivity.jsp	8 Aug 2013 12:09:49 -0000	1.2
@@ -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>