Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java,v
diff -u -r1.33 -r1.34
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	17 Nov 2006 02:06:36 -0000	1.33
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	6 May 2008 04:51:54 -0000	1.34
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java,v
diff -u -r1.31 -r1.32
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	7 Feb 2007 02:42:34 -0000	1.31
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	6 May 2008 04:51:54 -0000	1.32
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/learning.jsp,v
diff -u -r1.41 -r1.42
--- lams_tool_larsrc/web/pages/learning/learning.jsp	29 Apr 2008 07:56:12 -0000	1.41
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	6 May 2008 04:51:54 -0000	1.42
@@ -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">