Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
===================================================================
diff -u -r1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad -r3524420d916bd66f3bef886e39cf1e31d02f6f1c
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision 1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision 3524420d916bd66f3bef886e39cf1e31d02f6f1c)
@@ -72,6 +72,7 @@
 	public static final String ATTR_USER_LIST = "userList";
 	public static final String ATTR_RESOURCE_INSTRUCTION = "instructions";
 	public static final String ATTR_FINISH_LOCK = "finishedLock";
+	public static final String ATTR_LOCK_ON_FINISH = "lockOnFinish";
 	public static final String ATTR_SESSION_MAP_ID = "sessionMapID";
 	public static final String ATTR_RESOURCE_FORM = "resourceForm";
 	public static final String ATTR_ADD_RESOURCE_TYPE = "addType";
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
===================================================================
diff -u -re7d362ffe67c9125bceb715a6abfafb9c31df502 -r3524420d916bd66f3bef886e39cf1e31d02f6f1c
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	(.../LearningAction.java)	(revision e7d362ffe67c9125bceb715a6abfafb9c31df502)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	(.../LearningAction.java)	(revision 3524420d916bd66f3bef886e39cf1e31d02f6f1c)
@@ -201,7 +201,8 @@
 		//basic information
 		sessionMap.put(ResourceConstants.ATTR_TITLE,resource.getTitle());
 		sessionMap.put(ResourceConstants.ATTR_RESOURCE_INSTRUCTION,resource.getInstructions());
-		sessionMap.put(ResourceConstants.ATTR_FINISH_LOCK,lock);
+		sessionMap.put(ResourceConstants.ATTR_FINISH_LOCK, lock);
+		sessionMap.put(ResourceConstants.ATTR_LOCK_ON_FINISH, resource.getLockWhenFinished());
 		sessionMap.put(ResourceConstants.ATTR_USER_FINISHED, resourceUser !=null && resourceUser.isSessionFinished());
 		
 		sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID,sessionId);
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -r4b07d53667104eccf102ed70e3d9cae32612aa3e -r3524420d916bd66f3bef886e39cf1e31d02f6f1c
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 4b07d53667104eccf102ed70e3d9cae32612aa3e)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 3524420d916bd66f3bef886e39cf1e31d02f6f1c)
@@ -76,6 +76,19 @@
 			${resource.instructions}
 		</p>
 
+		<c:if test="${sessionMap.lockOnFinish and mode != 'teacher'}">
+				<div class="info">
+					<c:choose>
+						<c:when test="${sessionMap.userFinished}">
+							<fmt:message key="message.activityLocked" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="message.warnLockOnFinish" />
+						</c:otherwise>
+					</c:choose>
+				</div>
+		</c:if>
+
 		<%@ include file="/common/messages.jsp"%>
 
 		<table cellspacing="0" class="alternative-color">