Index: lams_build/lib/lams/lams-learning.jar
===================================================================
diff -u -re64a90c0cc74118c5b88f5cbae323065abd59cac -r8aded0b18a5a7712622ae56f38923fa297449977
Binary files differ
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r84151d175a3fce3cd3ff1bd4eeccfd7cbef01802 -r8aded0b18a5a7712622ae56f38923fa297449977
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java
===================================================================
diff -u -r0deb16204d87ee066914a10b3b545cf25eb4d714 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java	(.../AttributeNames.java)	(revision 0deb16204d87ee066914a10b3b545cf25eb4d714)
+++ lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java	(.../AttributeNames.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -82,6 +82,7 @@
     public static final String ATTR_USERNAME = "username";
     public static final String ATTR_UPDATE_PROGRESS_BAR = "updateProgressBar";
     public static final String ATTR_SESSION_STATUS = "sessionStatus";
+    public static final String ATTR_ACTIVITY_POSITION = "activityPosition";
 
     // for Pedagogical Planner
     public static final String PARAM_COMMAND = "command";
Index: lams_learning/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r24263c32a1bb612e4debfe4f7ffacfe83613e9b6 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_learning/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 24263c32a1bb612e4debfe4f7ffacfe83613e9b6)
+++ lams_learning/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -18,6 +18,7 @@
 exit.message  =You can resume this lesson using the Resume button.
 label.next.button  =Next
 label.finish.button  =Next Activity
+label.submit.button =Submit
 message.activity.parallel.partialComplete  =You have to complete the other task before progressing to the next activity....
 message.activity.parallel.noFrames  =Your browser does not handle frames!
 message.activity.options.noActivitySelected  =Please select an activity from the list
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
===================================================================
diff -u -r61e7bbf20d65e2ecb5e50f3154e52264003defa1 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java	(.../ILearnerService.java)	(revision 61e7bbf20d65e2ecb5e50f3154e52264003defa1)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java	(.../ILearnerService.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -24,6 +24,7 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.learning.service;
 
+import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
 import org.lamsfoundation.lams.tool.ToolOutput;
 
 /**
@@ -37,15 +38,19 @@
      * 
      * Do not change learnerId to Integer (to match the other calls) as all the tools expect this to be a Long.
      * 
-     * @param toolSessionId,
-     *                session ID for completed tool
+     * @param toolSessionId
+     *            , session ID for completed tool
      * @param learnerId
-     *                the learner who is completing the tool session.
+     *            the learner who is completing the tool session.
      * @return the URL for the next activity
      * @throws LearnerServiceException
-     *                 in case of problems.
+     *             in case of problems.
      */
     public String completeToolSession(Long toolSessionId, Long learnerId);
 
     ToolOutput getToolInput(Long requestingToolContentId, Integer assigmentId, Integer learnerId);
+
+    ActivityPositionDTO getActivityPosition(Long activityId);
+
+    ActivityPositionDTO getActivityPositionByToolSessionId(Long toolSessionId);
 }
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
diff -u -r17fe00b00c069ea52b82dc63fd826de3381c7cd0 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision 17fe00b00c069ea52b82dc63fd826de3381c7cd0)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -41,8 +41,10 @@
 import org.lamsfoundation.lams.learning.progress.ProgressBuilder;
 import org.lamsfoundation.lams.learning.progress.ProgressEngine;
 import org.lamsfoundation.lams.learning.progress.ProgressException;
+import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
 import org.lamsfoundation.lams.learning.web.bean.GateActivityDTO;
 import org.lamsfoundation.lams.learning.web.util.ActivityMapping;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.ActivityEvaluation;
 import org.lamsfoundation.lams.learningdesign.BranchActivityEntry;
@@ -57,9 +59,11 @@
 import org.lamsfoundation.lams.learningdesign.GroupingActivity;
 import org.lamsfoundation.lams.learningdesign.LearnerChoiceGrouper;
 import org.lamsfoundation.lams.learningdesign.LearnerChoiceGrouping;
+import org.lamsfoundation.lams.learningdesign.OptionsActivity;
 import org.lamsfoundation.lams.learningdesign.SequenceActivity;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
 import org.lamsfoundation.lams.learningdesign.ToolBranchingActivity;
+import org.lamsfoundation.lams.learningdesign.Transition;
 import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO;
 import org.lamsfoundation.lams.learningdesign.dao.IDataFlowDAO;
 import org.lamsfoundation.lams.learningdesign.dao.IGroupUserDAO;
@@ -138,29 +142,30 @@
 	this.messageService = messageService;
     }
 
+    @Override
     public MessageService getMessageService() {
 	return messageService;
     }
 
     /**
      * @param lessonDAO
-     *                The lessonDAO to set.
+     *            The lessonDAO to set.
      */
     public void setLessonDAO(ILessonDAO lessonDAO) {
 	this.lessonDAO = lessonDAO;
     }
 
     /**
      * @param learnerProgressDAO
-     *                The learnerProgressDAO to set.
+     *            The learnerProgressDAO to set.
      */
     public void setLearnerProgressDAO(ILearnerProgressDAO learnerProgressDAO) {
 	this.learnerProgressDAO = learnerProgressDAO;
     }
 
     /**
      * @param lamsToolService
-     *                The lamsToolService to set.
+     *            The lamsToolService to set.
      */
     public void setLamsCoreToolService(ILamsCoreToolService lamsToolService) {
 	lamsCoreToolService = lamsToolService;
@@ -172,20 +177,20 @@
 
     /**
      * @param activityDAO
-     *                The activityDAO to set.
+     *            The activityDAO to set.
      */
     public void setActivityDAO(IActivityDAO activityDAO) {
 	this.activityDAO = activityDAO;
     }
 
     /**
      * @param groupingDAO
-     *                The groupingDAO to set.
+     *            The groupingDAO to set.
      */
     public void setGroupingDAO(IGroupingDAO groupingDAO) {
 	this.groupingDAO = groupingDAO;
     }
-    
+
     /**
      * @return the groupUserDAO
      */
@@ -195,7 +200,7 @@
 
     /**
      * @param groupUserDAO
-     *                groupUserDAO
+     *            groupUserDAO
      */
     public void setGroupUserDAO(IGroupUserDAO groupUserDAO) {
 	this.groupUserDAO = groupUserDAO;
@@ -204,13 +209,14 @@
     /**
      * @return the User Management Service
      */
+    @Override
     public IUserManagementService getUserManagementService() {
 	return userManagementService;
     }
 
     /**
      * @param userService
-     *                User Management Service
+     *            User Management Service
      */
     public void setUserManagementService(IUserManagementService userService) {
 	userManagementService = userService;
@@ -219,10 +225,10 @@
     public void setLessonService(ILessonService lessonService) {
 	this.lessonService = lessonService;
     }
-    
+
     public void setLogEventService(ILogEventService logEventService) {
 	this.logEventService = logEventService;
-    }  
+    }
 
     // ---------------------------------------------------------------------
     // Service Methods
@@ -232,6 +238,7 @@
      * 
      * @see org.lamsfoundation.lams.learning.service.ICoreLearnerService#getActiveLessonsFor(org.lamsfoundation.lams.usermanagement.User)
      */
+    @Override
     public LessonDTO[] getActiveLessonsFor(Integer learnerId) {
 	User learner = (User) userManagementService.findById(User.class, learnerId);
 	List<Lesson> activeLessons = lessonDAO.getActiveLessonsForLearner(learner);
@@ -245,13 +252,15 @@
 	return getLessonDataFor(activeLessons);
     }
 
+    @Override
     public Lesson getLesson(Long lessonId) {
 	return lessonDAO.getLesson(lessonId);
     }
 
     /**
      * Get the lesson data for a particular lesson. In a DTO format suitable for sending to the client.
      */
+    @Override
     public LessonDTO getLessonData(Long lessonId) {
 	Lesson lesson = getLesson(lessonId);
 	return lesson != null ? lesson.getLessonData() : null;
@@ -270,23 +279,25 @@
      * <p>
      * In terms of an started lesson, the learner progress will be returned without calculation. Tool session will be
      * initialized if necessary. Note that we won't initialize tool session for current activity because we assume tool
-     * session will always initialize before it becomes a current activity.</p
+     * session will always initialize before it becomes a current activity.
+     * </p
      * 
      * 
      * @param learnerId
-     *                the Learner's userID
+     *            the Learner's userID
      * @param lessionID
-     *                identifies the Lesson to start
+     *            identifies the Lesson to start
      * @throws LamsToolServiceException
      * @throws LearnerServiceException
-     *                 in case of problems.
+     *             in case of problems.
      */
+    @Override
     public synchronized LearnerProgress joinLesson(Integer learnerId, Long lessonID) {
 	User learner = (User) userManagementService.findById(User.class, learnerId);
 
 	Lesson lesson = getLesson(lessonID);
 
-	if (lesson == null || !lesson.isLessonStarted()) {
+	if ((lesson == null) || !lesson.isLessonStarted()) {
 	    LearnerService.log.error("joinLesson: Learner " + learner.getLogin() + " joining lesson " + lesson
 		    + " but lesson has not started");
 	    throw new LearnerServiceException("Cannot join lesson as lesson has not started");
@@ -310,7 +321,7 @@
 	    // Use TimeStamp rather than Date directly to keep consistent with Hibnerate persiste object.
 	    learnerProgress.setStartDate(new Timestamp(new Date().getTime()));
 	    learnerProgressDAO.saveLearnerProgress(learnerProgress);
-	    
+
 	    // check if lesson is set to be finished for individual users then store finish date
 	    if (lesson.isScheduledToCloseForIndividuals()) {
 		GroupUser groupUser = groupUserDAO.getGroupUser(lesson, learnerId);
@@ -359,12 +370,13 @@
      * exist, we create a new tool session instance.
      * 
      * @param learnerProgress
-     *                the learner progress we are processing.
+     *            the learner progress we are processing.
      * @throws LamsToolServiceException
      */
+    @Override
     public void createToolSessionsIfNecessary(Activity activity, LearnerProgress learnerProgress) {
 	try {
-	    if (activity != null && activity.isToolActivity()) {
+	    if ((activity != null) && activity.isToolActivity()) {
 		ToolActivity toolActivity = (ToolActivity) activity;
 		createToolSessionFor(toolActivity, learnerProgress.getUser(), learnerProgress.getLesson());
 	    }
@@ -381,20 +393,22 @@
      * Returns the current progress data of the User.
      * 
      * @param learnerId
-     *                the Learner's userID
+     *            the Learner's userID
      * @param lessonId
-     *                the Lesson to get progress from.
+     *            the Lesson to get progress from.
      * @return LearnerProgess contains the learner's progress for the lesson.
      * @throws LearnerServiceException
-     *                 in case of problems.
+     *             in case of problems.
      */
+    @Override
     public LearnerProgress getProgress(Integer learnerId, Long lessonId) {
 	return learnerProgressDAO.getLearnerProgressByLearner(learnerId, lessonId);
     }
 
     /**
      * @see org.lamsfoundation.lams.learning.service.ICoreLearnerService#getProgressById(java.lang.Long)
      */
+    @Override
     public LearnerProgress getProgressById(Long progressId) {
 	return learnerProgressDAO.getLearnerProgress(progressId);
     }
@@ -403,19 +417,21 @@
      * @see org.lamsfoundation.lams.learning.service.ICoreLearnerService#getProgressDTOByLessonId(java.lang.Long,
      *      org.lamsfoundation.lams.usermanagement.User)
      */
+    @Override
     public LearnerProgressDTO getProgressDTOByLessonId(Long lessonId, Integer learnerId) {
-    	LearnerProgress progress = learnerProgressDAO.getLearnerProgressByLearner(learnerId, lessonId);
-    	if (progress != null) {
-    		return progress.getLearnerProgressData();
-    	} else {
-    		return null;
-    	}
+	LearnerProgress progress = learnerProgressDAO.getLearnerProgressByLearner(learnerId, lessonId);
+	if (progress != null) {
+	    return progress.getLearnerProgressData();
+	} else {
+	    return null;
+	}
     }
 
     /**
      * @see org.lamsfoundation.lams.learning.service.ICoreLearnerService#getStructuredProgressDTOs(java.lang.Long,
      *      java.lang.Long)
      */
+    @Override
     public Object[] getStructuredActivityURLs(Integer learnerId, Long lessonId) {
 
 	LearnerProgress progress = learnerProgressDAO.getLearnerProgressByLearner(learnerId, lessonId);
@@ -429,14 +445,15 @@
 
 	retValue[1] = progress.getCurrentActivity() != null ? progress.getCurrentActivity().getActivityId() : null;
 	retValue[2] = lesson.isPreviewLesson();
-	
+
 	return retValue;
     }
 
     /**
      * @see org.lamsfoundation.lams.learning.service.ICoreLearnerService#chooseActivity(org.lamsfoundation.lams.usermanagement.User,
      *      java.lang.Long, org.lamsfoundation.lams.learningdesign.Activity)
      */
+    @Override
     public LearnerProgress chooseActivity(Integer learnerId, Long lessonId, Activity activity,
 	    Boolean clearCompletedFlag) {
 	LearnerProgress progress = learnerProgressDAO.getLearnerProgressByLearner(learnerId, lessonId);
@@ -448,7 +465,7 @@
 	    // through
 	    // all the activities in the sequence - otherwise it will go to the "Completed" screen after the first
 	    // activity in the sequence
-	    if (clearCompletedFlag && activity.getParentActivity() != null
+	    if (clearCompletedFlag && (activity.getParentActivity() != null)
 		    && activity.getParentActivity().isSequenceActivity() && progress.isComplete()) {
 		progress.setLessonComplete(LearnerProgress.LESSON_NOT_COMPLETE);
 	    }
@@ -469,6 +486,7 @@
      *      java.lang.Long, org.lamsfoundation.lams.learningdesign.Activity,
      *      org.lamsfoundation.lams.learningdesign.Activity)
      */
+    @Override
     public LearnerProgress moveToActivity(Integer learnerId, Long lessonId, Activity fromActivity, Activity toActivity)
 	    throws LearnerServiceException {
 	int count = 0;
@@ -496,7 +514,8 @@
 
 	    progress = learnerProgressDAO.getLearnerProgressByLearner(learnerId, lessonId);
 
-	    if (fromActivity != null && fromActivity.getActivityId() != progress.getCurrentActivity().getActivityId()) {
+	    if ((fromActivity != null)
+		    && (fromActivity.getActivityId() != progress.getCurrentActivity().getActivityId())) {
 		progress.setProgressState(fromActivity, LearnerProgress.ACTIVITY_ATTEMPTED, activityDAO);
 	    }
 
@@ -532,16 +551,17 @@
      * Calculates learner progress and returns the data required to be displayed to the learner.
      * 
      * @param completedActivity
-     *                the activity just completed
+     *            the activity just completed
      * @param learner
-     *                the Learner
+     *            the Learner
      * @param learnerProgress
-     *                the current progress
+     *            the current progress
      * @return the bean containing the display data for the Learner
      * @throws LamsToolServiceException
      * @throws LearnerServiceException
-     *                 in case of problems.
+     *             in case of problems.
      */
+    @Override
     public LearnerProgress calculateProgress(Activity completedActivity, Integer learnerId,
 	    LearnerProgress currentLearnerProgress) {
 	try {
@@ -558,6 +578,7 @@
     /**
      * @see org.lamsfoundation.lams.learning.service.ILearnerService#completeToolSession(java.lang.Long, java.lang.Long)
      */
+    @Override
     public String completeToolSession(Long toolSessionId, Long learnerId) {
 	// this method is called by tools, so it mustn't do anything that relies on all the tools' Spring beans
 	// being available in the context. Hence it is defined in the ILearnerService interface, not the
@@ -600,13 +621,14 @@
      * calculate the url to go to next, based on the ActivityMapping class.
      * 
      * @param learnerId
-     *                the learner who are running this activity in the design.
+     *            the learner who are running this activity in the design.
      * @param activity
-     *                the activity is being run.
+     *            the activity is being run.
      * @param lessonId
-     *                lesson id
+     *            lesson id
      * @return the updated learner progress
      */
+    @Override
     public synchronized LearnerProgress completeActivity(Integer learnerId, Activity activity, LearnerProgress progress) {
 	LearnerProgress nextLearnerProgress = null;
 
@@ -632,14 +654,14 @@
 	    nextLearnerProgress = calculateProgress(activity, learnerId, progress);
 
 	    ToolSession toolSession = lamsCoreToolService.getToolSessionByLearner(progress.getUser(), activity);
-	    if (activity instanceof ToolActivity && toolSession != null) {
+	    if ((activity instanceof ToolActivity) && (toolSession != null)) {
 		sendDataToGradebook((ToolActivity) activity, toolSession, progress);
 	    }
 	}
 	// }
 	logEventService.logEvent(LogEvent.TYPE_LEARNER_ACTIVITY_FINISH, learnerId, activity.getLearningDesign()
 		.getLearningDesignId(), progress.getLesson().getLessonId(), activity.getActivityId());
-	
+
 	return nextLearnerProgress;
     }
 
@@ -648,6 +670,7 @@
      * @see org.lamsfoundation.lams.learning.service.ICoreLearnerService#completeActivity(java.lang.Integer,
      *      org.lamsfoundation.lams.learningdesign.Activity, java.lang.Long )
      */
+    @Override
     public LearnerProgress completeActivity(Integer learnerId, Activity activity, Long lessonId) {
 	LearnerProgress currentProgress = getProgress(new Integer(learnerId.intValue()), lessonId);
 	return completeActivity(learnerId, activity, currentProgress);
@@ -657,8 +680,8 @@
 
 	User learner = progress.getUser();
 	Lesson lesson = progress.getLesson();
-	if (toolActivity != null && toolSession != null && learner != null && lesson != null) {
-	    if (toolActivity.getActivityEvaluations() != null && toolActivity.getActivityEvaluations().size() > 0) {
+	if ((toolActivity != null) && (toolSession != null) && (learner != null) && (lesson != null)) {
+	    if ((toolActivity.getActivityEvaluations() != null) && (toolActivity.getActivityEvaluations().size() > 0)) {
 
 		// Getting the first activity evaluation
 		ActivityEvaluation eval = toolActivity.getActivityEvaluations().iterator().next();
@@ -676,7 +699,7 @@
 				    toolActivity.getActivityId(), learner.getUserId());
 
 			    // Only set the mark if it hasnt previously been set by a teacher
-			    if (gradebookUserActivity == null || !gradebookUserActivity.getMarkedInGradebook()) {
+			    if ((gradebookUserActivity == null) || !gradebookUserActivity.getMarkedInGradebook()) {
 				gradebookService.updateUserActivityGradebookMark(lesson, learner, toolActivity,
 					outputDouble, false);
 			    }
@@ -697,6 +720,7 @@
      * 
      * @see org.lamsfoundation.lams.learning.service.ICoreLearnerService#exitLesson(org.lamsfoundation.lams.lesson.LearnerProgress)
      */
+    @Override
     public void exitLesson(Integer learnerId, Long lessonId) {
 
 	User learner = (User) userManagementService.findById(User.class, learnerId);
@@ -716,6 +740,7 @@
     /**
      * @see org.lamsfoundation.lams.learning.service.ICoreLearnerService#getActivity(java.lang.Long)
      */
+    @Override
     public Activity getActivity(Long activityId) {
 	return activityDAO.getActivityByActivityId(activityId);
     }
@@ -725,6 +750,7 @@
      * @see org.lamsfoundation.lams.learning.service.ICoreLearnerService#performGrouping(java.lang.Long, java.lang.Long,
      *      java.lang.Integer)
      */
+    @Override
     public boolean performGrouping(Long lessonId, Long groupingActivityId, Integer learnerId, boolean forceGrouping)
 	    throws LearnerServiceException {
 	GroupingActivity groupingActivity = (GroupingActivity) activityDAO.getActivityByActivityId(groupingActivityId,
@@ -733,7 +759,7 @@
 
 	boolean groupingDone = false;
 	try {
-	    if (groupingActivity != null && groupingActivity.getCreateGrouping() != null && learner != null) {
+	    if ((groupingActivity != null) && (groupingActivity.getCreateGrouping() != null) && (learner != null)) {
 		Grouping grouping = groupingActivity.getCreateGrouping();
 
 		// first check if the grouping already done for the user. If done, then skip the processing.
@@ -767,14 +793,15 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean learnerChooseGroup(Long lessonId, Long groupingActivityId, Long groupId, Integer learnerId)
 	    throws LearnerServiceException {
 	GroupingActivity groupingActivity = (GroupingActivity) activityDAO.getActivityByActivityId(groupingActivityId,
 		GroupingActivity.class);
 
-	if (groupingActivity != null && groupId != null && learnerId != null) {
+	if ((groupingActivity != null) && (groupId != null) && (learnerId != null)) {
 	    Grouping grouping = groupingDAO.getGroupingById(groupingActivity.getCreateGrouping().getGroupingId());
-	    if (grouping != null && grouping.isLearnerChoiceGrouping()) {
+	    if ((grouping != null) && grouping.isLearnerChoiceGrouping()) {
 
 		User learner = (User) userManagementService.findById(User.class, learnerId);
 		if (grouping.doesLearnerExist(learner)) {
@@ -848,6 +875,7 @@
      * @see org.lamsfoundation.lams.learning.service.ICoreLearnerService#knockGate(java.lang.Long,
      *      org.lamsfoundation.lams.usermanagement.User)
      */
+    @Override
     public GateActivityDTO knockGate(Long gateActivityId, User knocker, boolean forceGate) {
 	GateActivity gate = (GateActivity) activityDAO.getActivityByActivityId(gateActivityId, GateActivity.class);
 	if (gate != null) {
@@ -863,6 +891,7 @@
      * @see org.lamsfoundation.lams.learning.service.ICoreLearnerService#knockGate(org.lamsfoundation.lams.learningdesign.GateActivity,
      *      org.lamsfoundation.lams.usermanagement.User)
      */
+    @Override
     public GateActivityDTO knockGate(GateActivity gate, User knocker, boolean forceGate) {
 	Lesson lesson = getLessonByActivity(gate);
 	List lessonLearners = getLearnersForGate(gate, lesson);
@@ -905,24 +934,24 @@
 
 	List lessonLearners = null;
 	Activity branchActivity = gate.getParentBranch();
-	while (branchActivity != null
+	while ((branchActivity != null)
 		&& !(branchActivity.getParentActivity().isChosenBranchingActivity() || branchActivity
 			.getParentActivity().isGroupBranchingActivity())) {
 	    branchActivity = branchActivity.getParentBranch();
 	}
 
 	if (branchActivity != null) {
 	    // set up list based on branch - all members of a group attached to the branch are destined for the gate
-	    SequenceActivity branchSequence = (SequenceActivity) activityDAO.getActivityByActivityId(branchActivity
-		    .getActivityId(), SequenceActivity.class);
+	    SequenceActivity branchSequence = (SequenceActivity) activityDAO.getActivityByActivityId(
+		    branchActivity.getActivityId(), SequenceActivity.class);
 	    Set branchEntries = branchSequence.getBranchEntries();
 	    Iterator entryIterator = branchEntries.iterator();
 	    while (entryIterator.hasNext()) {
 		BranchActivityEntry branchActivityEntry = (BranchActivityEntry) entryIterator.next();
 		Group group = branchActivityEntry.getGroup();
 		if (group != null) {
-		    List groupLearners = lessonService.getActiveLessonLearnersByGroup(lesson.getLessonId(), group
-			    .getGroupId());
+		    List groupLearners = lessonService.getActiveLessonLearnersByGroup(lesson.getLessonId(),
+			    group.getGroupId());
 		    if (lessonLearners == null) {
 			lessonLearners = groupLearners;
 		    } else {
@@ -940,6 +969,7 @@
     /**
      * @see org.lamsfoundation.lams.learning.service.ICoreLearnerService#getWaitingGateLearners(org.lamsfoundation.lams.learningdesign.GateActivity)
      */
+    @Override
     public List getLearnersForGate(GateActivity gate) {
 	return getLearnersForGate(gate, getLessonByActivity(gate));
     }
@@ -948,6 +978,7 @@
      * @see org.lamsfoundation.lams.learning.service.ICoreLearnerService#getLearnerActivityURL(java.lang.Integer,
      *      java.lang.Long)
      */
+    @Override
     public String getLearnerActivityURL(Integer learnerId, Long activityId) {
 	User learner = (User) userManagementService.findById(User.class, learnerId);
 	Activity requestedActivity = getActivity(activityId);
@@ -958,13 +989,15 @@
     /**
      * @see org.lamsfoundation.lams.learning.service.ICoreLearnerService#getActiveLearnersByLesson(long)
      */
+    @Override
     public List getActiveLearnersByLesson(long lessonId) {
 	return lessonService.getActiveLessonLearners(lessonId);
     }
 
     /**
      * @see org.lamsfoundation.lams.learning.service.ICoreLearnerService#getCountActiveLessonLearners(long)
      */
+    @Override
     public Integer getCountActiveLearnersByLesson(long lessonId) {
 	return lessonService.getCountActiveLessonLearners(lessonId);
     }
@@ -973,6 +1006,7 @@
      * Get the lesson for this activity. If the activity is not part of a lesson (ie is from an authoring design then it
      * will return null.
      */
+    @Override
     public Lesson getLessonByActivity(Activity activity) {
 	Lesson lesson = lessonDAO.getLessonForActivity(activity.getActivityId());
 	if (lesson == null) {
@@ -1041,7 +1075,7 @@
      * Create an array of lesson dto based a list of lessons.
      * 
      * @param lessons
-     *                the list of lessons.
+     *            the list of lessons.
      * @return the lesson dto array.
      */
     private LessonDTO[] getLessonDataFor(List lessons) {
@@ -1058,6 +1092,7 @@
      * @see org.lamsfoundation.lams.learning.service.ICoreLearnerService#determineBranch(org.lamsfoundation.lams.lesson.Lesson,
      *      org.lamsfoundation.lams.learningdesign.BranchingActivity, java.lang.Integer)
      */
+    @Override
     public SequenceActivity determineBranch(Lesson lesson, BranchingActivity branchingActivity, Integer learnerId)
 	    throws LearnerServiceException {
 	User learner = (User) userManagementService.findById(User.class, learnerId);
@@ -1108,8 +1143,8 @@
 	    Iterator branchIterator = branchingActivity.getActivities().iterator();
 	    while (branchIterator.hasNext()) {
 		Activity branchActivity = (Activity) branchIterator.next();
-		SequenceActivity branchSequence = (SequenceActivity) activityDAO.getActivityByActivityId(branchActivity
-			.getActivityId(), SequenceActivity.class);
+		SequenceActivity branchSequence = (SequenceActivity) activityDAO.getActivityByActivityId(
+			branchActivity.getActivityId(), SequenceActivity.class);
 		Iterator<BranchActivityEntry> entryIterator = branchSequence.getBranchEntries().iterator();
 		while (entryIterator.hasNext()) {
 		    BranchActivityEntry entry = entryIterator.next();
@@ -1124,7 +1159,7 @@
 	    Map<String, ToolOutput> toolOutputMap = new HashMap<String, ToolOutput>();
 	    Iterator<BranchCondition> conditionIterator = conditionsMap.keySet().iterator();
 
-	    while (matchedBranch == null && conditionIterator.hasNext()) {
+	    while ((matchedBranch == null) && conditionIterator.hasNext()) {
 		BranchCondition condition = conditionIterator.next();
 		String conditionName = condition.getName();
 		ToolOutput toolOutput = toolOutputMap.get(conditionName);
@@ -1138,7 +1173,7 @@
 		    }
 		}
 
-		if (toolOutput != null && condition.isMet(toolOutput)) {
+		if ((toolOutput != null) && condition.isMet(toolOutput)) {
 		    matchedBranch = conditionsMap.get(condition);
 		}
 	    }
@@ -1189,7 +1224,7 @@
 	    if (group != null) {
 		if (group.getBranchActivities() != null) {
 		    Iterator branchesIterator = group.getBranchActivities().iterator();
-		    while (sequenceActivity == null && branchesIterator.hasNext()) {
+		    while ((sequenceActivity == null) && branchesIterator.hasNext()) {
 			BranchActivityEntry branchActivityEntry = (BranchActivityEntry) branchesIterator.next();
 			if (branchActivityEntry.getBranchingActivity().equals(branchingActivity)) {
 			    sequenceActivity = branchActivityEntry.getBranchSequenceActivity();
@@ -1216,9 +1251,9 @@
      * Checks if any of the conditions that open the gate is met.
      * 
      * @param gate
-     *                gate to check
+     *            gate to check
      * @param learner
-     *                learner who is knocking to the gate
+     *            learner who is knocking to the gate
      * @return <code>true</code> if learner satisfied any of the conditions and is allowed to pass
      */
     private boolean determineConditionGateStatus(GateActivity gate, User learner) {
@@ -1248,8 +1283,8 @@
 		    String conditionName = condition.getName();
 		    ToolOutput toolOutput = toolOutputMap.get(conditionName);
 		    if (toolOutput == null) {
-			toolOutput = lamsCoreToolService.getOutputFromTool(conditionName, toolSession, learner
-				.getUserId());
+			toolOutput = lamsCoreToolService.getOutputFromTool(conditionName, toolSession,
+				learner.getUserId());
 			if (toolOutput == null) {
 			    LearnerService.log
 				    .warn("Condition "
@@ -1262,7 +1297,7 @@
 			}
 		    }
 
-		    if (toolOutput != null && condition.isMet(toolOutput)) {
+		    if ((toolOutput != null) && condition.isMet(toolOutput)) {
 			shouldOpenGate = entry.getGateOpenWhenConditionMet();
 			if (shouldOpenGate) {
 			    // save the learner to the "allowed to pass" list so we don't check the conditions over and
@@ -1285,6 +1320,7 @@
      * @see org.lamsfoundation.lams.learning.service.ICoreLearnerService#determineBranch(org.lamsfoundation.lams.lesson.Lesson,
      *      org.lamsfoundation.lams.learningdesign.BranchingActivity, java.lang.Integer)
      */
+    @Override
     public SequenceActivity selectBranch(Lesson lesson, BranchingActivity branchingActivity, Integer learnerId,
 	    Long branchId) throws LearnerServiceException {
 
@@ -1299,7 +1335,7 @@
 		SequenceActivity.class);
 	if (selectedBranch != null) {
 
-	    if (selectedBranch.getParentActivity() == null
+	    if ((selectedBranch.getParentActivity() == null)
 		    || !selectedBranch.getParentActivity().equals(branchingActivity)) {
 		String error = "selectBranch: activity " + selectedBranch
 			+ " is not a branch within the branching activity " + branchingActivity + ". Unable to branch.";
@@ -1312,7 +1348,7 @@
 
 	    // Does this matching branch have any groups? If so, see if the learner is in
 	    // the appropriate group and add them if necessary.
-	    if (groups != null && groups.size() > 0) {
+	    if ((groups != null) && (groups.size() > 0)) {
 		boolean isInGroup = false;
 		Group aGroup = null;
 		Iterator<Group> groupIter = groups.iterator();
@@ -1339,7 +1375,7 @@
 		// groups will exist
 		// but it too hard to reuse them.)
 	    } else {
-		if (grouping.isChosenGrouping() && grouping.getMaxNumberOfGroups() != null) {
+		if (grouping.isChosenGrouping() && (grouping.getMaxNumberOfGroups() != null)) {
 		    grouping.setMaxNumberOfGroups(null);
 		}
 
@@ -1383,6 +1419,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public Integer calculateMaxNumberOfLearnersPerGroup(Long lessonId, Grouping grouping) {
 	Lesson lesson = getLesson(lessonId);
 	LearnerChoiceGrouping learnerChoiceGrouping = (LearnerChoiceGrouping) grouping;
@@ -1411,6 +1448,7 @@
 	return maxNumberOfLearnersPerGroup;
     }
 
+    @Override
     public Grouping getGrouping(Long groupingId) {
 	return groupingDAO.getGroupingById(groupingId);
     }
@@ -1431,6 +1469,7 @@
      * Gets the concreted tool output (not the definition) from a tool. This method is called by target tool in order to
      * get data from source tool.
      */
+    @Override
     public ToolOutput getToolInput(Long requestingToolContentId, Integer assigmentId, Integer learnerId) {
 	DataFlowObject dataFlowObject = getDataFlowDAO()
 		.getAssignedDataFlowObject(requestingToolContentId, assigmentId);
@@ -1442,4 +1481,90 @@
 
 	return output;
     }
+
+    /**
+     * Finds activity position within Learning Design.
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public ActivityPositionDTO getActivityPosition(Long activityId) {
+	if (activityId == null) {
+	    return null;
+	}
+	Activity activity = getActivity(activityId);
+	if (activity == null) {
+	    return null;
+	}
+
+	ActivityPositionDTO result = new ActivityPositionDTO();
+	// this is not really used at the moment, but can be useful in the future
+	result.setActivityCount(activity.getLearningDesign().getActivities().size());
+	Activity parentActivity = activity.getParentActivity();
+	boolean isFirst = false;
+	boolean isLast = false;
+
+	if (parentActivity == null) {
+	    // it's an activity in the main sequence
+	    isFirst = activity.getTransitionTo() == null;
+	    isLast = isActivityLast(activity);
+	} else {
+	    if (parentActivity.isSequenceActivity()) {
+		// only parent's parent is the one in main sequence
+		parentActivity = parentActivity.getParentActivity();
+	    }
+
+	    ActivityPositionDTO parentPosition = getActivityPosition(parentActivity.getActivityId());
+	    if (parentPosition != null) {
+		// looking for first-ness is easy
+		isFirst = parentPosition.getFirst() && (activity.getTransitionTo() == null);
+
+		// looking for last-ness
+		if (parentActivity.isOptionsActivity()) {
+		    if (parentPosition.getLast()) {
+			// this is tricky: the activity is the last one only if parent is and after completing it,
+			// there are no more optional activities to do
+			// (for example, it's 4th out of 5 optional activities)
+			OptionsActivity parentOptionsActivity = (OptionsActivity) getActivity(parentActivity
+				.getActivityId());
+			Integer learnerId = LearningWebUtil.getUserId();
+			Lesson lesson = getLessonByActivity(activity);
+			LearnerProgress learnerProgress = getProgress(learnerId, lesson.getLessonId());
+
+			int completedSubactivities = 0;
+			for (Activity subactivity : (Set<Activity>) parentOptionsActivity.getActivities()) {
+			    if (LearnerProgress.ACTIVITY_COMPLETED == learnerProgress.getProgressState(subactivity)) {
+				completedSubactivities++;
+			    }
+			}
+
+			isLast = completedSubactivities == parentOptionsActivity.getMaxNumberOfOptionsNotNull() - 1;
+		    }
+		} else if (parentActivity.isBranchingActivity() || parentActivity.isParallelActivity()) {
+		    isLast = parentPosition.getLast() && isActivityLast(activity);
+		}
+	    }
+	}
+
+	result.setFirst(isFirst);
+	result.setLast(isLast);
+	return result;
+    }
+
+    @Override
+    public ActivityPositionDTO getActivityPositionByToolSessionId(Long toolSessionId) {
+	ToolSession toolSession = lamsCoreToolService.getToolSessionById(toolSessionId);
+	return toolSession == null ? null : getActivityPosition(toolSession.getToolActivity().getActivityId());
+    }
+
+    private boolean isActivityLast(Activity activity) {
+	Transition transition = activity.getTransitionFrom();
+	while (transition != null) {
+	    Activity nextActivity = transition.getToActivity();
+	    if (!nextActivity.isGateActivity()) {
+		return false;
+	    }
+	    transition = nextActivity.getTransitionFrom();
+	}
+	return true;
+    }
 }
\ No newline at end of file
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
===================================================================
diff -u -re4c92abe243b6367ad45115df3e1f5ecec5e5de7 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java	(.../DisplayOptionsActivityAction.java)	(revision e4c92abe243b6367ad45115df3e1f5ecec5e5de7)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java	(.../DisplayOptionsActivityAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -115,9 +115,10 @@
 		form.setProgressID(learnerProgress.getLearnerProgressId());
 		
 		this.saveToken(request);
+        
+        	LearningWebUtil.setupProgressInRequest(form, request, learnerProgress);
+        	LearningWebUtil.putActivityPositionInRequest(form.getActivityID(), request, getServlet().getServletContext());
 		
-		LearningWebUtil.setupProgressInRequest(form, request, learnerProgress);
-
 		String forward = "displayOptions";
 		return mapping.findForward(forward);
 	}
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
===================================================================
diff -u -rc4bbe0b084234edffd2c0c43dce7d7b1fbf14863 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java	(.../GroupingAction.java)	(revision c4bbe0b084234edffd2c0c43dce7d7b1fbf14863)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java	(.../GroupingAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -184,7 +184,10 @@
 	request.setAttribute(GroupingAction.LOCAL_FILES, Boolean.FALSE);
 	ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true);
 	request.setAttribute(GroupingAction.FINISHED_BUTTON, new Boolean(mode == null || !mode.isTeacher()));
-
+	
+	long activityId = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
+	LearningWebUtil.putActivityPositionInRequest(activityId, request, getServlet().getServletContext());
+	
 	return mapping.findForward(GroupingAction.SHOW_GROUP);
     }
 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/bean/ActivityPositionDTO.java
===================================================================
diff -u
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/bean/ActivityPositionDTO.java	(revision 0)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/bean/ActivityPositionDTO.java	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -0,0 +1,60 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.learning.web.bean;
+
+/**
+ * Marks activity position within Learning Design. It can be extended to find out exact position (for example, 4th
+ * activity of total 10).
+ * 
+ * @author Marcin Cieslak
+ */
+public class ActivityPositionDTO {
+    private Boolean last;
+    private Boolean first;
+    private Integer activityCount;
+
+    public Boolean getLast() {
+	return last;
+    }
+
+    public void setLast(Boolean last) {
+	this.last = last;
+    }
+
+    public Boolean getFirst() {
+	return first;
+    }
+
+    public void setFirst(Boolean first) {
+	this.first = first;
+    }
+
+    public Integer getActivityCount() {
+	return activityCount;
+    }
+
+    public void setActivityCount(Integer activityCount) {
+	this.activityCount = activityCount;
+    }
+}
\ No newline at end of file
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
===================================================================
diff -u -rc124a53ce3fc13192de91c935a2cc88a4a532cc9 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	(.../LearningWebUtil.java)	(revision c124a53ce3fc13192de91c935a2cc88a4a532cc9)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	(.../LearningWebUtil.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -35,8 +35,10 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.DynaActionForm;
 import org.lamsfoundation.lams.learning.service.ICoreLearnerService;
+import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learning.service.LearnerServiceException;
 import org.lamsfoundation.lams.learning.web.action.ActivityAction;
+import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
 import org.lamsfoundation.lams.learning.web.bean.ActivityURL;
 import org.lamsfoundation.lams.learning.web.form.ActivityForm;
 import org.lamsfoundation.lams.learningdesign.Activity;
@@ -136,24 +138,24 @@
 
 	    if (learnerProgressId != null) {
 		learnerProgress = learnerService.getProgressById(new Long(learnerProgressId));
-		if (learnerProgress != null && LearningWebUtil.log.isDebugEnabled()) {
+		if ((learnerProgress != null) && LearningWebUtil.log.isDebugEnabled()) {
 		    LearningWebUtil.log.debug("getLearnerProgress: found progress via progress id");
 		}
 	    }
 
 	}
 
 	if (learnerProgress == null) {
-	    Integer learnerId = getUserId();
-	    Activity act = getActivityFromRequest(request, learnerService);
+	    Integer learnerId = LearningWebUtil.getUserId();
+	    Activity act = LearningWebUtil.getActivityFromRequest(request, learnerService);
 	    Lesson lesson = learnerService.getLessonByActivity(act);
 	    learnerProgress = learnerService.getProgress(learnerId, lesson.getLessonId());
-	    if (learnerProgress != null && LearningWebUtil.log.isDebugEnabled()) {
+	    if ((learnerProgress != null) && LearningWebUtil.log.isDebugEnabled()) {
 		LearningWebUtil.log.debug("getLearnerProgress: found progress via learner id and activity");
 	    }
 	}
 
-	putLearnerProgressInRequest(request, learnerProgress);
+	LearningWebUtil.putLearnerProgressInRequest(request, learnerProgress);
 	return learnerProgress;
     }
 
@@ -202,10 +204,10 @@
      * Grouping actions. Calls the learningService to actually complete the activity and progress.
      * 
      * @param redirect
-     *                Should this call redirect to the next screen (true) or use a forward (false)
+     *            Should this call redirect to the next screen (true) or use a forward (false)
      * @param windowName
-     *                Name of the window that triggered this code. Normally LearnerActivity (the popup window) or
-     *                lWindow (normal learner window)
+     *            Name of the window that triggered this code. Normally LearnerActivity (the popup window) or lWindow
+     *            (normal learner window)
      * @throws UnsupportedEncodingException
      * @throws InterruptedException
      * 
@@ -238,7 +240,7 @@
 	    }
 	}
 
-	if (currentActivity != null && currentActivity.isFloating()) {
+	if ((currentActivity != null) && currentActivity.isFloating()) {
 	    return actionMappings.getCloseForward(currentActivity, lesson.getLessonId());
 	}
 
@@ -259,13 +261,13 @@
     public static void setupProgressInRequest(ActivityForm activityForm, HttpServletRequest request,
 	    LearnerProgress learnerProgress) {
 
-	putLearnerProgressInRequest(request, learnerProgress);
+	LearningWebUtil.putLearnerProgressInRequest(request, learnerProgress);
 
 	// Calculate the progress summary. On join this method gets called twice, and we
 	// only want to calculate once
 	String progressSummary = activityForm.getProgressSummary();
 	if (progressSummary == null) {
-	    progressSummary = getProgressSummary(learnerProgress);
+	    progressSummary = LearningWebUtil.getProgressSummary(learnerProgress);
 	    activityForm.setProgressSummary(progressSummary);
 	}
 
@@ -292,13 +294,13 @@
     public static void setupProgressInRequest(DynaActionForm actionForm, HttpServletRequest request,
 	    LearnerProgress learnerProgress) {
 
-	putLearnerProgressInRequest(request, learnerProgress);
+	LearningWebUtil.putLearnerProgressInRequest(request, learnerProgress);
 
 	// Calculate the progress summary. On join this method gets called twice, and we
 	// only want to calculate once
 	String progressSummary = (String) actionForm.get("progressSummary");
 	if (progressSummary == null) {
-	    progressSummary = getProgressSummary(learnerProgress);
+	    progressSummary = LearningWebUtil.getProgressSummary(learnerProgress);
 	    actionForm.set("progressSummary", progressSummary);
 	}
 
@@ -323,10 +325,6 @@
 	if (learnerProgress == null) {
 	    progressSummary.append("attempted=&completed=&current=");
 	    progressSummary.append("&lessonID=");
-	    Lesson currentLesson = learnerProgress.getLesson();
-	    if (currentLesson != null) {
-		progressSummary.append(currentLesson.getLessonId());
-	    }
 	} else {
 	    progressSummary.append("attempted=");
 	    boolean first = true;
@@ -366,7 +364,7 @@
 	    Activity activity, boolean defaultURL, boolean isFloating) {
 	ActivityURL activityURL = new ActivityURL();
 	activityURL.setType(activity.getClass().getSimpleName());
-	
+
 	String url = activityMapping.getActivityURL(activity);
 	activityURL.setUrl(url);
 	activityURL.setActivityId(activity.getActivityId());
@@ -382,4 +380,40 @@
 	activityURL.setDefaultURL(defaultURL);
 	return activityURL;
     }
-}
+
+    /**
+     * Finds activity position within Learning Design and stores it as request attribute.
+     */
+    public static ActivityPositionDTO putActivityPositionInRequest(Long activityId, HttpServletRequest request,
+	    ServletContext context) {
+	WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(context);
+	ILearnerService learnerService = (ILearnerService) wac.getBean("learnerService");
+	if (learnerService == null) {
+	    LearningWebUtil.log.warn("Can not set activity position, no Learner service in servlet context.");
+	    return null;
+	}
+	ActivityPositionDTO positionDTO = learnerService.getActivityPosition(activityId);
+	if (positionDTO != null) {
+	    request.setAttribute(AttributeNames.ATTR_ACTIVITY_POSITION, positionDTO);
+	}
+	return positionDTO;
+    }
+
+    /**
+     * Finds activity position within Learning Design and stores it as request attribute.
+     */
+    public static ActivityPositionDTO putActivityPositionInRequestByToolSessionId(Long toolSessionId,
+	    HttpServletRequest request, ServletContext context) {
+	WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(context);
+	ILearnerService learnerService = (ILearnerService) wac.getBean("learnerService");
+	if (learnerService == null) {
+	    LearningWebUtil.log.warn("Can not set activity position, no Learner service in servlet context.");
+	    return null;
+	}
+	ActivityPositionDTO positionDTO = learnerService.getActivityPositionByToolSessionId(toolSessionId);
+	if (positionDTO != null) {
+	    request.setAttribute(AttributeNames.ATTR_ACTIVITY_POSITION, positionDTO);
+	}
+	return positionDTO;
+    }
+}
\ No newline at end of file
Index: lams_learning/web/grouping/show.jsp
===================================================================
diff -u -r6a00a381d27bc31726597217200978ae4423be7e -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_learning/web/grouping/show.jsp	(.../show.jsp)	(revision 6a00a381d27bc31726597217200978ae4423be7e)
+++ lams_learning/web/grouping/show.jsp	(.../show.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -65,7 +65,16 @@
 
 			<table><tr><td><div id="right" class="right-buttons">
 					<html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-					  <span class="nextActivity"><fmt:message key="label.finish.button"/></span>
+					  <span class="nextActivity">
+	                    <c:choose>
+		 					<c:when test="${activityPosition.last}">
+		 						<fmt:message key="label.submit.button" />
+		 					</c:when>
+		 					<c:otherwise>
+		 		 				<fmt:message key="label.finish.button" />
+		 					</c:otherwise>
+		 				</c:choose>
+		 			 </span>
 					 </html:link>
 			</div></td></tr></table>
 	</c:if>
Index: lams_learning/web/optionsActivity.jsp
===================================================================
diff -u -r6a00a381d27bc31726597217200978ae4423be7e -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision 6a00a381d27bc31726597217200978ae4423be7e)
+++ lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -193,7 +193,16 @@
 
 			<div class="align-right space-bottom-top">
                                <html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-                                     <span class="nextActivity"><fmt:message key="label.finish.button"/></span>
+                                     <span class="nextActivity">
+                                     	<c:choose>
+						 					<c:when test="${activityPosition.last}">
+						 						<fmt:message key="label.submit.button" />
+						 					</c:when>
+						 					<c:otherwise>
+						 		 				<fmt:message key="label.finish.button" />
+						 					</c:otherwise>
+						 				</c:choose>
+						 			 </span>
                                </html:link>
 			</div>
 
Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -ra43256ee6435f1cd14f46c235e4d507957a86a5b -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a43256ee6435f1cd14f46c235e4d507957a86a5b)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -217,7 +217,8 @@
 label.authoring.heading.advance  =Advanced
 label.down  =Move down
 label.finished  =Next Activity
-label.finish  =Finished
+label.submit =Finish
+label.finish =Finished
 error.msg.repository  =A repository error occurred while trying to upload the file.
 monitoring.label.attachments  =Attachments
 label.on  =On
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
===================================================================
diff -u -r84151d175a3fce3cd3ff1bd4eeccfd7cbef01802 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(.../LearningAction.java)	(revision 84151d175a3fce3cd3ff1bd4eeccfd7cbef01802)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -52,6 +52,8 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.lamsfoundation.lams.events.DeliveryMethodMail;
+import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.assessment.AssessmentConstants;
@@ -132,6 +134,7 @@
      * @throws ServletException 
      * 
      */
+    @SuppressWarnings("unchecked")
     private ActionForward start(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws ServletException {
 
@@ -222,6 +225,10 @@
 	sessionMap.put(AssessmentConstants.ATTR_REFLECTION_INSTRUCTION, assessment.getReflectInstructions());
 	sessionMap.put(AssessmentConstants.ATTR_REFLECTION_ENTRY, entryText);
 
+	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionId, request, getServlet()
+		.getServletContext());
+	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
+	
 	// add define later support
 	if (assessment.isDefineLater()) {
 	    return mapping.findForward("defineLater");
@@ -355,7 +362,8 @@
 	}
 	sessionMap.put(AssessmentConstants.ATTR_QUESTION_NUMBERING_OFFSET, ++questionNumberingOffset);
 	sessionMap.put(AssessmentConstants.ATTR_PAGE_NUMBER, pageNumber);
-	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);	
+	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+
 	return mapping.findForward(AssessmentConstants.SUCCESS);
     }
     
@@ -396,6 +404,7 @@
 	
 	sessionMap.put(AssessmentConstants.ATTR_FINISHED_LOCK, true);
 	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+	
 	return mapping.findForward(AssessmentConstants.SUCCESS);
     } 
     
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -rb652cf47563185ee684068696c5af1bb96f8b0fa -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision b652cf47563185ee684068696c5af1bb96f8b0fa)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -251,11 +251,19 @@
 								</c:when>
 								<c:otherwise>
 									<html:link href="#nogo" property="FinishButton" onclick="return finishSession()" styleClass="button">
-										<span class="nextActivity"><fmt:message key="label.learning.next.activity" /></span>
+										<span class="nextActivity">
+											<c:choose>
+							 					<c:when test="${sessionMap.activityPosition.last}">
+							 						<fmt:message key="label.submit" />
+							 					</c:when>
+							 					<c:otherwise>
+							 		 				<fmt:message key="label.finished" />
+							 					</c:otherwise>
+							 				</c:choose>
+		 								</span>
 									</html:link>
 								</c:otherwise>
 							</c:choose>
-
 						</c:if>
 					</c:otherwise>
 				</c:choose>
Index: lams_tool_assessment/web/pages/learning/notebook.jsp
===================================================================
diff -u -r65e3365a66b2977b268fafdd0b9fe2e5eae732a4 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_assessment/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 65e3365a66b2977b268fafdd0b9fe2e5eae732a4)
+++ lams_tool_assessment/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -41,7 +41,16 @@
 
 			<div class="space-bottom-top align-right">
 				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-					<span class="nextActivity"><fmt:message key="label.finished" /></span>
+					<span class="nextActivity">
+						<c:choose>
+							<c:when test="${sessionMap.activityPosition.last}">
+								<fmt:message key="label.submit" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.finished" />
+							</c:otherwise>
+						</c:choose>
+					</span>
 				</html:link>
 			</div>
 		</div>
Index: lams_tool_assessment/web/pages/learning/runoffline.jsp
===================================================================
diff -u -rda992a30e1e8e5d28cb9befb9e71c705711d3152 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_assessment/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision da992a30e1e8e5d28cb9befb9e71c705711d3152)
+++ lams_tool_assessment/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -42,7 +42,16 @@
 		<div class="space-bottom-top align-right">
 			<html:link href="#nogo" property="FinishButton" styleId="finishButton"
 				onclick="return finishSession()" styleClass="button">
-				<span class="nextActivity"><fmt:message key="label.finished" /></span>
+				<span class="nextActivity">
+					<c:choose>
+						<c:when test="${sessionMap.activityPosition.last}">
+							<fmt:message key="label.submit" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="label.finished" />
+						</c:otherwise>
+					</c:choose>
+				</span>
 			</html:link>
 		</div>
 	</div>
Index: lams_tool_bbb/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rd64e745f43f56f59cbfe3e4f21613d1cbe0f0783 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_bbb/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision d64e745f43f56f59cbfe3e4f21613d1cbe0f0783)
+++ lams_tool_bbb/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -20,6 +20,7 @@
 button.cancel  =Cancel
 button.save  =Save
 button.finish  =Next Activity
+button.submit =Finish
 button.instructions  =Instructions
 button.continue  =Continue
 button.edit  =Edit
Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/LearningAction.java
===================================================================
diff -u -rdf5534fd49894e3369fc98f8273d9e2fefbb4817 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/LearningAction.java	(.../LearningAction.java)	(revision df5534fd49894e3369fc98f8273d9e2fefbb4817)
+++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -37,6 +37,7 @@
 import org.apache.struts.actions.DispatchAction;
 import org.apache.struts.util.MessageResources;
 import org.lamsfoundation.lams.integration.security.RandomPasswordGenerator;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -185,6 +186,9 @@
 	    lrnForm.setEntryText(notebookEntry.getEntry());
 	}
 
+	LearningWebUtil.putActivityPositionInRequestByToolSessionId(lrnForm.getToolSessionID(), request, getServlet()
+		.getServletContext());
+
 	return mapping.findForward("notebook");
 
     }
@@ -304,6 +308,9 @@
 	    bbbService.saveOrUpdateBbb(bbb);
 	}
 
+	LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet()
+		.getServletContext());
+	
 	// check runOffline
 	if (bbb.isRunOffline()) {
 	    return mapping.findForward("runOffline");
Index: lams_tool_bbb/web/pages/learning/notebook.jsp
===================================================================
diff -u -rdf5534fd49894e3369fc98f8273d9e2fefbb4817 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_bbb/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision df5534fd49894e3369fc98f8273d9e2fefbb4817)
+++ lams_tool_bbb/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -25,7 +25,14 @@
 			<html:hidden property="dispatch" value="submitReflection" />
 			<html:hidden property="toolSessionID" />
 			<html:submit styleClass="button" styleId="finishButton">
-				<fmt:message>button.finish</fmt:message>
+			    <c:choose>
+ 					<c:when test="${activityPosition.last}">
+ 						<fmt:message key="button.submit" />
+ 					</c:when>
+ 					<c:otherwise>
+ 		 				<fmt:message key="button.finish" />
+ 					</c:otherwise>
+	 			</c:choose>
 			</html:submit>
 		</div>
 	</html:form>
Index: lams_tool_bbb/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -rdf5534fd49894e3369fc98f8273d9e2fefbb4817 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_bbb/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision df5534fd49894e3369fc98f8273d9e2fefbb4817)
+++ lams_tool_bbb/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -57,7 +57,14 @@
 			<c:otherwise>
 				<html:hidden property="dispatch" value="finishActivity" />
 				<html:submit styleClass="button" styleId="finishButton">
-					<fmt:message key="button.finish" />
+				    <c:choose>
+	 					<c:when test="${activityPosition.last}">
+	 						<fmt:message key="button.submit" />
+	 					</c:when>
+	 					<c:otherwise>
+	 		 				<fmt:message key="button.finish" />
+	 					</c:otherwise>
+		 			</c:choose>
 				</html:submit>
 			</c:otherwise>
 		</c:choose>
Index: lams_tool_bbb/web/pages/learning/runOffline.jsp
===================================================================
diff -u -rdf5534fd49894e3369fc98f8273d9e2fefbb4817 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_bbb/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision df5534fd49894e3369fc98f8273d9e2fefbb4817)
+++ lams_tool_bbb/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -23,7 +23,14 @@
 
 			<div align="right" class="space-bottom-top">
 				<html:submit styleClass="button" styleId="finishButton">
-					<fmt:message>button.finish</fmt:message>
+				    <c:choose>
+	 					<c:when test="${activityPosition.last}">
+	 						<fmt:message key="button.submit" />
+	 					</c:when>
+	 					<c:otherwise>
+	 		 				<fmt:message key="button.finish" />
+	 					</c:otherwise>
+		 			</c:choose>
 				</html:submit>
 			</div>
 		</html:form>
Index: lams_tool_chat/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rafaf1d9937307cd4a39ce24167988df598a2ded8 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_chat/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision afaf1d9937307cd4a39ce24167988df598a2ded8)
+++ lams_tool_chat/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -68,6 +68,7 @@
 button.done  =Done
 button.save  =Save
 button.finish  =Next Activity
+button.submit =Finish
 button.next  =Next
 label.save  =Save
 label.cancel  =Cancel
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java
===================================================================
diff -u -r4a3d1ca484773efa5f184bcdbd374a53378f8e6f -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 4a3d1ca484773efa5f184bcdbd374a53378f8e6f)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -46,6 +46,7 @@
 import org.apache.tomcat.util.json.JSONArray;
 import org.apache.tomcat.util.json.JSONException;
 import org.apache.tomcat.util.json.JSONObject;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -175,6 +176,9 @@
 	    chatService.saveOrUpdateChat(chat);
 	}
 
+	LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet()
+		.getServletContext());
+	
 	// check runOffline
 	if (chat.isRunOffline()) {
 	    return mapping.findForward("runOffline");
@@ -259,6 +263,9 @@
 	    lrnForm.setEntryText(notebookEntry.getEntry());
 	}
 
+	LearningWebUtil.putActivityPositionInRequestByToolSessionId(chatUser.getChatSession().getSessionId(), request,
+		getServlet().getServletContext());
+
 	return mapping.findForward("notebook");
     }
 
Index: lams_tool_chat/web/pages/learning/notebook.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_chat/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_chat/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -28,7 +28,16 @@
 			<html:hidden property="dispatch" value="submitReflection" />
 			<html:hidden property="chatUserUID" />
 			<html:link href="#nogo" styleClass="button" styleId="finishButton"  onclick="submitForm('finish')">
-				 <span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
+				<span class="nextActivity">
+					<c:choose>
+						<c:when test="${activityPosition.last}">
+							<fmt:message key="button.submit" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="button.finish" />
+						</c:otherwise>
+					</c:choose>
+				</span>
 			</html:link>
 		</div>
 	</html:form>
Index: lams_tool_chat/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_chat/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_chat/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -59,7 +59,16 @@
 			<c:otherwise>
 				<html:hidden property="dispatch" value="finishActivity" />
 				<html:link href="#nogo" styleClass="button" styleId="finishButton"  onclick="submitForm('finish')">
-					 <span class="nextActivity"><fmt:message key="button.finish" /></span>
+					 <span class="nextActivity">
+						 <c:choose>
+						 	<c:when test="${activityPosition.last}">
+						 		 <fmt:message key="button.submit" />
+						 	</c:when>
+						 	<c:otherwise>
+						 		 <fmt:message key="button.finish" />
+						 	</c:otherwise>
+						 </c:choose>
+					 </span>
 				</html:link>
 			</c:otherwise>
 		</c:choose>
Index: lams_tool_daco/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r542c2cefed9f7ef2c515eff59a06f508330e24f7 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_daco/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 542c2cefed9f7ef2c515eff59a06f508330e24f7)
+++ lams_tool_daco/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -147,6 +147,7 @@
 label.learning.summary.emptyanswer  =Empty answer
 label.learning.continue  =Continue
 label.learning.finished  =Next Activity
+label.learning.submit =Finish
 message.learning.alertContentEdit  =The modification of the content is not allowed since one or more participants has attempted the activity.
 message.learning.warnLockOnFinish  =Note: After you click on "Next Activity" and you come back to this Data Collection, you won't be able to view questions
 message.learning.addrecordsuccess  =The record was added successfully.
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java
===================================================================
diff -u -r84151d175a3fce3cd3ff1bd4eeccfd7cbef01802 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java	(.../LearningAction.java)	(revision 84151d175a3fce3cd3ff1bd4eeccfd7cbef01802)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -54,6 +54,8 @@
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.events.DeliveryMethodMail;
+import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -217,6 +219,10 @@
 	Integer totalRecordCount = service.getGroupRecordCount(dacoUser.getSession().getSessionId());
 	sessionMap.put(DacoConstants.ATTR_TOTAL_RECORD_COUNT, totalRecordCount);
 
+	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId, request, getServlet()
+		.getServletContext());
+	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
+	
 	// add define later support
 	if (daco.isDefineLater()) {
 	    return mapping.findForward(DacoConstants.DEFINE_LATER);
@@ -253,6 +259,7 @@
 			isHtmlFormat);
 	    }
 	}
+
 	return mapping.findForward(DacoConstants.SUCCESS);
     }
 
Index: lams_tool_daco/web/pages/learning/learning.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_daco/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_daco/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -85,7 +85,16 @@
 			</c:when>
 			<c:otherwise>
 				<html:link href="#nogo" property="FinishButton" styleId="finishButton" onclick="javascript:finishSession()" styleClass="button">
-					<span class="nextActivity"><fmt:message key="label.learning.finished" /></span>
+					<span class="nextActivity">
+						<c:choose>
+		 					<c:when test="${sessionMap.activityPosition.last}">
+		 						<fmt:message key="label.learning.submit" />
+		 					</c:when>
+		 					<c:otherwise>
+		 		 				<fmt:message key="label.learning.finished" />
+		 					</c:otherwise>
+		 				</c:choose>
+		 			</span>
 				</html:link>
 			</c:otherwise>
 		</c:choose>
Index: lams_tool_daco/web/pages/learning/notebook.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_daco/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_daco/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -41,7 +41,16 @@
 
 			<div class="space-bottom-top align-right">
 				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-					<span class="nextActivity"><fmt:message key="label.learning.finished" /></span>
+					<span class="nextActivity">
+						<c:choose>
+		 					<c:when test="${sessionMap.activityPosition.last}">
+		 						<fmt:message key="label.learning.submit" />
+		 					</c:when>
+		 					<c:otherwise>
+		 		 				<fmt:message key="label.learning.finished" />
+		 					</c:otherwise>
+		 				</c:choose>
+					</span>
 				</html:link>
 			</div>
 		</div>
Index: lams_tool_daco/web/pages/learning/runoffline.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_daco/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_daco/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -73,7 +73,16 @@
 				<c:otherwise>
 					<html:link href="#nogo" property="FinishButton" styleId="finishButton"
 						onclick="return finishSession()" styleClass="button">
-						<span class="nextActivity"><fmt:message key="label.learning.finished" /></span>
+						<span class="nextActivity">
+							<c:choose>
+			 					<c:when test="${sessionMap.activityPosition.last}">
+			 						<fmt:message key="label.learning.submit" />
+			 					</c:when>
+			 					<c:otherwise>
+			 		 				<fmt:message key="label.learning.finished" />
+			 					</c:otherwise>
+			 				</c:choose>
+						</span>
 					</html:link>
 				</c:otherwise>
 			</c:choose>
Index: lams_tool_dimdim/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r7bb18278d88ece8eb4f86532540d5d366597fe3b -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_dimdim/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7bb18278d88ece8eb4f86532540d5d366597fe3b)
+++ lams_tool_dimdim/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -22,6 +22,7 @@
 button.cancel  =Cancel
 button.save  =Save
 button.finish  =Next Activity
+button.submit =Finish
 button.instructions  =Instructions
 button.continue = Continue
 button.edit = Edit
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java
===================================================================
diff -u -rf306ad22ebabae954c9afe13eac62954ee162663 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java	(.../LearningAction.java)	(revision f306ad22ebabae954c9afe13eac62954ee162663)
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -35,6 +35,7 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.actions.DispatchAction;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -185,8 +186,10 @@
 	    lrnForm.setEntryText(notebookEntry.getEntry());
 	}
 
+	LearningWebUtil.putActivityPositionInRequestByToolSessionId(lrnForm.getToolSessionID(), request, getServlet()
+		.getServletContext());
+	
 	return mapping.findForward("notebook");
-
     }
 
     public ActionForward openPreviewMeeting(ActionMapping mapping, ActionForm form, HttpServletRequest request,
@@ -285,6 +288,9 @@
 
 	request.setAttribute(Constants.ATTR_CONTENT_DTO, contentDTO);
 
+	LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet()
+		.getServletContext());
+
 	// Set the content in use flag.
 	if (!dimdim.isContentInUse()) {
 	    dimdim.setContentInUse(true);
Index: lams_tool_dimdim/web/pages/learning/notebook.jsp
===================================================================
diff -u -rfe43b12d31adee5cde99ef1a2ac42125211b2004 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_dimdim/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision fe43b12d31adee5cde99ef1a2ac42125211b2004)
+++ lams_tool_dimdim/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -25,7 +25,14 @@
 			<html:hidden property="dispatch" value="submitReflection" />
 			<html:hidden property="toolSessionID" />
 			<html:submit styleClass="button" styleId="finishButton">
-				<fmt:message>button.finish</fmt:message>
+				<c:choose>
+ 					<c:when test="${activityPosition.last}">
+ 						<fmt:message key="button.submit" />
+ 					</c:when>
+ 					<c:otherwise>
+ 		 				<fmt:message key="button.finish" />
+ 					</c:otherwise>
+	 			</c:choose>
 			</html:submit>
 		</div>
 	</html:form>
Index: lams_tool_dimdim/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -rfe43b12d31adee5cde99ef1a2ac42125211b2004 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_dimdim/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision fe43b12d31adee5cde99ef1a2ac42125211b2004)
+++ lams_tool_dimdim/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -57,7 +57,14 @@
 			<c:otherwise>
 				<html:hidden property="dispatch" value="finishActivity" />
 				<html:submit styleClass="button" styleId="finishButton">
-					<fmt:message key="button.finish" />
+					<c:choose>
+	 					<c:when test="${activityPosition.last}">
+	 						<fmt:message key="button.submit" />
+	 					</c:when>
+	 					<c:otherwise>
+	 		 				<fmt:message key="button.finish" />
+	 					</c:otherwise>
+		 			</c:choose>
 				</html:submit>
 			</c:otherwise>
 		</c:choose>
Index: lams_tool_dimdim/web/pages/learning/runOffline.jsp
===================================================================
diff -u -rd5314b799a1d54d0a172c05468a6ec63efc6c514 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_dimdim/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision d5314b799a1d54d0a172c05468a6ec63efc6c514)
+++ lams_tool_dimdim/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -23,7 +23,14 @@
 
 			<div align="right" class="space-bottom-top">
 				<html:submit styleClass="button" styleId="finishButton">
-					<fmt:message>button.finish</fmt:message>
+					<c:choose>
+	 					<c:when test="${activityPosition.last}">
+	 						<fmt:message key="button.submit" />
+	 					</c:when>
+	 					<c:otherwise>
+	 		 				<fmt:message key="button.finish" />
+	 					</c:otherwise>
+		 			</c:choose>
 				</html:submit>
 			</div>
 		</html:form>
Index: lams_tool_eadventure/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rd64e745f43f56f59cbfe3e4f21613d1cbe0f0783 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_eadventure/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision d64e745f43f56f59cbfe3e4f21613d1cbe0f0783)
+++ lams_tool_eadventure/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -132,6 +132,7 @@
 error.attachment.executable  =The uploaded file is executable, please zip it before uploading.
 lable.learning.minimum.view.number.less  =You must view at least another {0} of the resources.
 label.finished  =Next Activity
+label.submit =Finish
 label.finish  =Finished
 error.msg.repository  =A repository error occurred while trying to upload the file.
 monitoring.label.attachments  =Attachments
Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/LearningAction.java
===================================================================
diff -u -r7322054ababd8f5387c3424cdd38d99c3ab49e02 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/LearningAction.java	(.../LearningAction.java)	(revision 7322054ababd8f5387c3424cdd38d99c3ab49e02)
+++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -49,6 +49,8 @@
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
 import org.lamsfoundation.lams.events.DeliveryMethodMail;
+import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -266,7 +268,10 @@
 	//}
 	sessionMap.put(EadventureConstants.ATTR_EADVENTURE, eadventure);
 
-	
+	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId,
+		request, getServlet().getServletContext());
+	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
+
 	return mapping.findForward(EadventureConstants.SUCCESS);
     }
 
Index: lams_tool_eadventure/web/pages/learning/learning.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_eadventure/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_eadventure/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -171,7 +171,16 @@
 					<c:otherwise>
 						<html:link href="#nogo" property="FinishButton" styleId="finishButton"
 							onclick="return finishSession()" styleClass="button">
-							<span class="nextActivity"><fmt:message key="label.finished" /></span>
+							<span class="nextActivity">
+								<c:choose>
+				 					<c:when test="${sessionMap.activityPosition.last}">
+				 						<fmt:message key="label.submit" />
+				 					</c:when>
+				 					<c:otherwise>
+				 		 				<fmt:message key="label.finished" />
+				 					</c:otherwise>
+				 				</c:choose>
+							</span>
 						</html:link>
 					</c:otherwise>
 				</c:choose>
Index: lams_tool_eadventure/web/pages/learning/notebook.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_eadventure/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_eadventure/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -43,7 +43,16 @@
 
 			<div class="space-bottom-top align-right">
 				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-					<span class="nextActivity"><fmt:message key="label.finished" /></span>
+					<span class="nextActivity">								
+						<c:choose>
+		 					<c:when test="${sessionMap.activityPosition.last}">
+		 						<fmt:message key="label.submit" />
+		 					</c:when>
+		 					<c:otherwise>
+		 		 				<fmt:message key="label.finished" />
+		 					</c:otherwise>
+		 				</c:choose>
+				 	</span>
 				</html:link>
 			</div>
 		</div>
Index: lams_tool_eadventure/web/pages/learning/runoffline.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_eadventure/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_eadventure/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -71,7 +71,16 @@
 				<c:otherwise>
 					<html:link href="#nogo" property="FinishButton" styleId="finishButton"
 						onclick="return finishSession()" styleClass="button">
-						<span class="nextActivity"><fmt:message key="label.finished" /></span>
+						<span class="nextActivity">								
+							<c:choose>
+			 					<c:when test="${sessionMap.activityPosition.last}">
+			 						<fmt:message key="label.submit" />
+			 					</c:when>
+			 					<c:otherwise>
+			 		 				<fmt:message key="label.finished" />
+			 					</c:otherwise>
+			 				</c:choose>
+				 			</span>
 					</html:link>
 				</c:otherwise>
 			</c:choose>
Index: lams_tool_forum/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rf1e0b7ce7d91dd9bb8c03647456beec2be16b612 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_forum/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f1e0b7ce7d91dd9bb8c03647456beec2be16b612)
+++ lams_tool_forum/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -93,6 +93,7 @@
 label.reply  =Reply
 label.done  =Done
 label.finish  =Next Activity
+label.submit =Finish
 label.newtopic  =New Topic
 label.refresh  =Refresh
 lable.char.left  =Characters left
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
diff -u -r84151d175a3fce3cd3ff1bd4eeccfd7cbef01802 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 84151d175a3fce3cd3ff1bd4eeccfd7cbef01802)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -51,6 +51,8 @@
 import org.apache.tomcat.util.json.JSONException;
 import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.events.IEventNotificationService;
+import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -232,6 +234,10 @@
 	sessionMap.put(ForumConstants.ATTR_MINIMUM_REPLY, forum.getMinimumReply());
 	sessionMap.put(ForumConstants.ATTR_MAXIMUM_REPLY, forum.getMaximumReply());
 
+	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId,
+		request, getServlet().getServletContext());
+	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
+	
 	// Should we show the reflection or not? We shouldn't show it when the screen is accessed
 	// from the Monitoring Summary screen, but we should when accessed from the Learner Progress screen.
 	// Need to constantly past this value on, rather than hiding just the once, as the View Forum
Index: lams_tool_forum/web/jsps/learning/mobile/notebook.jsp
===================================================================
diff -u -r2f83752e6628b60cea3e329b1fd6ff2d78c93eff -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_forum/web/jsps/learning/mobile/notebook.jsp	(.../notebook.jsp)	(revision 2f83752e6628b60cea3e329b1fd6ff2d78c93eff)
+++ lams_tool_forum/web/jsps/learning/mobile/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -39,7 +39,16 @@
 	<div data-role="footer" data-theme="b" class="ui-bar">
 		<span class="ui-finishbtn-right">
 			<a  href="#nogo" id="finishButton" onclick="submitForm('finish')" data-role="button" data-icon="arrow-r" data-theme="b">
-				<span class="nextActivity"><fmt:message key="label.finish" /></span>
+				<span class="nextActivity">
+					<c:choose>
+	 					<c:when test="${sessionMap.activityPosition.last}">
+	 						<fmt:message key="label.submit" />
+	 					</c:when>
+	 					<c:otherwise>
+	 		 				<fmt:message key="label.finish" />
+	 					</c:otherwise>
+	 				</c:choose>
+			 	</span>
 			</a>
 		</span>
 	</div>
Index: lams_tool_forum/web/jsps/learning/mobile/runoffline.jsp
===================================================================
diff -u -rdb44c0602e8fa1b68b2ebce18a58a3d8215cc61b -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_forum/web/jsps/learning/mobile/runoffline.jsp	(.../runoffline.jsp)	(revision db44c0602e8fa1b68b2ebce18a58a3d8215cc61b)
+++ lams_tool_forum/web/jsps/learning/mobile/runoffline.jsp	(.../runoffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -55,7 +55,16 @@
 			<c:otherwise>
 				<a href="#nogo"  name="finish" id="finish"
 					onclick="submitFinish();" data-role="button" data-icon="arrow-r" data-theme="b">
-					<span class="nextActivity"><fmt:message key="label.finish" /></span>
+					<span class="nextActivity">
+						<c:choose>
+		 					<c:when test="${sessionMap.activityPosition.last}">
+		 						<fmt:message key="label.submit" />
+		 					</c:when>
+		 					<c:otherwise>
+		 		 				<fmt:message key="label.finish" />
+		 					</c:otherwise>
+		 				</c:choose>
+			 		</span>
 				</a>
 			</c:otherwise>
 		</c:choose>
Index: lams_tool_forum/web/jsps/learning/mobile/viewforum.jsp
===================================================================
diff -u -r5e70d68fb59c6fc0d52a583b59901a391070e9fc -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_forum/web/jsps/learning/mobile/viewforum.jsp	(.../viewforum.jsp)	(revision 5e70d68fb59c6fc0d52a583b59901a391070e9fc)
+++ lams_tool_forum/web/jsps/learning/mobile/viewforum.jsp	(.../viewforum.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -145,7 +145,14 @@
 		
 						<c:otherwise>
 							<button name="finish" id="finishForum" data-icon="arrow-r" onclick="finishForum();">
-								<fmt:message key="label.finish" />
+								<c:choose>
+				 					<c:when test="${sessionMap.activityPosition.last}">
+				 						<fmt:message key="label.submit" />
+				 					</c:when>
+				 					<c:otherwise>
+				 		 				<fmt:message key="label.finish" />
+				 					</c:otherwise>
+				 				</c:choose>
 							</button>
 						</c:otherwise>
 					</c:choose>
Index: lams_tool_forum/web/jsps/learning/notebook.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_forum/web/jsps/learning/notebook.jsp	(.../notebook.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_forum/web/jsps/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -33,7 +33,16 @@
 
 		<div class="space-bottom-top align-right">
 			<html:link  href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-				<span class="nextActivity"><fmt:message key="label.finish" /></span>
+				<span class="nextActivity">
+					<c:choose>
+	 					<c:when test="${sessionMap.activityPosition.last}">
+	 						<fmt:message key="label.submit" />
+	 					</c:when>
+	 					<c:otherwise>
+	 		 				<fmt:message key="label.finish" />
+	 					</c:otherwise>
+	 				</c:choose>
+	 			</span>
 			</html:link>
 		</div>
 
Index: lams_tool_forum/web/jsps/learning/runoffline.jsp
===================================================================
diff -u -rdb44c0602e8fa1b68b2ebce18a58a3d8215cc61b -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_forum/web/jsps/learning/runoffline.jsp	(.../runoffline.jsp)	(revision db44c0602e8fa1b68b2ebce18a58a3d8215cc61b)
+++ lams_tool_forum/web/jsps/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -50,7 +50,16 @@
 			<c:otherwise>
 				<html:link href="#nogo"  property="finish" styleId="finish"
 					onclick="submitFinish();" styleClass="button">
-					<span class="nextActivity"><fmt:message key="label.finish" /></span>
+					<span class="nextActivity">
+						<c:choose>
+		 					<c:when test="${sessionMap.activityPosition.last}">
+		 						<fmt:message key="label.submit" />
+		 					</c:when>
+		 					<c:otherwise>
+		 		 				<fmt:message key="label.finish" />
+		 					</c:otherwise>
+		 				</c:choose>
+			 		</span>
 				</html:link>
 			</c:otherwise>
 		</c:choose>
Index: lams_tool_forum/web/jsps/learning/viewforum.jsp
===================================================================
diff -u -rf1e0b7ce7d91dd9bb8c03647456beec2be16b612 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision f1e0b7ce7d91dd9bb8c03647456beec2be16b612)
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -188,7 +188,16 @@
 				<c:otherwise>
 					<html:link href="#nogo" property="finish" styleId="finish"
 						onclick="submitFinish();" styleClass="button">
-						<span class="nextActivity"><fmt:message key="label.finish" /></span>
+						<span class="nextActivity">
+							<c:choose>
+			 					<c:when test="${sessionMap.activityPosition.last}">
+			 						<fmt:message key="label.submit" />
+			 					</c:when>
+			 					<c:otherwise>
+			 		 				<fmt:message key="label.finish" />
+			 					</c:otherwise>
+			 				</c:choose>
+						</span>
 					</html:link>
 				</c:otherwise>
 
Index: lams_tool_gmap/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -re9f3814b6b6ca31db204710d2eed84d6339807da -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_gmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e9f3814b6b6ca31db204710d2eed84d6339807da)
+++ lams_tool_gmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -98,6 +98,7 @@
 authoring.msg.cancel.save  =Do you want to close this window without saving?
 button.try.again  =Try Again
 button.finish  =Next Activity
+button.submit =Finish
 message.alertContentEdit  =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information.
 error.cantLoadMap  =Could not load map.
 error.gmapKeyMissing  =LAMS does not have a Google Maps API key set up, please contact your system administrator.
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
===================================================================
diff -u -r228482c7a091c7691a9fc9651e46a8d98e29a6e1 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 228482c7a091c7691a9fc9651e46a8d98e29a6e1)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -33,6 +33,7 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.ToolSessionManager;
@@ -124,6 +125,9 @@
 			gmapService.saveOrUpdateGmap(gmap);
 		}
 
+		LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet()
+			.getServletContext());
+		
 		// check runOffline
 		if (gmap.isRunOffline()) {
 			return mapping.findForward("runOffline");
@@ -308,6 +312,9 @@
 			lrnForm.setEntryText(notebookEntry.getEntry());
 		}
 
+        	LearningWebUtil.putActivityPositionInRequestByToolSessionId(lrnForm.getToolSessionID(), request, getServlet()
+        		.getServletContext());
+
 		return mapping.findForward("notebook");
 	}
 	
Index: lams_tool_gmap/web/pages/learning/notebook.jsp
===================================================================
diff -u -r74b71c544bb3970571e885fd2e56fb22c9880f19 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_gmap/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 74b71c544bb3970571e885fd2e56fb22c9880f19)
+++ lams_tool_gmap/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -46,7 +46,16 @@
 					<html:hidden property="dispatch" value="submitReflection" />
 					<html:link href="#nogo" styleClass="button" styleId="finishButton" 
 				          onclick="javascript:document.learningForm.submit();return false">
-						<span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
+						<span class="nextActivity">
+							<c:choose>
+			 					<c:when test="${activityPosition.last}">
+			 						<fmt:message key="button.submit" />
+			 					</c:when>
+			 					<c:otherwise>
+			 		 				<fmt:message key="button.finish" />
+			 					</c:otherwise>
+				 			</c:choose>
+			 			</span>
 					</html:link>
 				</div>
 			</html:form>
Index: lams_tool_gmap/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_gmap/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_gmap/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -58,16 +58,18 @@
 			<c:otherwise>
 				<html:hidden property="dispatch" value="finishActivity" />
 				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="javascript:saveAndFinish();">
-					<span class="nextActivity"><fmt:message key="button.finish" /></span>
+					<span class="nextActivity">
+						<c:choose>
+		 					<c:when test="${activityPosition.last}">
+		 						<fmt:message key="button.submit" />
+		 					</c:when>
+		 					<c:otherwise>
+		 		 				<fmt:message key="button.finish" />
+		 					</c:otherwise>
+			 			</c:choose>
+					</span>
 				</html:link>
 			</c:otherwise>
 		</c:choose>
 	</div>
-</html:form>
-
-
-
-
-
-
-
+</html:form>
\ No newline at end of file
Index: lams_tool_gmap/web/pages/learning/runOffline.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_gmap/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_gmap/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -17,7 +17,16 @@
 			<div align="right" class="space-bottom-top">
 				<html:link href="#nogo" styleClass="button" styleId="finishButton" 
 				onclick="javascript:document.learningForm.submit();return false">
-					<span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
+					<span class="nextActivity">
+						<c:choose>
+		 					<c:when test="${activityPosition.last}">
+		 						<fmt:message key="button.submit" />
+		 					</c:when>
+		 					<c:otherwise>
+		 		 				<fmt:message key="button.finish" />
+		 					</c:otherwise>
+			 			</c:choose>
+			 		</span>
 				</html:link>
 			</div>
 		</html:form>
Index: lams_tool_images/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r6c3643025f8eee1bf841571e5694616aad17da32 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_images/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6c3643025f8eee1bf841571e5694616aad17da32)
+++ lams_tool_images/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -156,6 +156,7 @@
 button.close  =Close
 label.monitoring.heading.access  =Learners list
 label.finished  =Next Activity
+label.submit =Finish
 label.finish  =Finished
 error.msg.repository  =A repository error occurred while trying to upload the file.
 message.alertContentEdit  =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information.
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java
===================================================================
diff -u -r84151d175a3fce3cd3ff1bd4eeccfd7cbef01802 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	(.../LearningAction.java)	(revision 84151d175a3fce3cd3ff1bd4eeccfd7cbef01802)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -49,6 +49,8 @@
 import org.apache.struts.config.ForwardConfig;
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.events.DeliveryMethodMail;
+import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -215,7 +217,7 @@
 		.getConfigValue()));
 	sessionMap.put(ImageGalleryConstants.ATTR_THUMBNAIL_IMAGE_DIMENSIONS, Integer
 		.parseInt(thumbnailImageDimensionsKey.getConfigValue()));
-
+	
 	// add define later support
 	if (imageGallery.isDefineLater()) {
 	    return mapping.findForward("defineLater");
@@ -226,6 +228,10 @@
 	imageGallery.setDefineLater(false);
 	service.saveOrUpdateImageGallery(imageGallery);
 
+	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId,
+		request, getServlet().getServletContext());
+	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
+	
 	// add run offline support
 	if (imageGallery.getRunOffline()) {
 	    sessionMap.put(ImageGalleryConstants.PARAM_RUN_OFFLINE, true);
Index: lams_tool_images/web/pages/learning/learning.jsp
===================================================================
diff -u -rc506321acd42b815377150658dfbbb0d35591169 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision c506321acd42b815377150658dfbbb0d35591169)
+++ lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -481,7 +481,16 @@
 					</c:when>
 					<c:otherwise>
 						<html:link href="#nogo" property="FinishButton" styleId="finishButton"	onclick="return finishSession()" styleClass="button" >
-							<span class="nextActivity"><fmt:message key="label.finished" /></span>
+							<span class="nextActivity">
+								<c:choose>
+				 					<c:when test="${sessionMap.activityPosition.last}">
+				 						<fmt:message key="label.submit" />
+				 					</c:when>
+				 					<c:otherwise>
+				 		 				<fmt:message key="label.finished" />
+				 					</c:otherwise>
+				 				</c:choose>
+							</span>
 						</html:link>
 					</c:otherwise>
 				</c:choose>
Index: lams_tool_images/web/pages/learning/notebook.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_images/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_images/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -43,7 +43,16 @@
 
 			<div class="space-bottom-top align-right">
 				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-					<span class="nextActivity"><fmt:message key="label.finished" /></span>
+					<span class="nextActivity">
+						<c:choose>
+		 					<c:when test="${sessionMap.activityPosition.last}">
+		 						<fmt:message key="label.submit" />
+		 					</c:when>
+		 					<c:otherwise>
+		 		 				<fmt:message key="label.finished" />
+		 					</c:otherwise>
+		 				</c:choose>
+		 			</span>
 				</html:link>
 			</div>
 		</div>
Index: lams_tool_images/web/pages/learning/runoffline.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_images/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_images/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -70,7 +70,16 @@
 				</c:when>
 				<c:otherwise>
 					<html:link href="#nogo" property="FinishButton" styleId="finishButton"	onclick="return finishSession()" styleClass="button">
-						<span class="nextActivity"><fmt:message key="label.finished" /></span>
+						<span class="nextActivity">
+							<c:choose>
+			 					<c:when test="${sessionMap.activityPosition.last}">
+			 						<fmt:message key="label.submit" />
+			 					</c:when>
+			 					<c:otherwise>
+			 		 				<fmt:message key="label.finished" />
+			 					</c:otherwise>
+			 				</c:choose>
+				 		</span>
 					</html:link>
 				</c:otherwise>
 			</c:choose>
Index: lams_tool_imscc/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -re9f3814b6b6ca31db204710d2eed84d6339807da -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_imscc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e9f3814b6b6ca31db204710d2eed84d6339807da)
+++ lams_tool_imscc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -136,6 +136,7 @@
 label.export.reflection  =Notebook Entries
 label.finish  =Finished
 label.finished  =Next Activity
+label.submit =Finish
 label.hide  =Hide
 label.learning.comment.or.instruction  =Comment/Instruction
 label.learning.heading  =Common Cartridge
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java	(.../LearningAction.java)	(revision 7f68f72a3d80b8e24ba596d34ccea104ca285d05)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -44,6 +44,8 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
+import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -190,6 +192,10 @@
 	commonCartridge.setDefineLater(false);
 	service.saveOrUpdateCommonCartridge(commonCartridge);
 
+	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId,
+		request, getServlet().getServletContext());
+	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
+
 	// add run offline support
 	if (commonCartridge.getRunOffline()) {
 	    sessionMap.put(CommonCartridgeConstants.PARAM_RUN_OFFLINE, true);
Index: lams_tool_imscc/web/pages/learning/learning.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_imscc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_imscc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -142,7 +142,16 @@
 					</c:when>
 					<c:otherwise>
 						<html:link href="#nogo" property="FinishButton" styleId="finishButton" onclick="return finishSession()" styleClass="button">
-							<span class="nextActivity"><fmt:message key="label.finished" /></span>
+							<span class="nextActivity">
+								<c:choose>
+				 					<c:when test="${sessionMap.activityPosition.last}">
+				 						<fmt:message key="label.submit" />
+				 					</c:when>
+				 					<c:otherwise>
+				 		 				<fmt:message key="label.finished" />
+				 					</c:otherwise>
+				 				</c:choose>
+							</span>
 						</html:link>
 					</c:otherwise>
 				</c:choose>
Index: lams_tool_imscc/web/pages/learning/notebook.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_imscc/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_imscc/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -43,7 +43,16 @@
 
 			<div class="space-bottom-top align-right">
 				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-					<span class="nextActivity"><fmt:message key="label.finished" /></span>
+					<span class="nextActivity">
+						<c:choose>
+		 					<c:when test="${sessionMap.activityPosition.last}">
+		 						<fmt:message key="label.submit" />
+		 					</c:when>
+		 					<c:otherwise>
+		 		 				<fmt:message key="label.finished" />
+		 					</c:otherwise>
+		 				</c:choose>
+		 			</span>
 				</html:link>
 			</div>
 		</div>
Index: lams_tool_imscc/web/pages/learning/runoffline.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_imscc/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_imscc/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -71,7 +71,16 @@
 				<c:otherwise>
 					<html:link href="#nogo" property="FinishButton" styleId="finishButton"
 						onclick="return finishSession()" styleClass="button">
-						<span class="nextActivity"><fmt:message key="label.finished" /></span>
+						<span class="nextActivity">
+							<c:choose>
+			 					<c:when test="${sessionMap.activityPosition.last}">
+			 						<fmt:message key="label.submit" />
+			 					</c:when>
+			 					<c:otherwise>
+			 		 				<fmt:message key="label.finished" />
+			 					</c:otherwise>
+			 				</c:choose>
+				 		</span>
 					</html:link>
 				</c:otherwise>
 			</c:choose>
Index: lams_tool_kaltura/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r8b6dcc5904e996594d3bf75d4f67a7292234717d -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_kaltura/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 8b6dcc5904e996594d3bf75d4f67a7292234717d)
+++ lams_tool_kaltura/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -46,6 +46,7 @@
 button.cancel  =Cancel
 button.save  =Save
 button.finish  =Next Activity
+button.submit =Submit
 label.created  =Created
 label.lastModified  =Last modified
 label.notebookEntry  =Notebook entry
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java
===================================================================
diff -u -r3309f36be5a5b01643991adcccbb1a7045e3b4ea -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 3309f36be5a5b01643991adcccbb1a7045e3b4ea)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -47,6 +47,8 @@
 import org.apache.struts.action.ActionRedirect;
 import org.apache.tomcat.util.json.JSONException;
 import org.apache.tomcat.util.json.JSONObject;
+import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -142,6 +144,10 @@
 	    service.saveOrUpdateKaltura(kaltura);
 	}
 
+	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionId, request, getServlet()
+		.getServletContext());
+	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
+	
 	// check runOffline
 	if (kaltura.isRunOffline()) {
 	    return mapping.findForward("runOffline");
Index: lams_tool_kaltura/web/pages/authoring/advanced.jsp
===================================================================
diff -u -r5fd453ea4cb0fa72cb94a5706e75f68a319de46b -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_kaltura/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 5fd453ea4cb0fa72cb94a5706e75f68a319de46b)
+++ lams_tool_kaltura/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -5,21 +5,47 @@
 <script lang="javascript">
 	$(document).ready(function(){
 		$("#allowContributeVideos").click(function() {
-			if ($('#allowContributeVideos').is(':checked')) {
+			if ($(this).is(':checked')) {
 				$("#allowSeeingOtherUsersRecordings").prop("disabled", false);
 				$("#learnerContributionLimit").prop("disabled", false);
+				$("#allow-teacher-cue-points").prop("disabled", false);
 			} else {
 				$("#allowSeeingOtherUsersRecordings").prop("disabled", true);
 				$("#allowSeeingOtherUsersRecordings").prop("checked", false);
 				$("#learnerContributionLimit").prop("disabled", true);
 				$("#learnerContributionLimit").prop("value", -1);
+				$("#allow-teacher-cue-points").prop("checked", false);
+				$("#allow-teacher-cue-points").prop("disabled", true);
 			}
 		});
 		
 		<c:if test="${!formBean.allowContributeVideos}">
 			$("#allowSeeingOtherUsersRecordings").prop("disabled", true);
 			$("#learnerContributionLimit").prop("disabled", true);
+			$("#allow-teacher-cue-points").prop("disabled", true);
 		</c:if>
+		
+		//time stamped comments
+		<c:choose>
+			<c:when test="${formBean.allowTeacherCuePoints || formBean.allowLernerCuePoints}">
+				$("#allow-time-stamped-comments").prop("checked", true);
+			</c:when>
+			<c:otherwise>
+				$('#allow-time-stamped-comments-area').css("display", "none");
+			</c:otherwise>
+		</c:choose>
+		$("#allow-time-stamped-comments").click(function(){
+			$('#allow-time-stamped-comments-area').toggle('slow');
+			$('#allow-lerner-cue-points').prop("checked", false);
+			$('#allow-teacher-cue-points').prop("checked", false);
+		});
+		$("#allow-teacher-cue-points").click(function(){
+			$('#allow-lerner-cue-points').prop("checked", false);
+		});
+		$("#allow-lerner-cue-points").click(function(){
+			$('#allow-teacher-cue-points').prop("checked", false);
+		});
+		
 	});
 
 </script>
@@ -67,6 +93,27 @@
 	</html:select>
 </p>
 
+<p class="small-space-top">
+
+	<input type="checkbox" value="" id="allow-time-stamped-comments" class="noBorder">
+	<label for="allow-time-stamped-comments">
+		<fmt:message key="label.time.stamped.comments" />
+	</label>
+
+	<div id="allow-time-stamped-comments-area" style="padding-left: 50px;">
+		<html:radio property="allowTeacherCuePoints" value="true" styleClass="noBorder" styleId="allow-teacher-cue-points" />
+		<label for="allow-teacher-cue-points">
+			<fmt:message key="label.teacher.can.leave.personal.comments" />
+		</label>
+		<br><br>
+	
+		<html:radio property="allowLernerCuePoints" value="true" styleClass="noBorder" styleId="allow-lerner-cue-points" />
+		<label for="allow-lerner-cue-points">
+			<fmt:message key="label.allow.lerners.create.cue.points" />
+		</label>
+	</div>
+</p>
+
 <p>
 	<html:checkbox property="allowComments" value="1" styleClass="noBorder" styleId="allowComments"/>
 	<label for="allowComments">
Index: lams_tool_kaltura/web/pages/learning/cuepoints.jsp
===================================================================
diff -u
--- lams_tool_kaltura/web/pages/learning/cuepoints.jsp	(revision 0)
+++ lams_tool_kaltura/web/pages/learning/cuepoints.jsp	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -0,0 +1,203 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.util.Configuration" %>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
+
+<c:set var="KALTURA_SERVER"><%=Configuration.get(ConfigurationKeys.KALTURA_SERVER)%></c:set>
+<c:set var="PARTNER_ID"><%=Configuration.get(ConfigurationKeys.KALTURA_PARTNER_ID)%></c:set>
+<c:set var="SUB_PARTNER_ID"><%=Configuration.get(ConfigurationKeys.KALTURA_SUB_PARTNER_ID)%></c:set>
+<c:set var="USER_SECRET"><%=Configuration.get(ConfigurationKeys.KALTURA_USER_SECRET)%></c:set>
+<c:set var="KCW_UI_CONF_ID"><%=Configuration.get(ConfigurationKeys.KALTURA_KCW_UI_CONF_ID)%></c:set>
+<c:set var="KDP_UI_CONF_ID"><%=Configuration.get(ConfigurationKeys.KALTURA_KDP_UI_CONF_ID)%></c:set>
+
+<c:if test="${not empty param.sessionMapID}">
+	<c:set var="sessionMapID" value="${param.sessionMapID}" />
+</c:if>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+
+<lams:html>
+<lams:head>
+	<lams:css />
+		
+	<link rel="stylesheet" href="includes/css/bootstrap.css"> 
+	<link href="<lams:LAMSURL/>css/jquery-ui-smoothness-theme.css" rel="stylesheet">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui.timepicker.css">
+	<style media="screen,projection" type="text/css">
+		#content {width: 90%; margin-top: 10px;}
+		.row .span8 {width: 410px;}
+		.row .span4 {width: 300px;}
+		#kplayer { height:360px; width:400px;}
+		h2 { margin-bottom:5px;}
+		h3 {color:black;}
+		#related_files { width:100%; margin-top:-10px;}
+		#related_files label { text-align:left; white-space:nowrap; cursor:pointer;}
+		#related_files input { cursor:default;}
+		#timeline {height:140px; width:700px; margin-top: 30px; display:none;}
+		#timeline-container{ height:140px;}
+		#create-actions { margin: 15px 0 5px; text-align:center; width: 700px;}
+		#create-actions button.btn { margin-left:10px; #padding-bottom:5px;}
+		#cuepoint-comment-container, #cuepoint-comment-container textarea {width: 270px;}
+		#comment-author {float:right; font-style: italic; margin-bottom: 10px; color: grey; margin-right: -8px; margin-top: 5px;}
+		.ui-datepicker-current {visibility: hidden;}
+		#duration {width: 70px;}
+	</style>
+	
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/common.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.timepicker.js"></script>
+	<script type="text/javascript" src="includes/javascript/jquery.tools.flashembed.js"></script>
+	<script type="text/javascript">
+		var previewCuePointsUrl = "<c:url value='/learning.do'/>?dispatch=previewCuePoints&sessionMapID=${sessionMapID}&itemUid=${itemUid}&kalturaSession=${sessionMap.kalturaSession}";
+		var isCreationPhase = true;
+		var userId = "<lams:user property='userID'/>";
+		var userFullName = "<lams:user property='firstName'/> <lams:user property='lastName'/>"
+		var isDisplayCuePointComments = true;
+		var isMonitor = ${sessionMap.isGroupMonitoring == true};
+		var USER_ID  = "${sessionMap.toolSessionID}";//constant used for tracking user info
+	</script>
+	<script type="text/javascript" src="includes/javascript/CodeCuePoints.create.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/kaltura.min.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/swfobject.js"></script>
+		
+	<script type="text/javascript">
+		
+		//Specify Kaltura settings
+		//kaltura server 
+		var KALTURA_SERVER = "${KALTURA_SERVER}";
+		//your actual parner id
+		var PARTNER_ID = "${PARTNER_ID}";
+		//your actual subparner id
+		var SUB_PARTNER_ID = "${SUB_PARTNER_ID}";
+		//your actual user secret
+		var USER_SECRET = "${USER_SECRET}";
+		//ui_conf_id of Kaltura Contribution Wizard(KCW)
+		var KCW_UI_CONF_ID = "${KCW_UI_CONF_ID}";
+		//ui_conf_id of Kaltura Dynamic Player(KDP)
+		var KDP_UI_CONF_ID = "${KDP_UI_CONF_ID}";
+		var KCLIP_UI_CONF_ID = "5730131";
+			
+		$(document).ready(function(){
+			
+			$("#duration").datetimepicker({
+				timeText: "Duration",
+				timeOnlyTitle: "Choose Duration",
+				showHour: false,
+				showSecond: true,
+				timeOnly: true,
+				timeFormat: "mm:ss",
+				onClose: function(dateText, inst) {
+					KApps.CodeCuePoints.updateCuepoint();
+				}
+			});
+			
+			$("#timeline").css("display", "block");
+			
+			$("#close-button").click(function() {
+				var kplayerDataAttr = $("#kplayer", parent.document).attr("data");
+				$("#kplayer", parent.document).attr("data", kplayerDataAttr);
+				self.parent.tb_remove();
+			});
+
+		});
+		
+		// kclip settings
+		KApps.CodeCuePoints.vars.ks			= "${sessionMap.kalturaSession}";
+		KApps.CodeCuePoints.vars.entry_id	= "${item.entryId}";
+		
+		// kdp configuration
+		var params = {
+			allowscriptaccess: "always",
+			allownetworking: "all",
+			allowfullscreen: "true",
+			wmode: "opaque"
+		};	
+		var flashVars = {
+			entryId:  "${item.entryId}",
+			// enable kdp-js interaction:
+			"externalInterfaceDisabled" : "false",
+			"ks"						: "${sessionMap.kalturaSession}"
+		};
+		swfobject.embedSWF(KALTURA_SERVER + '/kwidget/wid/_' + PARTNER_ID + '/uiconf_id/' + KDP_UI_CONF_ID, "kplayer", "100%", "100%", "9.0.0", "includes/expressInstall.swf", flashVars, params);
+
+	</script>
+</lams:head>
+
+<body class="stripes" onload="parent.resizeIframe();">
+	<div id="content">
+		<h1>
+			${item.title}
+		</h1>
+			
+		<br>
+			
+		<div id="kwrap">
+			<div class="row">
+				<div class="span8 columns">
+					<div id="kplayer">
+					</div>
+
+				</div>
+				<div class="span4 columns">
+					<form id="related_files">
+						<h3><fmt:message key="label.related.comment" /></h3>
+
+						<p><fmt:message key="label.comments.will.appear" /></p>
+						
+						<div id="cuepoint-comment-container">
+							<textarea id="cuepoint-comment" name="cuepoint-comment" rows="5" value="" cols="100" disabled></textarea>
+							
+							<div id="comment-author">&nbsp;</div>
+							
+							<div style="clear: both;">
+							 
+							 	<input type="text" name="duration" id="duration" value="" disabled/>
+							 	
+							 	<span><fmt:message key="label.duration" /></span>
+							</div>
+						</div>
+					</form>
+				</div>
+			</div>
+
+			<div id="timeline-container">
+			<div id="timeline">
+				<script>
+					flashembed("timeline",
+						{ // attributes and params:
+							src				: KALTURA_SERVER + "/kgeneric/ui_conf_id/" + KCLIP_UI_CONF_ID,
+							wmode			: "opaque",
+							bgcolor			: "#f8f8f8",
+							allowNetworking	: "all",
+							version			: [10,0],
+							expressInstall	: "http://cdn.kaltura.org/apis/seo/expressinstall.swf"
+						},
+						{ // flashvars:
+							jsReadyFunc		: "KApps.CodeCuePoints.kclipReady"
+						}
+					);
+				</script>
+			</div>
+			</div>
+			
+			<div id="create-actions">
+				<a href="#nogo" id="save_all" class="button space-left disabled"><fmt:message key="label.save.changes" /></a>
+				<a href="#nogo" id="reload" class="button space-left disabled"><fmt:message key="label.reaload.reset" /></a>
+				<a href="#nogo" id="preview" class="button space-left disabled"><fmt:message key="label.view.finished.result" /></a>
+			</div>
+		</div><!-- #kwrap -->
+			
+		<lams:ImgButtonWrapper>
+			<a href="#nogo" id="close-button" onmousedown="self.focus();" class="button space-left float-right">
+				<fmt:message key="label.close" /> 
+			</a>
+		</lams:ImgButtonWrapper>
+			
+	</div>
+		
+	<div id="footer">
+	</div>
+		
+</body>
+</lams:html>
Index: lams_tool_kaltura/web/pages/learning/learning.jsp
===================================================================
diff -u -r3ee14c9c6217a26b45b3930cb18a15f29a240fee -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_kaltura/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 3ee14c9c6217a26b45b3930cb18a15f29a240fee)
+++ lams_tool_kaltura/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -29,7 +29,7 @@
 	#player-block {  clear: both; position: absolute; top: 0; bottom: 0; left: 0; right: 0;}
 	#dummy {padding-top: 52%; /* aspect ratio */}
 	#player-wrap {width: 60%; height: 100%; clear: both; margin-bottom: 20px; background: black;}
-	#player-bottombar {height:50px; width: 60%; margin-top: 15px; margin-bottom: 10px;}
+	#player-bottombar {height:80px; width: 60%; margin-top: 15px; margin-bottom: 10px;}
 	
 	#comments-area { padding: 5px 0 20px; min-width: 431px; width: 60%;}
 	#comments-table {border-spacing: 3px; margin-top: 0; padding-right: 3px;}
@@ -54,24 +54,33 @@
 	.thumb-title {width: auto; font-size: 12px; font-weight: bold; line-height: 15px; max-height: 30px; color: #333; display: block; margin-bottom: 4px; overflow: hidden; cursor: pointer;}
 	.thumb-stat {display: block; font-size: .9166em; color: #666; line-height: 1.4em; max-height: 1.4em; height: 1.4em; white-space: nowrap; overflow: hidden;}
 	.thumb-text {color: #666;}
+	#cuepoint-comments { height:80px; width: 160%; overflow: auto; font-size: 18px; line-height: 23px; margin-top:15px;  margin-bottom: 10px; display: none;}
+	#add-cue-points{clear: left;}
+	#add-cue-points-link{padding: 5px 15px 5px 25px; background-position-y: 0;}
 </style>	
 
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/instantedit.js"></script>
 <script type="text/javascript">
 	//var for jquery.jRating.js
 	var pathToImageFolder = "<lams:LAMSURL/>images/css/";
 	//var for instantedit.js
 	var urlBase = '<c:url value="/monitoring.do"/>';
+	//vars for CodeCuePoints.create.js
+	var isCreationPhase = false;
+	var isDisplayCuePointComments = ${sessionMap.isDisplayCuePointComments};
 </script>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/thickbox.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.jRating.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/kaltura.min.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/swfobject.js"></script>
 <script type="text/javascript" src="http://cdnbakmi.kaltura.com/html5/html5lib/v1.6.10.4/mwEmbedLoader.php"></script>
+<script type="text/javascript" src="includes/javascript/CodeCuePoints.create.js"></script>
+<script>
 
-<script type="text/javascript">
-	//Kaltura settings
+	//Specify Kaltura settings
 	//kaltura server 
 	var KALTURA_SERVER = "${KALTURA_SERVER}";
 	//your actual parner id
@@ -83,19 +92,111 @@
 	//ui_conf_id of Kaltura Contribution Wizard(KCW)
 	var KCW_UI_CONF_ID = "${KCW_UI_CONF_ID}";
 	//ui_conf_id of Kaltura Dynamic Player(KDP)
-	var KDP_UI_CONF_ID = "${KDP_UI_CONF_ID}";
-
-	var params = {
-		allowscriptaccess: "always",
-		allownetworking: "all",
-		allowfullscreen: "true",
-		wmode: "opaque"
-	};	
-	var flashVars = {
-		entryId:  "${item.entryId}"
-	};	
-	swfobject.embedSWF(KALTURA_SERVER + '/kwidget/wid/_' + PARTNER_ID + '/uiconf_id/' + KDP_UI_CONF_ID, "kplayer", "100%", "100%", "9.0.0", "includes/expressInstall.swf", flashVars, params);
+	var KDP_UI_CONF_ID = "5692401";
+	//constant used for tracking user info
+	var USER_ID  = ${sessionMap.toolSessionID};
 	
+	var kClient;
+	
+	$(document).ready(function(){
+    	initialize();
+    	
+		$(".rating-stars").jRating({
+		    phpPath : "<c:url value='/learning.do'/>?dispatch=rateItem&sessionMapID=${sessionMapID}",
+		    rateMax : 5,
+		    decimalLength : 1,
+			onSuccess : function(data, itemUid){
+			    $("#averageRating" + itemUid).html(data.averageRating);
+			    $("#numberOfVotes" + itemUid).html(data.numberOfVotes);
+			},
+			onError : function(){
+			    jError('Error submitting rating, please retry');
+			}
+		});
+	    $(".rating-stars-disabled").jRating({
+	    	rateMax : 5,
+	    	isDisabled : true
+		});
+	    $(".rating-stars-disabled-small").jRating({
+	    	rateMax : 5,
+	    	type: 'small',
+	    	isDisabled : true
+		});
+	    
+	    //edit mark 
+		setVarsForm("dispatch=markItem&itemUid=${item.uid}");
+		$('#editItemMark').click(function() {
+			editBox(document.getElementById( "itemMark" ));
+		});
+		
+		$("#add-cue-points-link").click(function() {
+			var href = "<c:url value='/learning.do'/>?dispatch=cuePoints&kalturaSession=" + KApps.CodeCuePoints.vars.ks + "&sessionMapID=${sessionMapID}&itemUid=${item.uid}&KeepThis=true&TB_iframe=true&height=440&width=820&modal=true";
+			$("#add-cue-points-link2").attr("href", href);
+			$("#add-cue-points-link2").click();
+		});
+	});
+	
+	function initialize() {
+	
+		//check if LAMS has a Kaltura server configured
+		if ((KALTURA_SERVER == "") || (PARTNER_ID == "") || (USER_SECRET == "") || (KCW_UI_CONF_ID == "")) {
+			alert('<fmt:message key="label.kaltura.server.not.configured"/>');
+			return false;
+		}
+			
+		//start Kaltura session
+		var kConfig = new KalturaConfiguration(parseInt(PARTNER_ID));
+		kConfig.serviceUrl = KALTURA_SERVER;
+		kClient = new KalturaClient(kConfig);
+		var expiry = null;
+		var privileges = null;//"edit:${item.entryId}";
+		kClient.session.start(onSessionCreated, USER_SECRET, USER_ID, KalturaSessionType.USER, PARTNER_ID, expiry, privileges);
+	}
+	
+	function onSessionCreated(isSuccess, kSession) {
+	
+    	if (! isSuccess) {
+    		alert('<fmt:message key="error.there.was.error"/>');
+    		return;
+    	} else if (kSession.code != null) {
+    		alert('<fmt:message key="error.there.was.error"/>: ' + kSession.message);
+    		return;
+    	}
+    	
+    	// kclip settings
+    	KApps.CodeCuePoints.vars.ks			= kSession;
+    	KApps.CodeCuePoints.vars.entry_id	= "${item.entryId}";
+    	
+    	//enable HTML5 support
+		mw.setConfig("Kaltura.ServiceUrl" , KALTURA_SERVER );
+		mw.setConfig("Kaltura.CdnUrl" , KALTURA_SERVER );
+		mw.setConfig("Kaltura.ServiceBase", "/api_v3/index.php?service=");
+		mw.setConfig("EmbedPlayer.EnableIframeApi", true );
+		mw.setConfig("EmbedPlayer.UseFlashOnAndroid", false );
+		mw.setConfig("Kaltura.UseAppleAdaptive", false );
+		mw.setConfig("EmbedPlayer.AttributionButton", false );
+		mw.setConfig("EmbedPlayer.OverlayControls", false ); 
+    	
+    	var params = {
+    		allowscriptaccess: "always",
+    		allownetworking: "all",
+    		allowfullscreen: "true",
+    		wmode: "opaque"
+    	};	
+    	var flashVars = {
+    		entryId:  "${item.entryId}",
+    		// enable kdp-js interaction:
+    		externalInterfaceDisabled : false,
+    		ks						: kSession,
+    		clientTag: (new Date()).getTime(),
+    		jsTraces : true,
+    		requiredMetadataFields : true,
+    		getCuePointsData : true
+    	};
+    	swfobject.embedSWF(KALTURA_SERVER + '/kwidget/wid/_' + PARTNER_ID + '/uiconf_id/' + KDP_UI_CONF_ID, "kplayer", "100%", "100%", "9.0.0", "includes/expressInstall.swf", flashVars, params);
+
+	}
+
 	function finishActivity(){
 		$('#finishButton').prop('disabled', true);
 		document.location.href ='<c:url value="/learning.do"/>?dispatch=finishActivity&sessionMapID=${sessionMapID}';
@@ -177,38 +278,25 @@
 		
 		return false;
 	}
+	
+	function resizeIframe() {
+		if (document.getElementById('TB_iframeContent') != null) {
+		    var height = top.window.innerHeight;
+		    if ( height == undefined || height == 0 ) {
+		    	// IE doesn't use window.innerHeight.
+		    	height = document.documentElement.clientHeight;
+		    	// alert("using clientHeight");
+		    }
+			// alert("doc height "+height);
+		    height -= document.getElementById('TB_iframeContent').offsetTop + 60;
+		    document.getElementById('TB_iframeContent').style.height = height +"px";
+	
+			TB_HEIGHT = height + 28;
+			tb_position();
+		}
+	};
+	window.onresize = resizeIframe;
 
-	$(document).ready(function(){
-		$(".rating-stars").jRating({
-		    phpPath : "<c:url value='/learning.do'/>?dispatch=rateItem&sessionMapID=${sessionMapID}",
-		    rateMax : 5,
-		    decimalLength : 1,
-			onSuccess : function(data, itemUid){
-			    $("#averageRating" + itemUid).html(data.averageRating);
-			    $("#numberOfVotes" + itemUid).html(data.numberOfVotes);
-			},
-			onError : function(){
-			    jError('Error submitting rating, please retry');
-			}
-		});
-	    $(".rating-stars-disabled").jRating({
-	    	rateMax : 5,
-	    	isDisabled : true
-		});
-	    $(".rating-stars-disabled-small").jRating({
-	    	rateMax : 5,
-	    	type: 'small',
-	    	isDisabled : true
-		});
-	    
-	    //edit mark 
-		setVarsForm("dispatch=markItem&itemUid=${item.uid}");
-		$('#editItemMark').click(function() {
-			editBox(document.getElementById( "itemMark" ));
-		});
-
-	});
-
 </script>
 
 <div id="content">
@@ -337,7 +425,7 @@
 	<div id="player-bottombar">
 		
 		<%--"Check for new" and "Add new image" buttons---------------%>
-	
+		<div id="player-bottombar-internal">
 		<div id="add-new-item">
 			<c:if test="${sessionMap.isAllowUpload && (not finishedLock)}">
 				<a href="<c:url value='/pages/learning/uploaditem.jsp'/>?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true&height=570&width=740&modal=true" class="button-add-item thickbox">  
@@ -361,13 +449,33 @@
 				<sup><a href="javascript:;" id="editItemMark"><fmt:message key="label.mark.edit" /></a></sup>
 			</c:if>
 		</div>
-	
+		
 		<!--  Rating stars -->
 	
 		<c:if test="${kaltura.allowRatings && (item.uid != -1)}">
 			<%@ include file="/pages/learning/ratingStars.jsp"%>
 		</c:if>
+		
+			<!--  Add-cue-points -->
+			<c:if test="${not finishedLock && kaltura.allowLearnerCuePoints || (kaltura.allowLearnerCuePoints || kaltura.allowTeacherCuePoints) && sessionMap.isGroupMonitoring }">
+				<div id="add-cue-points">
+					<a href="#nogo" class="button" id="add-cue-points-link">  
+						<fmt:message key="label.add.time.stamped.comments" />
+					</a>
+					<a href="#nogo" class="thickbox" id="add-cue-points-link2" style="display:none;">  
+						
+					</a>
+				</div>
+			</c:if>
+			
+		</div>
+		
+		<div id="cuepoint-comments">
+			
+		</div>
 	</div>
+	
+
 	    	
     <%--Comments area----------------------------------------------%>	
     	
@@ -420,7 +528,16 @@
 				</c:when>
 				<c:otherwise>
 					<html:link href="#nogo" property="FinishButton" styleId="finishButton"	onclick="return finishActivity()" styleClass="button" >
-						<span class="nextActivity"><fmt:message key="button.finish" /></span>
+						<span class="nextActivity">
+							<c:choose>
+			 					<c:when test="${sessionMap.activityPosition.last}">
+			 						<fmt:message key="button.submit" />
+			 					</c:when>
+			 					<c:otherwise>
+			 		 				<fmt:message key="button.finish" />
+			 					</c:otherwise>
+			 				</c:choose>
+			 			</span>
 					</html:link>
 				</c:otherwise>
 			</c:choose>
Index: lams_tool_kaltura/web/pages/learning/mobile/learning.jsp
===================================================================
diff -u -r3fe321a89969f1fd7975a6e74bf77f64241759e7 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_kaltura/web/pages/learning/mobile/learning.jsp	(.../learning.jsp)	(revision 3fe321a89969f1fd7975a6e74bf77f64241759e7)
+++ lams_tool_kaltura/web/pages/learning/mobile/learning.jsp	(.../learning.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -329,7 +329,16 @@
 					</c:when>
 					<c:otherwise>
 						<a href="#nogo" id="finishButton" onclick="return finishActivity()" data-role="button" data-icon="arrow-r" data-theme="b">
-							<span class="nextActivity"><fmt:message key="button.finish" /></span>
+							<span class="nextActivity">
+								<c:choose>
+				 					<c:when test="${sessionMap.activityPosition.last}">
+				 						<fmt:message key="button.submit" />
+				 					</c:when>
+				 					<c:otherwise>
+				 		 				<fmt:message key="button.finish" />
+				 					</c:otherwise>
+				 				</c:choose>
+				 			</span>
 						</a>
 					</c:otherwise>
 				</c:choose>
Index: lams_tool_kaltura/web/pages/learning/mobile/notebook.jsp
===================================================================
diff -u -r8b6dcc5904e996594d3bf75d4f67a7292234717d -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_kaltura/web/pages/learning/mobile/notebook.jsp	(.../notebook.jsp)	(revision 8b6dcc5904e996594d3bf75d4f67a7292234717d)
+++ lams_tool_kaltura/web/pages/learning/mobile/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -36,7 +36,16 @@
 	
 		<div class="space-bottom-top align-right">
 			<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-				<span class="nextActivity"><fmt:message key="button.finish" /></span>
+				<span class="nextActivity">
+					<c:choose>
+	 					<c:when test="${sessionMap.activityPosition.last}">
+	 						<fmt:message key="button.submit" />
+	 					</c:when>
+	 					<c:otherwise>
+	 		 				<fmt:message key="button.finish" />
+	 					</c:otherwise>
+	 				</c:choose>
+	 			</span>
 			</html:link>
 		</div>
 	</html:form>
Index: lams_tool_kaltura/web/pages/learning/mobile/runOffline.jsp
===================================================================
diff -u -r8b6dcc5904e996594d3bf75d4f67a7292234717d -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_kaltura/web/pages/learning/mobile/runOffline.jsp	(.../runOffline.jsp)	(revision 8b6dcc5904e996594d3bf75d4f67a7292234717d)
+++ lams_tool_kaltura/web/pages/learning/mobile/runOffline.jsp	(.../runOffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -51,7 +51,16 @@
 				<html:hidden property="sessionMapID" value="${sessionMapID}"/>
 	
 				<a href="#nogo" id="finishButton" onclick="submitForm('finish')" data-role="button" data-icon="arrow-r" data-theme="b">
-					<span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
+					<span class="nextActivity">
+						<c:choose>
+		 					<c:when test="${sessionMap.activityPosition.last}">
+		 						<fmt:message key="button.submit" />
+		 					</c:when>
+		 					<c:otherwise>
+		 		 				<fmt:message key="button.finish" />
+		 					</c:otherwise>
+		 				</c:choose>
+			 		</span>		
 				</a>
 			</html:form>
 		</c:if>
Index: lams_tool_kaltura/web/pages/learning/notebook.jsp
===================================================================
diff -u -r5fd453ea4cb0fa72cb94a5706e75f68a319de46b -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_kaltura/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 5fd453ea4cb0fa72cb94a5706e75f68a319de46b)
+++ lams_tool_kaltura/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -33,7 +33,16 @@
 
 		<div class="space-bottom-top align-right">
 			<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-				<span class="nextActivity"><fmt:message key="button.finish" /></span>
+				<span class="nextActivity">
+					<c:choose>
+	 					<c:when test="${sessionMap.activityPosition.last}">
+	 						<fmt:message key="button.submit" />
+	 					</c:when>
+	 					<c:otherwise>
+	 		 				<fmt:message key="button.finish" />
+	 					</c:otherwise>
+	 				</c:choose>
+	 			</span>
 			</html:link>
 		</div>
 	</div>
Index: lams_tool_kaltura/web/pages/learning/previewcuepoints.jsp
===================================================================
diff -u
--- lams_tool_kaltura/web/pages/learning/previewcuepoints.jsp	(revision 0)
+++ lams_tool_kaltura/web/pages/learning/previewcuepoints.jsp	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -0,0 +1,128 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.util.Configuration" %>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
+
+<c:set var="KALTURA_SERVER"><%=Configuration.get(ConfigurationKeys.KALTURA_SERVER)%></c:set>
+<c:set var="PARTNER_ID"><%=Configuration.get(ConfigurationKeys.KALTURA_PARTNER_ID)%></c:set>
+<c:set var="SUB_PARTNER_ID"><%=Configuration.get(ConfigurationKeys.KALTURA_SUB_PARTNER_ID)%></c:set>
+<c:set var="USER_SECRET"><%=Configuration.get(ConfigurationKeys.KALTURA_USER_SECRET)%></c:set>
+<c:set var="KCW_UI_CONF_ID"><%=Configuration.get(ConfigurationKeys.KALTURA_KCW_UI_CONF_ID)%></c:set>
+<c:set var="KDP_UI_CONF_ID"><%=Configuration.get(ConfigurationKeys.KALTURA_KDP_UI_CONF_ID)%></c:set>
+
+<c:if test="${not empty param.sessionMapID}">
+	<c:set var="sessionMapID" value="${param.sessionMapID}" />
+</c:if>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+
+<lams:html>
+<lams:head>
+	<lams:css />
+		
+	<link rel="stylesheet" href="includes/css/bootstrap.css">
+	<style media="screen,projection" type="text/css">
+		#content {width: 90%; margin-top: 10px;}
+		.row .span8 {width: 410px;}
+		#kplayer { height:360px; width:400px;}
+		#cuepoint-comments { height:70px; width:700px; overflow: auto; font-size: 18px; line-height: 23px;}
+		#cuepoint-comments-container { height:70px;}
+	</style>
+
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/common.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/kaltura.min.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/swfobject.js"></script>
+	<script type="text/javascript">
+		var isCreationPhase = false;
+		var isDisplayCuePointComments = true;
+	</script>
+	<script src="includes/javascript/CodeCuePoints.create.js"></script>
+	<script>
+	//Specify Kaltura settings
+	//kaltura server 
+	var KALTURA_SERVER = "${KALTURA_SERVER}";
+	//your actual parner id
+	var PARTNER_ID = "${PARTNER_ID}";
+	//your actual subparner id
+	var SUB_PARTNER_ID = "${SUB_PARTNER_ID}";
+	//your actual user secret
+	var USER_SECRET = "${USER_SECRET}";
+	//ui_conf_id of Kaltura Contribution Wizard(KCW)
+	var KCW_UI_CONF_ID = "${KCW_UI_CONF_ID}";
+	//ui_conf_id of Kaltura Dynamic Player(KDP)
+	var KDP_UI_CONF_ID = "5692401";
+	var KCLIP_UI_CONF_ID = "5730131";
+	var USER_ID  = "${sessionMap.toolSessionID}";//constant used for tracking user info
+		
+	$(document).ready(function(){
+		$("#close-button").click(function() {
+			var kplayerDataAttr = $("#kplayer", parent.document).attr("data");
+			$("#kplayer", parent.document).attr("data", kplayerDataAttr);
+			self.parent.tb_remove();
+		});
+		
+		$("#back-to-creation-mode").click(function() {
+			location.href = "<c:url value='/learning.do'/>?dispatch=cuePoints&sessionMapID=${sessionMapID}&itemIndex=${itemIndex}&itemUid=${itemUid}&kalturaSession=${sessionMap.kalturaSession}";
+		});
+	});
+	
+	// kdp configuration
+	var params = {
+		allowscriptaccess: "always",
+		allownetworking: "all",
+		allowfullscreen: "true",
+		wmode: "opaque"
+	};	
+	var flashVars = {
+		entryId:  "${item.entryId}",
+		// enable kdp-js interaction:
+		"externalInterfaceDisabled" : "false",
+		"ks"						: "${sessionMap.kalturaSession}",
+		"autoPlay"					: "true"
+	};
+	swfobject.embedSWF(KALTURA_SERVER + '/kwidget/wid/_' + PARTNER_ID + '/uiconf_id/' + KDP_UI_CONF_ID, "kplayer", "100%", "100%", "9.0.0", "includes/expressInstall.swf", flashVars, params);
+
+	</script>
+		
+</lams:head>
+<body class="stripes" onload="parent.resizeIframe();">
+	<div id="content">
+		<h1>
+			${item.title}
+		</h1>
+			
+		<br>
+			
+		<div id="kwrap">
+			<div class="row">
+				<div class="span8 columns">
+					<div id="kplayer"></div>
+
+				</div>
+			</div>
+			
+			<div id="cuepoint-comments-container">
+				<div id="cuepoint-comments"></div>
+			</div>
+		</div><!-- #kwrap -->
+		<br>
+			
+		<lams:ImgButtonWrapper>
+			<a href="#nogo" id="close-button" onmousedown="self.focus();" class="button space-left float-right">
+				<fmt:message key="label.close" /> 
+			</a>
+			<a href="#nogo" id="back-to-creation-mode" onmousedown="self.focus();" class="button space-left float-right">
+				<fmt:message key="label.back.to.creation.mode" /> 
+			</a>			
+		</lams:ImgButtonWrapper>
+			
+	</div>	
+		
+	<div id="footer">
+	</div>
+		
+</body>
+</lams:html>
+
Index: lams_tool_kaltura/web/pages/learning/runOffline.jsp
===================================================================
diff -u -r5fd453ea4cb0fa72cb94a5706e75f68a319de46b -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_kaltura/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision 5fd453ea4cb0fa72cb94a5706e75f68a319de46b)
+++ lams_tool_kaltura/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -45,7 +45,16 @@
 
 			<div align="right" class="space-bottom-top">
 				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-					<span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
+					<span class="nextActivity">
+						<c:choose>
+		 					<c:when test="${sessionMap.activityPosition.last}">
+		 						<fmt:message key="button.submit" />
+		 					</c:when>
+		 					<c:otherwise>
+		 		 				<fmt:message key="button.finish" />
+		 					</c:otherwise>
+		 				</c:choose>
+		 			</span>
 				</html:link>
 			</div>
 		</html:form>
Index: lams_tool_lamc/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r65ed4da382b320542dcd88cb1375662dcfac8769 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_lamc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 65ed4da382b320542dcd88cb1375662dcfac8769)
+++ lams_tool_lamc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -66,6 +66,7 @@
 label.download  =Download
 label.delete  =Delete
 label.finished  =Next Activity
+label.submit =Finish
 label.attempt  =Attempt
 button.cancel  =Cancel
 button.upload  =Upload
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
===================================================================
diff -u -r9b05990189b80a007b0fbb4f03f99c19f40ee2d7 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	(.../McLearningAction.java)	(revision 9b05990189b80a007b0fbb4f03f99c19f40ee2d7)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	(.../McLearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -32,6 +32,7 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 
+import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -44,6 +45,7 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
@@ -975,6 +977,9 @@
 	mcGeneralLearnerFlowDTO.setQuestionIndex(new Integer(questionIndex));
 	request.setAttribute(McAppConstants.MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
 
+	LearningWebUtil.putActivityPositionInRequestByToolSessionId(new Long(toolSessionID), request, getServlet()
+		.getServletContext());
+	
 	return mapping.findForward(McAppConstants.LOAD_LEARNER);
     }
 
@@ -1072,6 +1077,9 @@
 	    McLearningAction.logger.debug("mcGeneralLearnerFlowDTO for jsp: " + mcGeneralLearnerFlowDTO);
 	}
 
+	LearningWebUtil.putActivityPositionInRequestByToolSessionId(new Long(toolSessionID), request, getServlet()
+		.getServletContext());
+	
 	return mapping.findForward(McAppConstants.REDO_QUESTIONS);
     }
 
@@ -1085,7 +1093,7 @@
      * @param response
      */
     public void prepareViewAnswersData(ActionMapping mapping, McLearningForm mcLearningForm,
-	    HttpServletRequest request, HttpServletResponse response) {
+	    HttpServletRequest request, ServletContext servletContext) {
 
 	// may have to get service from the form - if class has been created by starter action, rather than by struts
 	IMcService mcService = null;
@@ -1174,6 +1182,8 @@
 	}
 
 	request.setAttribute(McAppConstants.MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
+
+	LearningWebUtil.putActivityPositionInRequestByToolSessionId(new Long(toolSessionID), request, servletContext);
     }
 
     /**
@@ -1190,7 +1200,7 @@
     public ActionForward viewAnswers(ActionMapping mapping, McLearningForm mcLearningForm, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException, ServletException {
 
-	prepareViewAnswersData(mapping, mcLearningForm, request, response);
+	prepareViewAnswersData(mapping, mcLearningForm, request, getServlet().getServletContext());
 	return mapping.findForward(McAppConstants.VIEW_ANSWERS);
     }
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
===================================================================
diff -u -rd7ee01a444dbd7fc671f945b5fb4f7c5d22ba01c -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	(.../McLearningStarterAction.java)	(revision d7ee01a444dbd7fc671f945b5fb4f7c5d22ba01c)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	(.../McLearningStarterAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -63,7 +63,6 @@
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
 
-
 /**
  * 
  * @author Ozgur Demirtas
@@ -101,263 +100,249 @@
  * If the tool has a LockOnFinish flag, then the tool should lock learner's entries once they have completed the activity. 
  * If they return to the activity (e.g. via the progress bar) then the entries should be read only.
  * 
-   <!--Learning Starter Action: initializes the Learning module -->
-   <action 	path="/learningStarter" 
-   			type="org.lamsfoundation.lams.tool.mc.web.McLearningStarterAction" 
-   			name="McLearningForm" 
-	      	scope="request"
-	      	validate="false"
-	      	unknown="false"
-   			input="/learningIndex.jsp"> 
+ <!--Learning Starter Action: initializes the Learning module -->
+ <action 	path="/learningStarter" 
+ type="org.lamsfoundation.lams.tool.mc.web.McLearningStarterAction" 
+ name="McLearningForm" 
+ scope="request"
+ validate="false"
+ unknown="false"
+ input="/learningIndex.jsp"> 
 
-	  	<forward
-		    name="loadLearner"
-		    path="/learning/AnswersContent.jsp"
-		    redirect="false"
-	  	/>
+ <forward
+ name="loadLearner"
+ path="/learning/AnswersContent.jsp"
+ redirect="false"
+ />
 
-	  	<forward
-		    name="viewAnswers"
-		    path="/learning/ViewAnswers.jsp"
-		    redirect="false"
-	  	/>
+ <forward
+ name="viewAnswers"
+ path="/learning/ViewAnswers.jsp"
+ redirect="false"
+ />
 
-	  	<forward
-		    name="redoQuestions"
-		    path="/learning/RedoQuestions.jsp"
-		    redirect="false"
-	  	/>
-	  	
-	     <forward
-	        name="preview"
-	        path="/learning/Preview.jsp"
-		    redirect="false"
-	     />
+ <forward
+ name="redoQuestions"
+ path="/learning/RedoQuestions.jsp"
+ redirect="false"
+ />
 
-	  	<forward
-		    name="learningStarter"
-		    path="/learningIndex.jsp"
-		    redirect="false"
-	  	/>
-	  	
-	  	<forward
-		    name="defineLater"
-	        path="/learning/defineLater.jsp"
-		    redirect="false"
-	  	/>
+ <forward
+ name="preview"
+ path="/learning/Preview.jsp"
+ redirect="false"
+ />
 
-	  	<forward
-		    name="runOffline"
-	        path="/learning/RunOffline.jsp"
-		    redirect="false"
-	  	/>
+ <forward
+ name="learningStarter"
+ path="/learningIndex.jsp"
+ redirect="false"
+ />
 
-	  	<forward
-		    name="errorList"
-		    path="/McErrorBox.jsp"
-		    redirect="false"
-	  	/>
-	</action>  
+ <forward
+ name="defineLater"
+ path="/learning/defineLater.jsp"
+ redirect="false"
+ />
+
+ <forward
+ name="runOffline"
+ path="/learning/RunOffline.jsp"
+ redirect="false"
+ />
+
+ <forward
+ name="errorList"
+ path="/McErrorBox.jsp"
+ redirect="false"
+ />
+ </action>  
  *
  */
 
 /**
- *
- * Note:  Because of MCQ's learning reporting structure, Show Learner Report is always ON even if in authoring it is set to false.
+ * 
+ * Note: Because of MCQ's learning reporting structure, Show Learner Report is always ON even if in authoring it is set
+ * to false.
  */
 
 public class McLearningStarterAction extends Action implements McAppConstants {
-	static Logger logger = Logger.getLogger(McLearningStarterAction.class.getName());
+    static Logger logger = Logger.getLogger(McLearningStarterAction.class.getName());
 
-	public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
-  								throws IOException, ServletException, McApplicationException {
-		
-	    /*
-	     * By now, the passed tool session id MUST exist in the db through the calling of:
-	     * public void createToolSession(Long toolSessionId, Long toolContentId) by the container.
-	     * 
-	     * make sure this session exists in tool's session table by now.
-	     */
-		
-		McUtils.cleanUpSessionAbsolute(request);
-		
-		Map mapQuestionsContent= new TreeMap(new McComparator());
-		Map mapAnswers= new TreeMap(new McComparator());
+    @Override
+    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException, McApplicationException {
 
-		IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	/*
+	 * By now, the passed tool session id MUST exist in the db through the calling of:
+	 * public void createToolSession(Long toolSessionId, Long toolContentId) by the container.
+	 * 
+	 * make sure this session exists in tool's session table by now.
+	 */
 
-		McLearningForm mcLearningForm = (McLearningForm) form;
-		mcLearningForm.setMcService(mcService);
-    	mcLearningForm.setPassMarkApplicable(new Boolean(false).toString());
-		mcLearningForm.setUserOverPassMark(new Boolean(false).toString());
-		
+	McUtils.cleanUpSessionAbsolute(request);
 
-		ActionForward validateParameters=validateParameters(request, mcLearningForm, mapping);
-	    if (validateParameters != null)
-	    {
-	    	return validateParameters;
-	    }
-	    
-	    SessionMap sessionMap = new SessionMap();
-	    List sequentialCheckedCa= new LinkedList();
-	    sessionMap.put(QUESTION_AND_CANDIDATE_ANSWERS_KEY, sequentialCheckedCa);
-	    request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
-	    mcLearningForm.setHttpSessionID(sessionMap.getSessionID());
-	        
-	    String toolSessionID=request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
-	    mcLearningForm.setToolSessionID(new Long(toolSessionID).toString());
-	    
-	    
-		/*
-		 * by now, we made sure that the passed tool session id exists in the db as a new record
-		 * Make sure we can retrieve it and the relavent content
-		 */
-		
-		McSession mcSession=mcService.retrieveMcSession(new Long(toolSessionID));
-	    
-	    if (mcSession == null)
-	    {
-	    	McUtils.cleanUpSessionAbsolute(request);
-			return (mapping.findForward(ERROR_LIST));
-	    }
+	Map mapQuestionsContent = new TreeMap(new McComparator());
+	Map mapAnswers = new TreeMap(new McComparator());
 
-	    /*
-	     * find out what content this tool session is referring to
-	     * get the content for this tool session 
-	     * Each passed tool session id points to a particular content. Many to one mapping.
-	     */
-		McContent mcContent=mcSession.getMcContent();
-	    
-	    if (mcContent == null)
-	    {
-	    	McUtils.cleanUpSessionAbsolute(request);
-	    	persistError(request,"error.content.doesNotExist");
-	    	return (mapping.findForward(ERROR_LIST));
-	    }
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
 
-	    
-	    /*
-	     * The content we retrieved above must have been created before in Authoring time. 
-	     * And the passed tool session id already refers to it.
-	     */
-	    
-	    McLearnerStarterDTO mcLearnerStarterDTO= new McLearnerStarterDTO();
-	    if (mcContent.isQuestionsSequenced())
-		{
-			mcLearnerStarterDTO.setQuestionListingMode(QUESTION_LISTING_MODE_SEQUENTIAL);
-			mcLearningForm.setQuestionListingMode(QUESTION_LISTING_MODE_SEQUENTIAL);
-		}
-	    else
-	    {
-	    	mcLearnerStarterDTO.setQuestionListingMode(QUESTION_LISTING_MODE_COMBINED);
-	    	mcLearningForm.setQuestionListingMode(QUESTION_LISTING_MODE_COMBINED);
-	    }
-	    
-	    /*  
-	     * Is there a deadline set?
-	     */
-	    
-	    Date submissionDeadline = mcContent.getSubmissionDeadline();
-		
-		if (submissionDeadline != null) {
-			
-			HttpSession ss = SessionManager.getSession();			
-			UserDTO learnerDto = (UserDTO) ss.getAttribute(AttributeNames.USER);
-			TimeZone learnerTimeZone = learnerDto.getTimeZone();
-			Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, submissionDeadline);
-			Date currentLearnerDate = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, new Date());
-			mcLearnerStarterDTO.setSubmissionDeadline(submissionDeadline);
-		
-			//calculate whether submission deadline has passed, and if so forward to "runOffline"
-			if (currentLearnerDate.after(tzSubmissionDeadline)) {
-				request.setAttribute(MC_LEARNER_STARTER_DTO, mcLearnerStarterDTO);
-				return mapping.findForward(RUN_OFFLINE);
-			}
-		}
-		
-	    /*
-	     * Is the tool activity been checked as Run Offline in the property inspector?
-	     */
-	    mcLearnerStarterDTO.setToolActivityOffline(new Boolean(mcContent.isRunOffline()).toString());
-	    mcLearnerStarterDTO.setActivityTitle(mcContent.getTitle());
-	    request.setAttribute(MC_LEARNER_STARTER_DTO, mcLearnerStarterDTO);
-	    
-	    mcLearningForm.setToolContentID(mcContent.getMcContentId().toString());
-	    commonContentSetup(request, mcContent, mcService,mcLearningForm, toolSessionID);
-	    
- 	    /* find out if the content is set to run offline or online. If it is set to run offline , the learners are informed about that. */
-	    boolean isRunOffline=McUtils.isRunOffline(mcContent);
-	    if (isRunOffline == true)
-	    {
-			return (mapping.findForward(RUN_OFFLINE));
-	    }
+	McLearningForm mcLearningForm = (McLearningForm) form;
+	mcLearningForm.setMcService(mcService);
+	mcLearningForm.setPassMarkApplicable(new Boolean(false).toString());
+	mcLearningForm.setUserOverPassMark(new Boolean(false).toString());
 
-	    /* find out if the content is being modified at the moment. */
-	    boolean isDefineLater=McUtils.isDefineLater(mcContent);
-	    if (isDefineLater == true)
-	    {
-	    	return (mapping.findForward(DEFINE_LATER));
+	ActionForward validateParameters = validateParameters(request, mcLearningForm, mapping);
+	if (validateParameters != null) {
+	    return validateParameters;
+	}
+
+	SessionMap sessionMap = new SessionMap();
+	List sequentialCheckedCa = new LinkedList();
+	sessionMap.put(McAppConstants.QUESTION_AND_CANDIDATE_ANSWERS_KEY, sequentialCheckedCa);
+	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+	mcLearningForm.setHttpSessionID(sessionMap.getSessionID());
+
+	String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
+	mcLearningForm.setToolSessionID(new Long(toolSessionID).toString());
+
+	/*
+	 * by now, we made sure that the passed tool session id exists in the db as a new record
+	 * Make sure we can retrieve it and the relavent content
+	 */
+
+	McSession mcSession = mcService.retrieveMcSession(new Long(toolSessionID));
+
+	if (mcSession == null) {
+	    McUtils.cleanUpSessionAbsolute(request);
+	    return (mapping.findForward(McAppConstants.ERROR_LIST));
+	}
+
+	/*
+	 * find out what content this tool session is referring to
+	 * get the content for this tool session 
+	 * Each passed tool session id points to a particular content. Many to one mapping.
+	 */
+	McContent mcContent = mcSession.getMcContent();
+
+	if (mcContent == null) {
+	    McUtils.cleanUpSessionAbsolute(request);
+	    persistError(request, "error.content.doesNotExist");
+	    return (mapping.findForward(McAppConstants.ERROR_LIST));
+	}
+
+	/*
+	 * The content we retrieved above must have been created before in Authoring time. 
+	 * And the passed tool session id already refers to it.
+	 */
+
+	McLearnerStarterDTO mcLearnerStarterDTO = new McLearnerStarterDTO();
+	if (mcContent.isQuestionsSequenced()) {
+	    mcLearnerStarterDTO.setQuestionListingMode(McAppConstants.QUESTION_LISTING_MODE_SEQUENTIAL);
+	    mcLearningForm.setQuestionListingMode(McAppConstants.QUESTION_LISTING_MODE_SEQUENTIAL);
+	} else {
+	    mcLearnerStarterDTO.setQuestionListingMode(McAppConstants.QUESTION_LISTING_MODE_COMBINED);
+	    mcLearningForm.setQuestionListingMode(McAppConstants.QUESTION_LISTING_MODE_COMBINED);
+	}
+
+	/*  
+	 * Is there a deadline set?
+	 */
+
+	Date submissionDeadline = mcContent.getSubmissionDeadline();
+
+	if (submissionDeadline != null) {
+
+	    HttpSession ss = SessionManager.getSession();
+	    UserDTO learnerDto = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    TimeZone learnerTimeZone = learnerDto.getTimeZone();
+	    Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, submissionDeadline);
+	    Date currentLearnerDate = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, new Date());
+	    mcLearnerStarterDTO.setSubmissionDeadline(submissionDeadline);
+
+	    // calculate whether submission deadline has passed, and if so forward to "runOffline"
+	    if (currentLearnerDate.after(tzSubmissionDeadline)) {
+		request.setAttribute(McAppConstants.MC_LEARNER_STARTER_DTO, mcLearnerStarterDTO);
+		return mapping.findForward(McAppConstants.RUN_OFFLINE);
 	    }
+	}
 
-	    
-    	/* Is the request for a preview by the author?
-    	Preview The tool must be able to show the specified content as if it was running in a lesson. 
+	/*
+	 * Is the tool activity been checked as Run Offline in the property inspector?
+	 */
+	mcLearnerStarterDTO.setToolActivityOffline(new Boolean(mcContent.isRunOffline()).toString());
+	mcLearnerStarterDTO.setActivityTitle(mcContent.getTitle());
+	request.setAttribute(McAppConstants.MC_LEARNER_STARTER_DTO, mcLearnerStarterDTO);
+
+	mcLearningForm.setToolContentID(mcContent.getMcContentId().toString());
+	commonContentSetup(request, mcContent, mcService, mcLearningForm, toolSessionID);
+
+	/* find out if the content is set to run offline or online. If it is set to run offline , the learners are informed about that. */
+	boolean isRunOffline = McUtils.isRunOffline(mcContent);
+	if (isRunOffline == true) {
+	    return (mapping.findForward(McAppConstants.RUN_OFFLINE));
+	}
+
+	/* find out if the content is being modified at the moment. */
+	boolean isDefineLater = McUtils.isDefineLater(mcContent);
+	if (isDefineLater == true) {
+	    return (mapping.findForward(McAppConstants.DEFINE_LATER));
+	}
+
+	/* Is the request for a preview by the author?
+	Preview The tool must be able to show the specified content as if it was running in a lesson. 
 		It will be the learner url with tool access mode set to ToolAccessMode.AUTHOR 
 		3 modes are:
 			author
 			teacher
 			learner
 		*/
 
-	    /*handle PREVIEW mode*/
-	    //String mode=mcLearningForm.getLearningMode();
-	    String mode=request.getParameter(MODE);
-	    
-	   	/* by now, we know that the mode is either teacher or learner
-    	 * check if the mode is teacher and request is for Learner Progress
-    	 */
-		String userId=request.getParameter(USER_ID);
-	    
-		if ((userId != null) && (mode.equals("teacher")))
-		{
-	    	
-			/* LEARNER_PROGRESS for jsp*/
-			mcLearningForm.setLearnerProgress(new Boolean(true).toString());
-			mcLearningForm.setLearnerProgressUserId(userId);
-			
-			McLearningAction mcLearningAction= new McLearningAction();
-			/* pay attention that this userId is the learner's userId passed by the request parameter.
-			 * It is differerent than USER_ID kept in the session of the current system user*/
-		    
-		    McQueUsr mcQueUsr=mcService.getMcUserBySession(new Long(userId), mcSession.getUid());
-		    if (mcQueUsr == null)
-		    {
-				logger.error("error.learner.required");
-				persistError(request,"error.learner.required");
-				logger.error("forwarding to: " + SIMPLE_LEARNING_ERROR);
-				return (mapping.findForward(SIMPLE_LEARNING_ERROR));
-		    }
-		    
-		    /* check whether the user's session really referrs to the session id passed to the url*/
-		    Long sessionUid=mcQueUsr.getMcSessionId();
-		    McSession mcSessionLocal=mcService.getMcSessionByUID(sessionUid);
+	/*handle PREVIEW mode*/
+	// String mode=mcLearningForm.getLearningMode();
+	String mode = request.getParameter(McAppConstants.MODE);
 
-		    toolSessionID=(String)mcLearningForm.getToolSessionID();
-		    
-		    if  ((mcSessionLocal ==  null) ||
-				 (mcSessionLocal.getMcSessionId().longValue() != new Long(toolSessionID).longValue()))
-		    {
-		        logger.error("error.learner.sessionId.inconsistent");
-		    }
-		    LearningUtil.saveFormRequestData(request, mcLearningForm, true);
-		    
-		    
-		    request.setAttribute(REQUEST_BY_STARTER, new Boolean (true).toString());
-		    return mcLearningAction.viewAnswers(mapping, mcLearningForm, request, response);
-		}
-    	
-		/* by now, we know that the mode is learner*/
-    	/*
+	/* by now, we know that the mode is either teacher or learner
+	* check if the mode is teacher and request is for Learner Progress
+	*/
+	String userId = request.getParameter(McAppConstants.USER_ID);
+
+	if ((userId != null) && (mode.equals("teacher"))) {
+
+	    /* LEARNER_PROGRESS for jsp*/
+	    mcLearningForm.setLearnerProgress(new Boolean(true).toString());
+	    mcLearningForm.setLearnerProgressUserId(userId);
+
+	    McLearningAction mcLearningAction = new McLearningAction();
+	    /* pay attention that this userId is the learner's userId passed by the request parameter.
+	     * It is differerent than USER_ID kept in the session of the current system user*/
+
+	    McQueUsr mcQueUsr = mcService.getMcUserBySession(new Long(userId), mcSession.getUid());
+	    if (mcQueUsr == null) {
+		McLearningStarterAction.logger.error("error.learner.required");
+		persistError(request, "error.learner.required");
+		McLearningStarterAction.logger.error("forwarding to: " + McAppConstants.SIMPLE_LEARNING_ERROR);
+		return (mapping.findForward(McAppConstants.SIMPLE_LEARNING_ERROR));
+	    }
+
+	    /* check whether the user's session really referrs to the session id passed to the url*/
+	    Long sessionUid = mcQueUsr.getMcSessionId();
+	    McSession mcSessionLocal = mcService.getMcSessionByUID(sessionUid);
+
+	    toolSessionID = mcLearningForm.getToolSessionID();
+
+	    if ((mcSessionLocal == null)
+		    || (mcSessionLocal.getMcSessionId().longValue() != new Long(toolSessionID).longValue())) {
+		McLearningStarterAction.logger.error("error.learner.sessionId.inconsistent");
+	    }
+	    LearningUtil.saveFormRequestData(request, mcLearningForm, true);
+
+	    request.setAttribute(McAppConstants.REQUEST_BY_STARTER, new Boolean(true).toString());
+	    return mcLearningAction.viewAnswers(mapping, mcLearningForm, request, response);
+	}
+
+	/* by now, we know that the mode is learner*/
+	/*
 	     * verify that userId does not already exist in the db.
 	     * If it does exist, that means, that user already responded to the content and 
 	     * his answers must be displayed  read-only
@@ -375,7 +360,7 @@
 
 	McQueUsr mcQueUsr = mcService.getMcUserBySession(new Long(userID.longValue()), mcSession.getUid());
 
-	request.setAttribute(MC_LEARNER_STARTER_DTO, mcLearnerStarterDTO);
+	request.setAttribute(McAppConstants.MC_LEARNER_STARTER_DTO, mcLearnerStarterDTO);
 
 	/* if the user's session id AND user id exists in the tool tables go to redo questions. */
 	if (mcQueUsr != null) {
@@ -385,160 +370,144 @@
 
 	    if (toolSessionID.equals(userSessionId)) {
 		McLearningAction mcLearningAction = new McLearningAction();
-		request.setAttribute(REQUEST_BY_STARTER, (Boolean.TRUE).toString());
-		return mcLearningAction.viewAnswers(mapping, mcLearningForm, request, response);
+		request.setAttribute(McAppConstants.REQUEST_BY_STARTER, (Boolean.TRUE).toString());
+		mcLearningAction.prepareViewAnswersData(mapping, mcLearningForm, request, getServlet().getServletContext());
+		return mapping.findForward(McAppConstants.VIEW_ANSWERS);
 	    }
 	} else if (mode.equals("teacher")) {
 	    McLearningAction mcLearningAction = new McLearningAction();
 	    mcLearningForm.setLearnerProgress(new Boolean(true).toString());
 	    mcLearningForm.setLearnerProgressUserId(userId);
 	    return mcLearningAction.viewAnswers(mapping, mcLearningForm, request, response);
 	}
-	request.setAttribute(MC_LEARNER_STARTER_DTO, mcLearnerStarterDTO);
-	return (mapping.findForward(LOAD_LEARNER));
+	request.setAttribute(McAppConstants.MC_LEARNER_STARTER_DTO, mcLearnerStarterDTO);
+	return (mapping.findForward(McAppConstants.LOAD_LEARNER));
     }
-	
-	
-	/**
-	 * sets up question and candidate answers maps
-	 * commonContentSetup(HttpServletRequest request, McContent mcContent)
-	 * 
-	 * @param request
-	 * @param mcContent
-	 */
-	protected void commonContentSetup(HttpServletRequest request, McContent mcContent, IMcService mcService, 
-	        McLearningForm mcLearningForm, String toolSessionID)
-	{
-	    logger.debug("dettingcommon content: ");
-		Map mapQuestionsContent= new TreeMap(new McComparator());
-		
-		boolean randomize=mcContent.isRandomize();
-		logger.debug("randomize: " + randomize);
-		
-		List<McLearnerAnswersDTO> listQuestionAndCandidateAnswersDTO=LearningUtil.buildQuestionAndCandidateAnswersDTO(request, mcContent, randomize, mcService);
-		
-		logger.debug("listQuestionAndCandidateAnswersDTO: " + listQuestionAndCandidateAnswersDTO);
-		request.setAttribute(LIST_QUESTION_CANDIDATEANSWERS_DTO, listQuestionAndCandidateAnswersDTO);
-		logger.debug("LIST_QUESTION_CANDIDATEANSWERS_DTO: " +  request.getAttribute(LIST_QUESTION_CANDIDATEANSWERS_DTO));
-		
-		McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO=LearningUtil.buildMcGeneralLearnerFlowDTO(mcContent);
-		mcGeneralLearnerFlowDTO.setTotalCountReached(new Boolean(false).toString());
-		mcGeneralLearnerFlowDTO.setQuestionIndex(new Integer(1));
-		
-	    // should we show the marks for each question - we show the marks if any of the questions
-	    // have a mark > 1.
-	    Boolean showMarks = LearningUtil.isShowMarksOnQuestion(listQuestionAndCandidateAnswersDTO);
-	    mcGeneralLearnerFlowDTO.setShowMarks(showMarks.toString());
 
-		Boolean displayAnswers = mcContent.isDisplayAnswers();
-		mcGeneralLearnerFlowDTO.setDisplayAnswers(displayAnswers.toString());
-		logger.debug("MCQ displayAnswers: " + mcGeneralLearnerFlowDTO.getDisplayAnswers());
-	    
-	    logger.debug("is tool reflective: " + mcContent.isReflect());
-	    mcGeneralLearnerFlowDTO.setReflection(new Boolean(mcContent.isReflect()).toString());
-		logger.debug("reflection subject: " + mcContent.getReflectionSubject());
-		
-		String reflectionSubject=McUtils.replaceNewLines(mcContent.getReflectionSubject());
-		mcGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject);
-		
-		
-		String userID=mcLearningForm.getUserID();
-		logger.debug("userID: " +  userID);
-		
-		
-		logger.debug("attempt getting notebookEntry: ");
-		NotebookEntry notebookEntry = mcService.getEntry(new Long(toolSessionID),
-				CoreNotebookConstants.NOTEBOOK_TOOL,
-				MY_SIGNATURE, new Integer(userID));
-		
-        logger.debug("notebookEntry: " + notebookEntry);
-		
-		if (notebookEntry != null) {
-		    String notebookEntryPresentable=McUtils.replaceNewLines(notebookEntry.getEntry());
-		    mcGeneralLearnerFlowDTO.setNotebookEntry(notebookEntryPresentable);
-		}
+    /**
+     * sets up question and candidate answers maps commonContentSetup(HttpServletRequest request, McContent mcContent)
+     * 
+     * @param request
+     * @param mcContent
+     */
+    protected void commonContentSetup(HttpServletRequest request, McContent mcContent, IMcService mcService,
+	    McLearningForm mcLearningForm, String toolSessionID) {
+	McLearningStarterAction.logger.debug("dettingcommon content: ");
+	Map mapQuestionsContent = new TreeMap(new McComparator());
 
+	boolean randomize = mcContent.isRandomize();
+	McLearningStarterAction.logger.debug("randomize: " + randomize);
 
-		
-		request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
-		logger.debug("MC_GENERAL_LEARNER_FLOW_DTO: " +  request.getAttribute(MC_GENERAL_LEARNER_FLOW_DTO));
+	List<McLearnerAnswersDTO> listQuestionAndCandidateAnswersDTO = LearningUtil
+		.buildQuestionAndCandidateAnswersDTO(request, mcContent, randomize, mcService);
+
+	McLearningStarterAction.logger.debug("listQuestionAndCandidateAnswersDTO: "
+		+ listQuestionAndCandidateAnswersDTO);
+	request.setAttribute(McAppConstants.LIST_QUESTION_CANDIDATEANSWERS_DTO, listQuestionAndCandidateAnswersDTO);
+	McLearningStarterAction.logger.debug("LIST_QUESTION_CANDIDATEANSWERS_DTO: "
+		+ request.getAttribute(McAppConstants.LIST_QUESTION_CANDIDATEANSWERS_DTO));
+
+	McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO = LearningUtil.buildMcGeneralLearnerFlowDTO(mcContent);
+	mcGeneralLearnerFlowDTO.setTotalCountReached(new Boolean(false).toString());
+	mcGeneralLearnerFlowDTO.setQuestionIndex(new Integer(1));
+
+	// should we show the marks for each question - we show the marks if any of the questions
+	// have a mark > 1.
+	Boolean showMarks = LearningUtil.isShowMarksOnQuestion(listQuestionAndCandidateAnswersDTO);
+	mcGeneralLearnerFlowDTO.setShowMarks(showMarks.toString());
+
+	Boolean displayAnswers = mcContent.isDisplayAnswers();
+	mcGeneralLearnerFlowDTO.setDisplayAnswers(displayAnswers.toString());
+	McLearningStarterAction.logger.debug("MCQ displayAnswers: " + mcGeneralLearnerFlowDTO.getDisplayAnswers());
+
+	McLearningStarterAction.logger.debug("is tool reflective: " + mcContent.isReflect());
+	mcGeneralLearnerFlowDTO.setReflection(new Boolean(mcContent.isReflect()).toString());
+	McLearningStarterAction.logger.debug("reflection subject: " + mcContent.getReflectionSubject());
+
+	String reflectionSubject = McUtils.replaceNewLines(mcContent.getReflectionSubject());
+	mcGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject);
+
+	String userID = mcLearningForm.getUserID();
+	McLearningStarterAction.logger.debug("userID: " + userID);
+
+	McLearningStarterAction.logger.debug("attempt getting notebookEntry: ");
+	NotebookEntry notebookEntry = mcService.getEntry(new Long(toolSessionID), CoreNotebookConstants.NOTEBOOK_TOOL,
+		McAppConstants.MY_SIGNATURE, new Integer(userID));
+
+	McLearningStarterAction.logger.debug("notebookEntry: " + notebookEntry);
+
+	if (notebookEntry != null) {
+	    String notebookEntryPresentable = McUtils.replaceNewLines(notebookEntry.getEntry());
+	    mcGeneralLearnerFlowDTO.setNotebookEntry(notebookEntryPresentable);
 	}
-	
-	
-	
-	protected ActionForward validateParameters(HttpServletRequest request, McLearningForm mcLearningForm, ActionMapping mapping)
-	{
-		/*
-	     * obtain and setup the current user's data 
-	     */
-		
-	    String userID = "";
-	    HttpSession ss = SessionManager.getSession();
-	    logger.debug("ss: " + ss);
-	    
-	    if (ss != null)
-	    {
-		    UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-		    if ((user != null) && (user.getUserID() != null))
-		    {
-		    	userID = user.getUserID().toString();
-			    logger.debug("retrieved userId: " + userID);
-		    }
+
+	request.setAttribute(McAppConstants.MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
+	McLearningStarterAction.logger.debug("MC_GENERAL_LEARNER_FLOW_DTO: "
+		+ request.getAttribute(McAppConstants.MC_GENERAL_LEARNER_FLOW_DTO));
+    }
+
+    protected ActionForward validateParameters(HttpServletRequest request, McLearningForm mcLearningForm,
+	    ActionMapping mapping) {
+	/*
+	* obtain and setup the current user's data 
+	*/
+
+	String userID = "";
+	HttpSession ss = SessionManager.getSession();
+	McLearningStarterAction.logger.debug("ss: " + ss);
+
+	if (ss != null) {
+	    UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    if ((user != null) && (user.getUserID() != null)) {
+		userID = user.getUserID().toString();
+		McLearningStarterAction.logger.debug("retrieved userId: " + userID);
 	    }
-		
-	    mcLearningForm.setUserID(userID);
-	    
-	    /*
-	     * process incoming tool session id and later derive toolContentId from it. 
-	     */
-    	String strToolSessionId=request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
-	    long toolSessionId=0;
-	    if ((strToolSessionId == null) || (strToolSessionId.length() == 0)) 
-	    {
-			logger.error("error.toolSessionId.required");
+	}
+
+	mcLearningForm.setUserID(userID);
+
+	/*
+	 * process incoming tool session id and later derive toolContentId from it. 
+	 */
+	String strToolSessionId = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
+	long toolSessionId = 0;
+	if ((strToolSessionId == null) || (strToolSessionId.length() == 0)) {
+	    McLearningStarterAction.logger.error("error.toolSessionId.required");
+	} else {
+	    try {
+		toolSessionId = new Long(strToolSessionId).longValue();
+		McLearningStarterAction.logger.debug("passed TOOL_SESSION_ID : " + new Long(toolSessionId));
+	    } catch (NumberFormatException e) {
+		McLearningStarterAction.logger.error("error.sessionId.numberFormatException");
 	    }
-	    else
-	    {
-	    	try
-			{
-	    		toolSessionId=new Long(strToolSessionId).longValue();
-		    	logger.debug("passed TOOL_SESSION_ID : " + new Long(toolSessionId));
-			}
-	    	catch(NumberFormatException e)
-			{
-				logger.error("error.sessionId.numberFormatException");
-			}
-	    }
-	    
-	    /*mode can be learner, teacher or author */
-	    String mode=request.getParameter(MODE);
-	    logger.debug("mode: " + mode);
-	    
-	    if ((mode == null) || (mode.length() == 0)) 
-	    {
-			logger.error("error.mode.required");
-	    }
-	    
-	    if ((!mode.equals("learner")) && (!mode.equals("teacher")) && (!mode.equals("author")))
-	    {
-			logger.error("error.mode.invalid");
-	    }
-		logger.debug("session LEARNING_MODE set to:" + mode);
-	    
-	    return null;
 	}
 
-	
-	/**
+	/*mode can be learner, teacher or author */
+	String mode = request.getParameter(McAppConstants.MODE);
+	McLearningStarterAction.logger.debug("mode: " + mode);
+
+	if ((mode == null) || (mode.length() == 0)) {
+	    McLearningStarterAction.logger.error("error.mode.required");
+	}
+
+	if ((!mode.equals("learner")) && (!mode.equals("teacher")) && (!mode.equals("author"))) {
+	    McLearningStarterAction.logger.error("error.mode.invalid");
+	}
+	McLearningStarterAction.logger.debug("session LEARNING_MODE set to:" + mode);
+
+	return null;
+    }
+
+    /**
      * persists error messages to request scope
+     * 
      * @param request
      * @param message
      */
-	public void persistError(HttpServletRequest request, String message)
-	{
-		ActionMessages errors= new ActionMessages();
-		errors.add(Globals.ERROR_KEY, new ActionMessage(message));
-		logger.debug("add " + message +"  to ActionMessages:");
-		saveErrors(request,errors);	    	    
-	}
-}  
+    public void persistError(HttpServletRequest request, String message) {
+	ActionMessages errors = new ActionMessages();
+	errors.add(Globals.ERROR_KEY, new ActionMessage(message));
+	McLearningStarterAction.logger.debug("add " + message + "  to ActionMessages:");
+	saveErrors(request, errors);
+    }
+}
Index: lams_tool_lamc/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -rad0c3a117cd6937f55a524e6472f401c556ab135 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision ad0c3a117cd6937f55a524e6472f401c556ab135)
+++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -214,7 +214,16 @@
 							<html:hidden property="learnerFinished" value="Finished" />
 							
 							<html:link href="#" styleClass="button" styleId="finishButton"  onclick="submitForm('finish');return false">
-								<span class="nextActivity"><fmt:message key="label.finished" /></span>
+								<span class="nextActivity">
+									<c:choose>
+					 					<c:when test="${activityPosition.last}">
+					 						<fmt:message key="label.submit" />
+					 					</c:when>
+					 					<c:otherwise>
+					 		 				<fmt:message key="label.finished" />
+					 					</c:otherwise>
+						 			</c:choose>
+						 		</span>
 							</html:link>
 						</c:if>
 
@@ -235,7 +244,16 @@
 						<html:hidden property="learnerFinished" value="Finished" />
 																  			  		
 						<html:link href="#" styleClass="button" styleId="finishButton" onclick="submitForm('finish');return false">
-							<span class="nextActivity"><fmt:message key="label.finished"/></span>
+							<span class="nextActivity">
+								<c:choose>
+				 					<c:when test="${activityPosition.last}">
+				 						<fmt:message key="label.submit" />
+				 					</c:when>
+				 					<c:otherwise>
+				 		 				<fmt:message key="label.finished" />
+				 					</c:otherwise>
+					 			</c:choose>
+					 		</span>
 						</html:link>
 					</c:if>
 
Index: lams_tool_lamc/web/learning/RedoQuestions.jsp
===================================================================
diff -u -re8c846051c7b148ec4e80b1c50e41fa90ff60be5 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_lamc/web/learning/RedoQuestions.jsp	(.../RedoQuestions.jsp)	(revision e8c846051c7b148ec4e80b1c50e41fa90ff60be5)
+++ lams_tool_lamc/web/learning/RedoQuestions.jsp	(.../RedoQuestions.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -116,7 +116,16 @@
 											<html:hidden property="learnerFinished" value="Finished" />
 																  			  		
 											<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish'); return false;">
-												<span class="nextActivity"><fmt:message key="label.finished"/></span>
+												<span class="nextActivity">									
+													<c:choose>
+									 					<c:when test="${activityPosition.last}">
+									 						<fmt:message key="label.submit" />
+									 					</c:when>
+									 					<c:otherwise>
+									 		 				<fmt:message key="label.finished" />
+									 					</c:otherwise>
+										 			</c:choose>
+										 		</span>
 											</html:link>
 									  	</c:if> 				    					
 						
@@ -137,7 +146,14 @@
 											<html:hidden property="learnerFinished" value="Finished" />
 																  			  		
 											<html:submit styleClass="button" styleId="finishButton">
-												<fmt:message key="label.finished"/>
+												<c:choose>
+								 					<c:when test="${activityPosition.last}">
+								 						<fmt:message key="label.submit" />
+								 					</c:when>
+								 					<c:otherwise>
+								 		 				<fmt:message key="label.finished" />
+								 					</c:otherwise>
+									 			</c:choose>
 											</html:submit> 				
 								  	</c:if> 				    					
 					
Index: lams_tool_lamc/web/learning/RunOffline.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_lamc/web/learning/RunOffline.jsp	(.../RunOffline.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_lamc/web/learning/RunOffline.jsp	(.../RunOffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -87,7 +87,16 @@
 					<html:hidden property="learnerFinished" value="Finished" />
 					
 					<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="javascript:submitForm('finish');return false">
-						<span class="nextActivity"><fmt:message key="label.finished" /></span>
+						<span class="nextActivity">
+							<c:choose>
+			 					<c:when test="${activityPosition.last}">
+			 						<fmt:message key="label.submit" />
+			 					</c:when>
+			 					<c:otherwise>
+			 		 				<fmt:message key="label.finished" />
+			 					</c:otherwise>
+				 			</c:choose>
+				 		</span>
 					</html:link>
 				</c:if>
 
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
diff -u -rd7ee01a444dbd7fc671f945b5fb4f7c5d22ba01c -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision d7ee01a444dbd7fc671f945b5fb4f7c5d22ba01c)
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -209,7 +209,16 @@
 							<html:hidden property="learnerFinished" value="Finished" />
 									
 							<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish'); return false;">
-								<span class="nextActivity"><fmt:message key="label.finished" /></span>
+								<span class="nextActivity">
+									<c:choose>
+					 					<c:when test="${activityPosition.last}">
+					 						<fmt:message key="label.submit" />
+					 					</c:when>
+					 					<c:otherwise>
+					 		 				<fmt:message key="label.finished" />
+					 					</c:otherwise>
+						 			</c:choose>
+								</span>
 							</html:link>
 						</c:if>
 
Index: lams_tool_lamc/web/learning/mobile/IndividualLearnerResults.jsp
===================================================================
diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_lamc/web/learning/mobile/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 35a0e719d061c08b52e705135bb2f2126079ed21)
+++ lams_tool_lamc/web/learning/mobile/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -228,7 +228,16 @@
 						<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}">
 							<html:hidden property="learnerFinished" value="Finished" />
 							<button id="finishButton" name="finishButton" onclick="submitForm('finish');return false" data-icon="arrow-r" data-theme="b">
-								<span class="nextActivity"><fmt:message key="label.finished" /></span>
+								<span class="nextActivity">
+									<c:choose>
+					 					<c:when test="${activityPosition.last}">
+					 						<fmt:message key="label.submit" />
+					 					</c:when>
+					 					<c:otherwise>
+					 		 				<fmt:message key="label.finished" />
+					 					</c:otherwise>
+						 			</c:choose>
+						 		</span>
 							</button>
 						</c:if>
 
@@ -244,7 +253,16 @@
 					<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}">
 						<html:hidden property="learnerFinished" value="Finished" />
 						<button id="finishButton" onclick="submitForm('finish');return false" data-icon="arrow-r" data-theme="b">
-							<span class="nextActivity"><fmt:message key="label.finished"/></span>
+							<span class="nextActivity">
+								<c:choose>
+				 					<c:when test="${activityPosition.last}">
+				 						<fmt:message key="label.submit" />
+				 					</c:when>
+				 					<c:otherwise>
+				 		 				<fmt:message key="label.finished" />
+				 					</c:otherwise>
+					 			</c:choose>
+							</span>
 						</button>
 					</c:if>
 
Index: lams_tool_lamc/web/learning/mobile/RedoQuestions.jsp
===================================================================
diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_lamc/web/learning/mobile/RedoQuestions.jsp	(.../RedoQuestions.jsp)	(revision 35a0e719d061c08b52e705135bb2f2126079ed21)
+++ lams_tool_lamc/web/learning/mobile/RedoQuestions.jsp	(.../RedoQuestions.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -125,7 +125,16 @@
 											<html:hidden property="learnerFinished" value="Finished" />
 																  			  		
 											<button id="finishButton" name="finishButton" onclick="submitForm('finish');return false" data-icon="arrow-r" data-theme="b">
-												<span class="nextActivity"><fmt:message key="label.finished"/></span>
+												<span class="nextActivity">
+													<c:choose>
+									 					<c:when test="${activityPosition.last}">
+									 						<fmt:message key="label.submit" />
+									 					</c:when>
+									 					<c:otherwise>
+									 		 				<fmt:message key="label.finished" />
+									 					</c:otherwise>
+										 			</c:choose>
+										 		</span>
 											</button>
 									  	</c:if> 				    					
 						
@@ -144,7 +153,14 @@
 											<html:hidden property="learnerFinished" value="Finished" />
 																  			  		
 											<button id="finishButton" onclick="submitForm('finish');return false" data-icon="arrow-r" data-theme="b">
-												<fmt:message key="label.finished"/>
+												<c:choose>
+								 					<c:when test="${activityPosition.last}">
+								 						<fmt:message key="label.submit" />
+								 					</c:when>
+								 					<c:otherwise>
+								 		 				<fmt:message key="label.finished" />
+								 					</c:otherwise>
+									 			</c:choose>
 											</button> 				
 								  	</c:if> 				    					
 					
Index: lams_tool_lamc/web/learning/mobile/RunOffline.jsp
===================================================================
diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_lamc/web/learning/mobile/RunOffline.jsp	(.../RunOffline.jsp)	(revision 35a0e719d061c08b52e705135bb2f2126079ed21)
+++ lams_tool_lamc/web/learning/mobile/RunOffline.jsp	(.../RunOffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -96,7 +96,16 @@
 						<html:hidden property="learnerFinished" value="Finished" />
 						
 						<a href="#nogo" id="finishButton" onclick="javascript:submitForm('finish');return false"  data-role="button" data-icon="arrow-r">
-							<span class="nextActivity"><fmt:message key="label.finished" /></span>
+							<span class="nextActivity">
+								<c:choose>
+				 					<c:when test="${activityPosition.last}">
+				 						<fmt:message key="label.submit" />
+				 					</c:when>
+				 					<c:otherwise>
+				 		 				<fmt:message key="label.finished" />
+				 					</c:otherwise>
+					 			</c:choose>
+					 		</span>
 						</a>
 					</c:if>
 	
Index: lams_tool_lamc/web/learning/mobile/ViewAnswers.jsp
===================================================================
diff -u -rd7ee01a444dbd7fc671f945b5fb4f7c5d22ba01c -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_lamc/web/learning/mobile/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision d7ee01a444dbd7fc671f945b5fb4f7c5d22ba01c)
+++ lams_tool_lamc/web/learning/mobile/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -225,7 +225,16 @@
 						<html:hidden property="learnerFinished" value="Finished" />
 									
 						<button id="finishButton" name="finishButton" onclick="submitForm('finish');return false" data-icon="arrow-r" data-theme="b">
-							<span class="nextActivity"><fmt:message key="label.finished" /></span>
+							<span class="nextActivity">
+								<c:choose>
+				 					<c:when test="${activityPosition.last}">
+				 						<fmt:message key="label.submit" />
+				 					</c:when>
+				 					<c:otherwise>
+				 		 				<fmt:message key="label.finished" />
+				 					</c:otherwise>
+					 			</c:choose>
+							</span>
 						</button>
 					</c:if>
 
Index: lams_tool_laqa/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r18525b2aa3870a5731437046f327b7b5e0fea66a -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_laqa/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 18525b2aa3870a5731437046f327b7b5e0fea66a)
+++ lams_tool_laqa/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -74,6 +74,7 @@
 label.answers  =Answers:
 label.answer  =Answer:
 button.endLearning  =Next Activity
+button.submit =Finish
 label.learning.user  =User
 label.learning.attemptTime  =Date/Time
 label.learning.timezone  =Time-Zone
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
===================================================================
diff -u -rcd0b7b82232971e95d54348b03049beb1dfe0ecb -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	(.../QaLearningStarterAction.java)	(revision cd0b7b82232971e95d54348b03049beb1dfe0ecb)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	(.../QaLearningStarterAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -45,6 +45,8 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
+import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -225,6 +227,10 @@
 	    return (mapping.findForward(DEFINE_LATER));
 	}
 
+	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(new Long(
+		toolSessionID), request, getServlet().getServletContext());
+	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
+
 	/*
 	 * fetch question content from content
 	 */
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r96624ae172b4b193603927a3d39c54572e0d6b4c -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 96624ae172b4b193603927a3d39c54572e0d6b4c)
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -137,7 +137,16 @@
 					<html:link href="#nogo" property="endLearning" styleId="finishButton"
 						onclick="javascript:submitMethod('storeAllResults');return false"
 						styleClass="button">
-						<span class="nextActivity"><fmt:message key="button.endLearning" /></span>
+						<span class="nextActivity">
+							<c:choose>
+			 					<c:when test="${sessionMap.activityPosition.last}">
+			 						<fmt:message key="button.submit" />
+			 					</c:when>
+			 					<c:otherwise>
+			 		 				<fmt:message key="button.endLearning" />
+			 					</c:otherwise>
+			 				</c:choose>
+			 			</span>
 					</html:link>
 				    </div>
 				</c:if>
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
diff -u -r7e744772c5b201a6ea2d06d2d2ea2572c98068c5 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 7e744772c5b201a6ea2d06d2d2ea2572c98068c5)
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -293,7 +293,16 @@
 							<html:link href="#nogo" property="endLearning" styleId="finishButton"
 								onclick="javascript:submitMethod('endLearning'); return false;"
 								styleClass="button">
-								<span class="nextActivity"><fmt:message key="button.endLearning" /></span>
+								<span class="nextActivity">
+									<c:choose>
+					 					<c:when test="${sessionMap.activityPosition.last}">
+					 						<fmt:message key="button.submit" />
+					 					</c:when>
+					 					<c:otherwise>
+					 		 				<fmt:message key="button.endLearning" />
+					 					</c:otherwise>
+					 				</c:choose>
+					 			</span>
 							</html:link>
 						</c:if>
 
Index: lams_tool_laqa/web/learning/Notebook.jsp
===================================================================
diff -u -r96624ae172b4b193603927a3d39c54572e0d6b4c -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 96624ae172b4b193603927a3d39c54572e0d6b4c)
+++ lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -60,7 +60,16 @@
 			<div class="space-bottom-top align-right">
 				<html:link href="#nogo" property="submitReflection" styleId="finishButton"
 					onclick="javascript:submitMethod('submitReflection');return false" styleClass="button">
-					<span class="nextActivity"><fmt:message key="button.endLearning" /></span>
+					<span class="nextActivity">					
+						<c:choose>
+		 					<c:when test="${sessionMap.activityPosition.last}">
+		 						<fmt:message key="button.submit" />
+		 					</c:when>
+		 					<c:otherwise>
+		 		 				<fmt:message key="button.endLearning" />
+		 					</c:otherwise>
+		 				</c:choose>
+		 			</span>
 				</html:link>
 			</div>
 		</div>
Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
diff -u -r7e744772c5b201a6ea2d06d2d2ea2572c98068c5 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 7e744772c5b201a6ea2d06d2d2ea2572c98068c5)
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -275,7 +275,14 @@
 		<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' }">
 			<div class="space-bottom-top align-right">
 				<html:button property="endLearning" styleId="finishButton" onclick="javascript:submitMethod('endLearning');" styleClass="button">
-					<fmt:message key="button.endLearning" />
+					<c:choose>
+	 					<c:when test="${sessionMap.activityPosition.last}">
+	 						<fmt:message key="button.submit" />
+	 					</c:when>
+	 					<c:otherwise>
+	 		 				<fmt:message key="button.endLearning" />
+	 					</c:otherwise>
+	 				</c:choose>
 				</html:button>
 			</div>
 		</c:if>
Index: lams_tool_laqa/web/learning/RunOffline.jsp
===================================================================
diff -u -r96624ae172b4b193603927a3d39c54572e0d6b4c -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_laqa/web/learning/RunOffline.jsp	(.../RunOffline.jsp)	(revision 96624ae172b4b193603927a3d39c54572e0d6b4c)
+++ lams_tool_laqa/web/learning/RunOffline.jsp	(.../RunOffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -71,7 +71,16 @@
 					<html:link href="#nogo" property="endLearning" styleId="finishButton"
 						onclick="javascript:submitMethod('endLearning');return false"
 						styleClass="button">
-						<span class="nextActivity"><fmt:message key="button.endLearning" /></span>
+						<span class="nextActivity">
+							<c:choose>
+			 					<c:when test="${sessionMap.activityPosition.last}">
+			 						<fmt:message key="button.submit" />
+			 					</c:when>
+			 					<c:otherwise>
+			 		 				<fmt:message key="button.endLearning" />
+			 					</c:otherwise>
+			 				</c:choose>
+			 			</span>
 					</html:link>
 				</c:if>
 
Index: lams_tool_laqa/web/learning/mobile/IndividualLearnerResults.jsp
===================================================================
diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_laqa/web/learning/mobile/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 35a0e719d061c08b52e705135bb2f2126079ed21)
+++ lams_tool_laqa/web/learning/mobile/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -136,7 +136,16 @@
 				    <div class="space-bottom-top align-right">
 						<a href="#nogo" name="endLearning" id="finishButton"
 							onclick="javascript:submitMethod('storeAllResults');return false" data-icon="arrow-r" data-theme="b">
-							<span class="nextActivity"><fmt:message key="button.endLearning" /></span>
+							<span class="nextActivity">
+								<c:choose>
+				 					<c:when test="${sessionMap.activityPosition.last}">
+				 						<fmt:message key="button.submit" />
+				 					</c:when>
+				 					<c:otherwise>
+				 		 				<fmt:message key="button.endLearning" />
+				 					</c:otherwise>
+				 				</c:choose>
+				 			</span>
 						</a>
 				    </div>
 				</c:if>
Index: lams_tool_laqa/web/learning/mobile/LearnerRep.jsp
===================================================================
diff -u -r7e744772c5b201a6ea2d06d2d2ea2572c98068c5 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_laqa/web/learning/mobile/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 7e744772c5b201a6ea2d06d2d2ea2572c98068c5)
+++ lams_tool_laqa/web/learning/mobile/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -302,7 +302,16 @@
 				<span class="ui-finishbtn-right">
 					<c:if test="${generalLearnerFlowDTO.reflection != 'true'}">
 						<a href="#nogo" name="endLearning" id="finishButton" onclick="javascript:submitMethod('endLearning');" data-role="button" data-icon="arrow-r" data-theme="b">
-							<span class="nextActivity"><fmt:message key="button.endLearning" /></span>
+							<span class="nextActivity">
+								<c:choose>
+				 					<c:when test="${sessionMap.activityPosition.last}">
+				 						<fmt:message key="button.submit" />
+				 					</c:when>
+				 					<c:otherwise>
+				 		 				<fmt:message key="button.endLearning" />
+				 					</c:otherwise>
+				 				</c:choose>
+				 			</span>
 						</a>
 					</c:if>
 
Index: lams_tool_laqa/web/learning/mobile/Notebook.jsp
===================================================================
diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_laqa/web/learning/mobile/Notebook.jsp	(.../Notebook.jsp)	(revision 35a0e719d061c08b52e705135bb2f2126079ed21)
+++ lams_tool_laqa/web/learning/mobile/Notebook.jsp	(.../Notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -9,6 +9,7 @@
 <c:set var="tool">
 	<lams:WebAppURL />
 </c:set>
+<c:set var="sessionMap" value="${sessionScope[generalLearnerFlowDTO.httpSessionID]}" />
 
 <lams:html>
 <lams:head>
@@ -64,7 +65,16 @@
 		<div class="finishButtonDiv">
 			<button name="submitReflection" id="finishButton" onclick="javascript:submitMethod('submitReflection');return false"
 					data-theme="b" data-icon="arrow-r">
-				<span class="nextActivity"><fmt:message key="button.endLearning" /></span>
+				<span class="nextActivity">								
+					<c:choose>
+	 					<c:when test="${sessionMap.activityPosition.last}">
+	 						<fmt:message key="button.submit" />
+	 					</c:when>
+	 					<c:otherwise>
+	 		 				<fmt:message key="button.endLearning" />
+	 					</c:otherwise>
+	 				</c:choose>
+	 			</span>
 			</button>
 		</div>
 	</div><!-- /footer -->
Index: lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp
===================================================================
diff -u -r7e744772c5b201a6ea2d06d2d2ea2572c98068c5 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 7e744772c5b201a6ea2d06d2d2ea2572c98068c5)
+++ lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -300,7 +300,14 @@
 		<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' }">
 			<span class="ui-finishbtn-right">
 				<button name="endLearning" id="finishButton" onclick="javascript:submitMethod('endLearning');" data-icon="arrow-r" data-theme="b">
-					<fmt:message key="button.endLearning" />
+					<c:choose>
+	 					<c:when test="${sessionMap.activityPosition.last}">
+	 						<fmt:message key="button.submit" />
+	 					</c:when>
+	 					<c:otherwise>
+	 		 				<fmt:message key="button.endLearning" />
+	 					</c:otherwise>
+	 				</c:choose>
 				</button>
 			</span>
 		</c:if>
Index: lams_tool_laqa/web/learning/mobile/RunOffline.jsp
===================================================================
diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_laqa/web/learning/mobile/RunOffline.jsp	(.../RunOffline.jsp)	(revision 35a0e719d061c08b52e705135bb2f2126079ed21)
+++ lams_tool_laqa/web/learning/mobile/RunOffline.jsp	(.../RunOffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -74,7 +74,16 @@
 					<html:link href="#nogo" property="endLearning" styleId="finishButton"
 						onclick="javascript:submitMethod('endLearning');return false"
 						styleClass="button">
-						<span class="nextActivity"><fmt:message key="button.endLearning" /></span>
+						<span class="nextActivity">
+							<c:choose>
+			 					<c:when test="${sessionMap.activityPosition.last}">
+			 						<fmt:message key="button.submit" />
+			 					</c:when>
+			 					<c:otherwise>
+			 		 				<fmt:message key="button.endLearning" />
+			 					</c:otherwise>
+			 				</c:choose>
+			 			</span>
 					</html:link>
 				</c:if>
 
Index: lams_tool_larsrc/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r0fa7ccb0a668f2f9cdb80d5f8be18755f469c589 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_larsrc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 0fa7ccb0a668f2f9cdb80d5f8be18755f469c589)
+++ lams_tool_larsrc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -129,6 +129,7 @@
 label.view  =View
 label.edit  =Edit
 label.finished  =Next Activity
+label.submit =Finish
 label.completed  =Completed
 label.finish  =Finished
 button.upload  =Upload
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
===================================================================
diff -u -r84151d175a3fce3cd3ff1bd4eeccfd7cbef01802 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	(.../LearningAction.java)	(revision 84151d175a3fce3cd3ff1bd4eeccfd7cbef01802)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -49,6 +49,8 @@
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
 import org.lamsfoundation.lams.events.DeliveryMethodMail;
+import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -227,6 +229,10 @@
 	resource.setDefineLater(false);
 	service.saveOrUpdateResource(resource);
 
+	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId,
+		request, getServlet().getServletContext());
+	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
+
 	// add run offline support
 	if (resource.getRunOffline()) {
 	    sessionMap.put(ResourceConstants.PARAM_RUN_OFFLINE, true);
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -rbf1c66f82afbc349f5702f29a0c6ab6ff9add34a -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision bf1c66f82afbc349f5702f29a0c6ab6ff9add34a)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -257,7 +257,16 @@
 					<c:otherwise>
 						<html:link href="#nogo" property="FinishButton" styleId="finishButton"
 							onclick="return finishSession()" styleClass="button">
-							<span class="nextActivity"><fmt:message key="label.finished" /></span>
+							<span class="nextActivity">
+								<c:choose>
+				 					<c:when test="${sessionMap.activityPosition.last}">
+				 						<fmt:message key="label.submit" />
+				 					</c:when>
+				 					<c:otherwise>
+				 		 				<fmt:message key="label.finished" />
+				 					</c:otherwise>
+				 				</c:choose>
+							</span>
 						</html:link>
 					</c:otherwise>
 				</c:choose>
Index: lams_tool_larsrc/web/pages/learning/notebook.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_larsrc/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_larsrc/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -43,7 +43,16 @@
 
 			<div class="space-bottom-top align-right">
 				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-					<span class="nextActivity"><fmt:message key="label.finished" /></span>
+					<span class="nextActivity">
+						<c:choose>
+		 					<c:when test="${sessionMap.activityPosition.last}">
+		 						<fmt:message key="label.submit" />
+		 					</c:when>
+		 					<c:otherwise>
+		 		 				<fmt:message key="label.finished" />
+		 					</c:otherwise>
+		 				</c:choose>
+		 			</span>
 				</html:link>
 			</div>
 		</div>
Index: lams_tool_larsrc/web/pages/learning/runoffline.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_larsrc/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_larsrc/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -71,7 +71,16 @@
 				<c:otherwise>
 					<html:link href="#nogo" property="FinishButton" styleId="finishButton"
 						onclick="return finishSession()" styleClass="button">
-						<span class="nextActivity"><fmt:message key="label.finished" /></span>
+						<span class="nextActivity">
+							<c:choose>
+			 					<c:when test="${sessionMap.activityPosition.last}">
+			 						<fmt:message key="label.submit" />
+			 					</c:when>
+			 					<c:otherwise>
+			 		 				<fmt:message key="label.finished" />
+			 					</c:otherwise>
+			 				</c:choose>
+			 			</span>
 					</html:link>
 				</c:otherwise>
 			</c:choose>
Index: lams_tool_mindmap/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -re9f3814b6b6ca31db204710d2eed84d6339807da -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_mindmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e9f3814b6b6ca31db204710d2eed84d6339807da)
+++ lams_tool_mindmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -85,6 +85,7 @@
 button.try.again  =Try Again
 message.learner.blank.input  =You have not written anything. Are you sure this is correct?
 button.finish  =Next Activity
+button.submit =Finish
 message.warnLockOnFinish  =Note: After you click on "Next Activity" and you come back to this Mindmap, you won't be able to continue editing nodes.
 message.activityLocked  =The instructor has set this activity not to allow notes after you have finished it. As you are returning to this Notebook, you are able to see your notes but not allowed to add more.
 titleHeading.instructions  =Instructions
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java
===================================================================
diff -u -r228482c7a091c7691a9fc9651e46a8d98e29a6e1 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 228482c7a091c7691a9fc9651e46a8d98e29a6e1)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -37,6 +37,8 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -146,6 +148,9 @@
 	    mindmapService.saveOrUpdateMindmap(mindmap);
 	}
 
+	LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet()
+		.getServletContext());
+
 	// check runOffline
 	if (mindmap.isRunOffline()) {
 	    return mapping.findForward("runOffline");
@@ -783,6 +788,9 @@
 	if (entry != null)
 	    request.setAttribute("reflectEntry", entry.getEntry());
 
+	LearningWebUtil.putActivityPositionInRequestByToolSessionId(mindmapSession.getSessionId(), request,
+		getServlet().getServletContext());
+
 	return mapping.findForward("reflect");
     }
 
Index: lams_tool_mindmap/web/pages/learning/mindmap.jsp
===================================================================
diff -u -r1420c1000e389cc9a29b3b3d37d2ec63ae735e2d -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_mindmap/web/pages/learning/mindmap.jsp	(.../mindmap.jsp)	(revision 1420c1000e389cc9a29b3b3d37d2ec63ae735e2d)
+++ lams_tool_mindmap/web/pages/learning/mindmap.jsp	(.../mindmap.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -133,7 +133,16 @@
 					<c:otherwise>
 						<div class="space-bottom-top align-right">
 							<html:link href="javascript:submitForm();" styleClass="button" styleId="finishButton">
-								<span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
+								<span class="nextActivity">
+									<c:choose>
+					 					<c:when test="${activityPosition.last}">
+					 						<fmt:message key="button.submit" />
+					 					</c:when>
+					 					<c:otherwise>
+					 		 				<fmt:message key="button.finish" />
+					 					</c:otherwise>
+					 				</c:choose>
+							 	</span>
 							</html:link>
 						</div>
 					</c:otherwise>
Index: lams_tool_mindmap/web/pages/learning/reflect.jsp
===================================================================
diff -u -r0e3cbbc64ebf4ed40b5609de095f9ba369784e83 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_mindmap/web/pages/learning/reflect.jsp	(.../reflect.jsp)	(revision 0e3cbbc64ebf4ed40b5609de095f9ba369784e83)
+++ lams_tool_mindmap/web/pages/learning/reflect.jsp	(.../reflect.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -38,7 +38,16 @@
 			<html:hidden property="mode" />
 			<html:hidden property="dispatch" value="finishActivity"/>
 			<html:link  href="#" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-				<span class="nextActivity"><fmt:message key="button.finish" /></span>
+				<span class="nextActivity">
+					<c:choose>
+						<c:when test="${activityPosition.last}">
+							<fmt:message key="button.submit" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="button.finish" />
+						</c:otherwise>
+					</c:choose>
+				</span>
 			</html:link>
 		</div>
 
Index: lams_tool_mindmap/web/pages/learning/runOffline.jsp
===================================================================
diff -u -r79d80d58b415dfbead2011e4f1701a338b613b11 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_mindmap/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision 79d80d58b415dfbead2011e4f1701a338b613b11)
+++ lams_tool_mindmap/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -38,7 +38,16 @@
 
 			<div align="right" class="space-bottom-top">
 				<html:link href="#" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-					<span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
+					<span class="nextActivity">
+						<c:choose>
+							<c:when test="${activityPosition.last}">
+								<fmt:message key="button.submit" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.finish" />
+							</c:otherwise>
+						</c:choose>
+					</span>
 				</html:link>
 			</div>
 		</html:form>
Index: lams_tool_nb/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rd64e745f43f56f59cbfe3e4f21613d1cbe0f0783 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_nb/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision d64e745f43f56f59cbfe3e4f21613d1cbe0f0783)
+++ lams_tool_nb/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -45,6 +45,7 @@
 button.done  =Done
 button.save  =Save
 button.finish  =Next Activity
+button.submit =Finish
 button.next  =Next
 error.mandatoryField  ={0} field is mandatory.
 error.missingParam  =Unable to continue. {0} is missing.
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java
===================================================================
diff -u -r0eff987dabffcb85157c77e5ec92072fb26a038a -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java	(.../NbLearnerAction.java)	(revision 0eff987dabffcb85157c77e5ec92072fb26a038a)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java	(.../NbLearnerAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -40,6 +40,7 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.util.MessageResources;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -209,7 +210,10 @@
         if (entry != null) {
         	request.setAttribute("reflectEntry", entry.getEntry());
         }
-	  
+        
+        LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet()
+		.getServletContext());
+        
     	return mapping.findForward(NoticeboardConstants.REFLECT_ON_ACTIVITY);
     }
 }
\ No newline at end of file
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java
===================================================================
diff -u -re7d362ffe67c9125bceb715a6abfafb9c31df502 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java	(.../NbLearnerStarterAction.java)	(revision e7d362ffe67c9125bceb715a6abfafb9c31df502)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java	(.../NbLearnerStarterAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -35,6 +35,7 @@
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.util.MessageResources;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -194,6 +195,9 @@
 	    Boolean userFinished = (nbUser!=null && NoticeboardUser.COMPLETED.equals(nbUser.getUserStatus()));
         request.setAttribute("userFinished", userFinished);
 	    
+	LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet()
+		.getServletContext());
+
 	    /*
          * Checks to see if the runOffline flag is set.
          * If the particular flag is set, control is forwarded to jsp page
Index: lams_tool_nb/web/learnerContent.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -79,7 +79,16 @@
 
 						<html:link href="#nogo" property="finishButton" styleClass="button"
 							styleId="finishButton" onclick="submitForm('finish')">
-							<span class="nextActivity"><fmt:message key="button.finish" /></span>
+							<span class="nextActivity">
+								<c:choose>
+									<c:when test="${activityPosition.last}">
+										<fmt:message key="button.submit" />
+									</c:when>
+									<c:otherwise>
+										<fmt:message key="button.finish" />
+									</c:otherwise>
+								</c:choose>
+							</span>
 						</html:link>
 					</c:otherwise>
 				</c:choose>
Index: lams_tool_nb/web/learning/mobile/learnerContent.jsp
===================================================================
diff -u -r93aa85a72fd9f1ae7500829c8371d4b90765a1b1 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_nb/web/learning/mobile/learnerContent.jsp	(.../learnerContent.jsp)	(revision 93aa85a72fd9f1ae7500829c8371d4b90765a1b1)
+++ lams_tool_nb/web/learning/mobile/learnerContent.jsp	(.../learnerContent.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -78,7 +78,16 @@
 						
 					<c:otherwise>
 						<a href="#nogo" name="finishButton"	id="finishButton" onclick="submitForm('finish')" data-role="button" data-icon="arrow-r" data-theme="b">
-							<span class="nextActivity"><fmt:message key="button.finish" /></span>
+							<span class="nextActivity">
+								<c:choose>
+									<c:when test="${activityPosition.last}">
+										<fmt:message key="button.submit" />
+									</c:when>
+									<c:otherwise>
+										<fmt:message key="button.finish" />
+									</c:otherwise>
+								</c:choose>
+							</span>
 						</a>
 					</c:otherwise>
 				</c:choose>
Index: lams_tool_nb/web/learning/mobile/message.jsp
===================================================================
diff -u -r93aa85a72fd9f1ae7500829c8371d4b90765a1b1 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_nb/web/learning/mobile/message.jsp	(.../message.jsp)	(revision 93aa85a72fd9f1ae7500829c8371d4b90765a1b1)
+++ lams_tool_nb/web/learning/mobile/message.jsp	(.../message.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -45,8 +45,16 @@
 				</c:when>
 				<c:otherwise>
 					<a href="#nogo" id="finishButton" onclick="submitForm('finish')" data-role="button" data-icon="arrow-r" data-theme="b">
-						<span class="nextActivity"><fmt:message key="button.finish" /></span>
-					</a>
+					<span class="nextActivity">
+							<c:choose>
+								<c:when test="${activityPosition.last}">
+									<fmt:message key="button.submit" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="button.finish" />
+								</c:otherwise>
+							</c:choose>
+					</span> </a>
 				</c:otherwise>
 			</c:choose>
 		</html:form>
Index: lams_tool_nb/web/learning/mobile/reflect.jsp
===================================================================
diff -u -r93aa85a72fd9f1ae7500829c8371d4b90765a1b1 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_nb/web/learning/mobile/reflect.jsp	(.../reflect.jsp)	(revision 93aa85a72fd9f1ae7500829c8371d4b90765a1b1)
+++ lams_tool_nb/web/learning/mobile/reflect.jsp	(.../reflect.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -32,8 +32,16 @@
 			<html:hidden property="mode" />
 			<html:hidden property="method" value="finish"/>
 			<a href="#nogo" id="finishButton" onclick="submitForm('finish')" data-role="button" data-icon="arrow-r" data-theme="b">
-				<span class="nextActivity"><fmt:message key="button.finish" /></span>
-			</a>
+				<span class="nextActivity">
+					<c:choose>
+						<c:when test="${activityPosition.last}">
+							<fmt:message key="button.submit" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="button.finish" />
+						</c:otherwise>
+					</c:choose>
+			</span> </a>
 		</span>
 	</div>
 </html:form>
Index: lams_tool_nb/web/message.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_nb/web/message.jsp	(.../message.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_nb/web/message.jsp	(.../message.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -42,7 +42,16 @@
 				</c:when>
 				<c:otherwise>
 					<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-						<span class="nextActivity"><fmt:message key="button.finish" /></span>
+						<span class="nextActivity">
+							<c:choose>
+								<c:when test="${activityPosition.last}">
+									<fmt:message key="button.submit" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="button.finish" />
+								</c:otherwise>
+							</c:choose>
+						</span>
 					</html:link>
 				</c:otherwise>
 			</c:choose>
Index: lams_tool_nb/web/reflect.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_nb/web/reflect.jsp	(.../reflect.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_nb/web/reflect.jsp	(.../reflect.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -27,7 +27,16 @@
 			<html:hidden property="mode" />
 			<html:hidden property="method" value="finish"/>
 			<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-				<span class="nextActivity"><fmt:message key="button.finish" /></span>
+				<span class="nextActivity">								
+					<c:choose>
+						<c:when test="${activityPosition.last}">
+							<fmt:message key="button.submit" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="button.finish" />
+						</c:otherwise>
+					</c:choose>
+				</span>
 			</html:link>
 		</div>
 			 
Index: lams_tool_notebook/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r0fa7ccb0a668f2f9cdb80d5f8be18755f469c589 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_notebook/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 0fa7ccb0a668f2f9cdb80d5f8be18755f469c589)
+++ lams_tool_notebook/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -62,6 +62,7 @@
 button.done  =Done
 button.save  =Save
 button.finish  =Next Activity
+button.submit =Finish
 button.next  =Next
 label.save  =Save
 label.cancel  =Cancel
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java
===================================================================
diff -u -r228482c7a091c7691a9fc9651e46a8d98e29a6e1 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 228482c7a091c7691a9fc9651e46a8d98e29a6e1)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -36,6 +36,7 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -130,7 +131,10 @@
 			notebook.setContentInUse(new Boolean(true));
 			notebookService.saveOrUpdateNotebook(notebook);
 		}
-
+		
+		LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet()
+			.getServletContext());
+		
 		// check runOffline
 		if (notebook.isRunOffline()) {
 			return mapping.findForward("runOffline");
Index: lams_tool_notebook/web/pages/learning/mobile/notebook.jsp
===================================================================
diff -u -rc1bac3f52766d06de067d8c7f2f5bb4b1f549e2b -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_notebook/web/pages/learning/mobile/notebook.jsp	(.../notebook.jsp)	(revision c1bac3f52766d06de067d8c7f2f5bb4b1f549e2b)
+++ lams_tool_notebook/web/pages/learning/mobile/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -99,7 +99,16 @@
 			<c:when test="${contentEditable}">
 				<span class="ui-finishbtn-right">
 					<a href="#nogo" id="finishButton" onclick="submitForm('finish')" data-role="button" data-icon="arrow-r" data-theme="b">
-						<span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
+						<span class="nextActivity">
+							<c:choose>
+								<c:when test="${activityPosition.last}">
+									<fmt:message key="button.submit" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="button.finish" />
+								</c:otherwise>
+							</c:choose>
+						</span>
 					</a>
 				</span>
 			</c:when>
Index: lams_tool_notebook/web/pages/learning/mobile/runOffline.jsp
===================================================================
diff -u -rc1bac3f52766d06de067d8c7f2f5bb4b1f549e2b -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_notebook/web/pages/learning/mobile/runOffline.jsp	(.../runOffline.jsp)	(revision c1bac3f52766d06de067d8c7f2f5bb4b1f549e2b)
+++ lams_tool_notebook/web/pages/learning/mobile/runOffline.jsp	(.../runOffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -43,7 +43,16 @@
 				<html:hidden property="toolSessionID" />
 	
 				<a href="#nogo" id="finishButton" onclick="submitForm('finish')" data-role="button" data-icon="arrow-r" data-theme="b">
-					<span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
+					<span class="nextActivity">
+						<c:choose>
+							<c:when test="${activityPosition.last}">
+								<fmt:message key="button.submit" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.finish" />
+							</c:otherwise>
+						</c:choose>
+					</span>
 				</a>
 			</html:form>
 		</c:if>
Index: lams_tool_notebook/web/pages/learning/notebook.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -101,7 +101,16 @@
 
 				<div class="space-bottom-top align-right">
 					<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-						<span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
+						<span class="nextActivity">
+							<c:choose>
+								<c:when test="${activityPosition.last}">
+									<fmt:message key="button.submit" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="button.finish" />
+								</c:otherwise>
+							</c:choose>
+						</span>
 					</html:link>
 				</div>
 
Index: lams_tool_notebook/web/pages/learning/runOffline.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_notebook/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_notebook/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -37,7 +37,16 @@
 
 			<div align="right" class="space-bottom-top">
 				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-					<span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
+					<span class="nextActivity">
+						<c:choose>
+							<c:when test="${activityPosition.last}">
+								<fmt:message key="button.submit" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.finish" />
+							</c:otherwise>
+						</c:choose>
+					</span>
 				</html:link>
 			</div>
 		</html:form>
Index: lams_tool_pixlr/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -ra66a1af6ef3d93a6f43f64a38df9987896b19741 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_pixlr/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a66a1af6ef3d93a6f43f64a38df9987896b19741)
+++ lams_tool_pixlr/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -76,6 +76,7 @@
 error.mandatoryField  ={0} field is mandatory.
 button.try.again  =Try Again
 button.finish  =Next Activity
+button.submit =Finish
 message.alertContentEdit  =Warning: One or more learners have accessed this activity. Changing this content will result in learners getting different information.
 message.warnLockOnFinish  =Note: After you click on "Next Activity" and you come back to this Pixlr activity, you won't be able to continue editing your image.
 message.warnLockOnFinishViewAll  =Note: After you click on "View All Pixlr Images" and you come back to this Pixlr activity, you won't be able to continue editing your image.
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java
===================================================================
diff -u -r228482c7a091c7691a9fc9651e46a8d98e29a6e1 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 228482c7a091c7691a9fc9651e46a8d98e29a6e1)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -47,6 +47,7 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -143,6 +144,9 @@
 	    pixlr.setContentInUse(new Boolean(true));
 	    pixlrService.saveOrUpdatePixlr(pixlr);
 	}
+	
+	LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet()
+		.getServletContext());
 
 	// check runOffline
 	if (pixlr.isRunOffline()) {
@@ -366,6 +370,9 @@
 	if (notebookEntry != null) {
 	    lrnForm.setEntryText(notebookEntry.getEntry());
 	}
+	
+	LearningWebUtil.putActivityPositionInRequestByToolSessionId(pixlrUser.getPixlrSession().getSessionId(),
+		request, getServlet().getServletContext());
 
 	return mapping.findForward("notebook");
     }
@@ -451,6 +458,10 @@
 	request.setAttribute("pixlrDTO", new PixlrDTO(pixlr));
 	request.setAttribute("mode", mode);
 	request.setAttribute("pixlrImageFolderURL", PixlrConstants.LAMS_WWW_PIXLR_FOLDER_URL);
+	
+	LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet()
+		.getServletContext());
+	
 	return mapping.findForward("viewAll");
     }
 
Index: lams_tool_pixlr/web/pages/learning/notebook.jsp
===================================================================
diff -u -r74b71c544bb3970571e885fd2e56fb22c9880f19 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_pixlr/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 74b71c544bb3970571e885fd2e56fb22c9880f19)
+++ lams_tool_pixlr/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -53,7 +53,16 @@
 				<div class="space-bottom-top align-right">
 					<html:hidden property="dispatch" value="submitReflection" />
 					<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-						<span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
+						<span class="nextActivity">
+							<c:choose>
+								<c:when test="${activityPosition.last}">
+									<fmt:message key="button.submit" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="button.finish" />
+								</c:otherwise>
+							</c:choose>
+						</span>
 					</html:link>
 				</div>
 			</html:form>
Index: lams_tool_pixlr/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_pixlr/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_pixlr/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -63,7 +63,16 @@
 					<c:otherwise>
 						<html:hidden property="dispatch" value="finishActivity" />
 						<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finished');">
-							<span class="nextActivity"><fmt:message key="button.finish" /></span>
+							<span class="nextActivity">
+								<c:choose>
+									<c:when test="${activityPosition.last}">
+										<fmt:message key="button.submit" />
+									</c:when>
+									<c:otherwise>
+										<fmt:message key="button.finish" />
+									</c:otherwise>
+								</c:choose>
+							</span>
 						</html:link>
 					</c:otherwise>
 				</c:choose>
Index: lams_tool_pixlr/web/pages/learning/runOffline.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_pixlr/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_pixlr/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -26,7 +26,16 @@
 
 			<div align="right" class="space-bottom-top">
 				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-					<span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
+					<span class="nextActivity">
+						<c:choose>
+							<c:when test="${activityPosition.last}">
+								<fmt:message key="button.submit" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.finish" />
+							</c:otherwise>
+						</c:choose>
+					</span>
 				</html:link>
 			</div>
 		</html:form>
Index: lams_tool_pixlr/web/pages/learning/viewAll.jsp
===================================================================
diff -u -r74b71c544bb3970571e885fd2e56fb22c9880f19 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_pixlr/web/pages/learning/viewAll.jsp	(.../viewAll.jsp)	(revision 74b71c544bb3970571e885fd2e56fb22c9880f19)
+++ lams_tool_pixlr/web/pages/learning/viewAll.jsp	(.../viewAll.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -113,7 +113,16 @@
 					</c:when>
 					<c:otherwise>
 						<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finished');return false">
-							<span class="nextActivity"><fmt:message key="button.finish" /></span>
+							<span class="nextActivity">
+								<c:choose>
+									<c:when test="${activityPosition.last}">
+										<fmt:message key="button.submit" />
+									</c:when>
+									<c:otherwise>
+										<fmt:message key="button.finish" />
+									</c:otherwise>
+								</c:choose>
+							</span>
 						</html:link>
 					</c:otherwise>
 				</c:choose>
Index: lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -ra66a1af6ef3d93a6f43f64a38df9987896b19741 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a66a1af6ef3d93a6f43f64a38df9987896b19741)
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -100,6 +100,7 @@
 message.monitoring.edit.activity.not.editable  =This Activity is no longer editable
 button.try.again  =Try again
 button.finish  =Next Activity
+button.submit =Finish
 label.submit.file.suffix  =submitted the following files
 label.assign.mark.message.prefix  =Please assign a mark and a comment for the report by
 label.session.name  =Session name
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
diff -u -r84151d175a3fce3cd3ff1bd4eeccfd7cbef01802 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision 84151d175a3fce3cd3ff1bd4eeccfd7cbef01802)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -47,6 +47,7 @@
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.events.DeliveryMethodMail;
 import org.lamsfoundation.lams.events.IEventNotificationService;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -170,6 +171,9 @@
 	content.setDefineLater(false);
 	submitFilesService.saveOrUpdateContent(content);
 
+	LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionID, request, getServlet()
+		.getServletContext());
+
 	// add run offline support
 	if (content.isRunOffline()) {
 	    return mapping.findForward("runOffline");
@@ -229,6 +233,9 @@
 	// set the mode into http session
 	Long sessionID = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 
+	LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionID, request, getServlet()
+		.getServletContext());
+	
 	if (validateUploadForm(learnerForm, request)) {
 	    // get session from shared session.
 	    HttpSession ss = SessionManager.getSession();
Index: lams_tool_sbmt/web/learner/notebook.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_sbmt/web/learner/notebook.jsp	(.../notebook.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_sbmt/web/learner/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -41,7 +41,16 @@
 
 			<div class="space-bottom-top align-right">
 				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-					<span class="nextActivity"><fmt:message key="button.finish" /></span
+					<span class="nextActivity">
+						<c:choose>
+							<c:when test="${activityPosition.last}">
+								<fmt:message key="button.submit" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.finish" />
+							</c:otherwise>
+						</c:choose>
+					</span>
 				</html:link>
 			</div>
 	</html:form>
Index: lams_tool_sbmt/web/learner/runoffline.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_sbmt/web/learner/runoffline.jsp	(.../runoffline.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_sbmt/web/learner/runoffline.jsp	(.../runoffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -85,7 +85,16 @@
 				<c:otherwise>
 					<html:link href="#nogo" property="finishButton" onclick="javascript:finish();"
 						styleClass="button" styleId="finishButton">
-						<span class="nextActivity"><fmt:message key="button.finish" /></span>
+						<span class="nextActivity">
+							<c:choose>
+								<c:when test="${activityPosition.last}">
+									<fmt:message key="button.submit" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="button.finish" />
+								</c:otherwise>
+							</c:choose>
+						</span>
 					</html:link>
 				</c:otherwise>
 			</c:choose>
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -rbf1c66f82afbc349f5702f29a0c6ab6ff9add34a -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision bf1c66f82afbc349f5702f29a0c6ab6ff9add34a)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -291,7 +291,16 @@
 							<html:link href="#nogo" property="finishButton"
 								onclick="finish();return false" styleClass="button"
 								styleId="finishButton">
-								<span class="nextActivity"><fmt:message key="button.finish" /></span>
+								<span class="nextActivity">
+									<c:choose>
+										<c:when test="${activityPosition.last}">
+											<fmt:message key="button.submit" />
+										</c:when>
+										<c:otherwise>
+											<fmt:message key="button.finish" />
+										</c:otherwise>
+									</c:choose>
+								</span>
 							</html:link>
 						</c:otherwise>
 					</c:choose>
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
===================================================================
diff -u -r2fc43fdb5c3b774790abb743a5c71587fff6f716 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	(.../LearningAction.java)	(revision 2fc43fdb5c3b774790abb743a5c71587fff6f716)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -45,6 +45,8 @@
 import org.apache.struts.action.ActionRedirect;
 import org.apache.tomcat.util.json.JSONException;
 import org.apache.tomcat.util.json.JSONObject;
+import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -204,6 +206,10 @@
 	scratchie.setDefineLater(false);
 	service.saveOrUpdateScratchie(scratchie);
 
+	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionId, request, getServlet()
+		.getServletContext());
+	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
+	
 	// add run offline support
 	if (scratchie.getRunOffline()) {
 	    sessionMap.put(ScratchieConstants.PARAM_RUN_OFFLINE, true);
Index: lams_tool_scratchie/web/pages/learning/notebook.jsp
===================================================================
diff -u -r6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_scratchie/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18)
+++ lams_tool_scratchie/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -42,7 +42,16 @@
 
 			<div class="space-bottom-top align-right">
 				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-					<span class="nextActivity"><fmt:message key="label.finished" /></span>
+					<span class="nextActivity">
+						<c:choose>
+							<c:when test="${sessionMap.activityPosition.last}">
+								<fmt:message key="label.submit" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.finished" />
+							</c:otherwise>
+						</c:choose>
+					</span>
 				</html:link>
 			</div>
 		</div>
Index: lams_tool_scratchie/web/pages/learning/questionlist.jsp
===================================================================
diff -u -r21081ea8553b6759d6140682f0fae7c64f430033 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_scratchie/web/pages/learning/questionlist.jsp	(.../questionlist.jsp)	(revision 21081ea8553b6759d6140682f0fae7c64f430033)
+++ lams_tool_scratchie/web/pages/learning/questionlist.jsp	(.../questionlist.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -100,7 +100,16 @@
 							</c:when>
 							<c:otherwise>
 								<html:link href="#nogo" property="finishButton" styleId="finishButton" onclick="return finish(false)" styleClass="button">
-									<span class="nextActivity"><fmt:message key="label.finished" /></span>
+									<span class="nextActivity">
+										<c:choose>
+											<c:when test="${sessionMap.activityPosition.last}">
+												<fmt:message key="label.submit" />
+											</c:when>
+											<c:otherwise>
+												<fmt:message key="label.finished" />
+											</c:otherwise>
+										</c:choose>
+									</span>
 								</html:link>
 							</c:otherwise>
 						</c:choose>
Index: lams_tool_scratchie/web/pages/learning/results.jsp
===================================================================
diff -u -r99545d1824fcf0b2ea23a6bdce46aab3b288bff5 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_scratchie/web/pages/learning/results.jsp	(.../results.jsp)	(revision 99545d1824fcf0b2ea23a6bdce46aab3b288bff5)
+++ lams_tool_scratchie/web/pages/learning/results.jsp	(.../results.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -111,7 +111,16 @@
 					</c:when>
 					<c:otherwise>
 						<html:link href="#nogo" property="finishButton" styleId="finishButton" onclick="return finishSession()" styleClass="button">
-							<span class="nextActivity"><fmt:message key="label.finished" /></span>
+							<span class="nextActivity">
+								<c:choose>
+									<c:when test="${sessionMap.activityPosition.last}">
+										<fmt:message key="label.submit" />
+									</c:when>
+									<c:otherwise>
+										<fmt:message key="label.finished" />
+									</c:otherwise>
+								</c:choose>
+							</span>
 						</html:link>
 					</c:otherwise>
 				</c:choose>
Index: lams_tool_scratchie/web/pages/learning/runoffline.jsp
===================================================================
diff -u -r6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_scratchie/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18)
+++ lams_tool_scratchie/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -71,7 +71,16 @@
 				<c:otherwise>
 					<html:link href="#nogo" property="FinishButton" styleId="finishButton"
 						onclick="return finishSession()" styleClass="button">
-						<span class="nextActivity"><fmt:message key="label.finished" /></span>
+						<span class="nextActivity">
+							<c:choose>
+								<c:when test="${sessionMap.activityPosition.last}">
+									<fmt:message key="label.submit" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="label.finished" />
+								</c:otherwise>
+							</c:choose>
+						</span>
 					</html:link>
 				</c:otherwise>
 			</c:choose>
Index: lams_tool_scribe/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r542c2cefed9f7ef2c515eff59a06f508330e24f7 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_scribe/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 542c2cefed9f7ef2c515eff59a06f508330e24f7)
+++ lams_tool_scribe/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -68,6 +68,7 @@
 button.done  =Done
 button.save  =Save
 button.finish  =Next Activity
+button.submitActivity =Finish
 button.continue  =Continue
 button.next  =Next
 label.save  =Save
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java
===================================================================
diff -u -r228482c7a091c7691a9fc9651e46a8d98e29a6e1 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 228482c7a091c7691a9fc9651e46a8d98e29a6e1)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -38,6 +38,7 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -134,6 +135,9 @@
 			scribeService.saveOrUpdateScribe(scribe);
 		}
 
+		LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet()
+			.getServletContext());
+		
 		// Retrieve the current user
 		ScribeUser scribeUser = getCurrentUser(toolSessionID);
 
@@ -295,6 +299,10 @@
 				.getScribe());
 
 		request.setAttribute("scribeDTO", scribeDTO);
+		
+		LearningWebUtil.putActivityPositionInRequestByToolSessionId(scribeUser.getScribeSession().getSessionId(),
+			request, getServlet().getServletContext());
+
 		return mapping.findForward("notebook");
 	}
 
@@ -456,6 +464,9 @@
 
 		if ( session.getScribe().isShowAggregatedReports() )
 			setupOtherGroupReportDTO(request, session, scribeUser);
+        
+        	LearningWebUtil.putActivityPositionInRequestByToolSessionId(session.getSessionId(), request, getServlet()
+        		.getServletContext());
 
 		return mapping.findForward("report");
 	}
Index: lams_tool_scribe/web/pages/learning/notebook.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_scribe/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_scribe/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -29,7 +29,16 @@
 
 		<div class="space-bottom-top align-right">
 			<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-				<span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
+				<span class="nextActivity">
+					<c:choose>
+	 					<c:when test="${activityPosition.last}">
+	 						<fmt:message key="button.submitActivity" />
+	 					</c:when>
+	 					<c:otherwise>
+	 		 				<fmt:message key="button.finish" />
+	 					</c:otherwise>
+	 				</c:choose>
+	 			</span>
 			</html:link>
 		</div>
 
Index: lams_tool_scribe/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_scribe/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_scribe/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -29,7 +29,16 @@
 			<c:otherwise>
 				<html:hidden property="dispatch" value="finishActivity" />
 				<html:link href="#nogo" styleClass="button right-buttons" styleId="finishButton" onclick="submitForm('finish')">
-					<span class="nextActivity"><fmt:message key="button.finish" /></span>
+					<span class="nextActivity">
+						<c:choose>
+		 					<c:when test="${activityPosition.last}">
+		 						<fmt:message key="button.submitActivity" />
+		 					</c:when>
+		 					<c:otherwise>
+		 		 				<fmt:message key="button.finish" />
+		 					</c:otherwise>
+		 				</c:choose>
+		 			</span>
 				</html:link>
 			</c:otherwise>
 		</c:choose>
Index: lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r542c2cefed9f7ef2c515eff59a06f508330e24f7 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 542c2cefed9f7ef2c515eff59a06f508330e24f7)
+++ lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -124,6 +124,7 @@
 label.continue  =Continue
 button.close  =Close
 label.finished  =Next Activity
+label.submit =Finish
 label.finish  =Finished
 error.msg.repository  =A repository error occurred while trying to upload the file.
 message.alertContentEdit  =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information.
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java
===================================================================
diff -u -r7ad2323d78099d17d6df1936bd1bdabd89483db5 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java	(.../LearningAction.java)	(revision 7ad2323d78099d17d6df1936bd1bdabd89483db5)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -40,6 +40,8 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionRedirect;
 import org.apache.struts.config.ForwardConfig;
+import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -172,6 +174,10 @@
 		spreadsheet.setDefineLater(false);
 		service.saveOrUpdateSpreadsheet(spreadsheet);
 		
+            	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId,
+            		request, getServlet().getServletContext());
+            	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
+
 		//add run offline support
 		if(spreadsheet.getRunOffline()){
 			sessionMap.put(SpreadsheetConstants.PARAM_RUN_OFFLINE, true);
Index: lams_tool_spreadsheet/web/pages/learning/learning.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_spreadsheet/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_spreadsheet/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -173,7 +173,16 @@
 					</c:when>
 					<c:otherwise>
 						<html:link href="#nogo" property="FinishButton" styleId="finishButton"	onclick="return finishSession()" styleClass="button">
-							<span class="nextActivity"><fmt:message key="label.finished" /></span>
+							<span class="nextActivity">
+								<c:choose>
+				 					<c:when test="${sessionMap.activityPosition.last}">
+				 						<fmt:message key="label.submit" />
+				 					</c:when>
+				 					<c:otherwise>
+				 		 				<fmt:message key="label.finished" />
+				 					</c:otherwise>
+				 				</c:choose>
+				 			</span>
 						</html:link>
 					</c:otherwise>
 				</c:choose>
Index: lams_tool_spreadsheet/web/pages/learning/notebook.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_spreadsheet/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_spreadsheet/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -43,7 +43,16 @@
 
 			<div class="space-bottom-top align-right">
 				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-					<span class="nextActivity"><fmt:message key="label.finished" /></span>
+					<span class="nextActivity">
+						<c:choose>
+							<c:when test="${sessionMap.activityPosition.last}">
+								<fmt:message key="label.submit" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.finished" />
+							</c:otherwise>
+						</c:choose>
+					</span>
 				</html:link>
 			</div>
 		</div>
Index: lams_tool_spreadsheet/web/pages/learning/runoffline.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_spreadsheet/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_spreadsheet/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -71,7 +71,16 @@
 				<c:otherwise>
 					<html:link href="#nogo" property="FinishButton" styleId="finishButton"
 						onclick="return finishSession()" styleClass="button">
-						<span class="nextActivity"><fmt:message key="label.finished" /></span>
+						<span class="nextActivity">
+							<c:choose>
+			 					<c:when test="${sessionMap.activityPosition.last}">
+			 						<fmt:message key="label.submit" />
+			 					</c:when>
+			 					<c:otherwise>
+			 		 				<fmt:message key="label.finished" />
+			 					</c:otherwise>
+			 				</c:choose>
+			 			</span>
 					</html:link>
 				</c:otherwise>
 			</c:choose>
Index: lams_tool_survey/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r542c2cefed9f7ef2c515eff59a06f508330e24f7 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_survey/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 542c2cefed9f7ef2c515eff59a06f508330e24f7)
+++ lams_tool_survey/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -103,6 +103,7 @@
 label.view  =View
 label.edit  =Edit
 label.finished  =Next Activity
+label.submit =Finish
 label.completed  =Completed
 label.finish  =Next Activity
 button.upload  =Upload
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java
===================================================================
diff -u -r84151d175a3fce3cd3ff1bd4eeccfd7cbef01802 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java	(.../LearningAction.java)	(revision 84151d175a3fce3cd3ff1bd4eeccfd7cbef01802)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -49,6 +49,8 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.lamsfoundation.lams.events.DeliveryMethodMail;
+import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -210,6 +212,10 @@
 	    sessionMap.put(SurveyConstants.PARAM_RUN_OFFLINE, false);
 	}
 
+	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId,
+		request, getServlet().getServletContext());
+	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
+
 	// check if there is submission deadline
 	Date submissionDeadline = survey.getSubmissionDeadline();
 	if (submissionDeadline != null) {
Index: lams_tool_survey/web/pages/learning/result.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -154,7 +154,16 @@
 								<c:otherwise>
 									<html:link href="#nogo" property="FinishButton" styleId="finishButton"
 										onclick="return finishSession()" styleClass="button">
-										<span class="nextActivity"><fmt:message key="label.finished" /></span>
+										<span class="nextActivity">
+											<c:choose>
+							 					<c:when test="${sessionMap.activityPosition.last}">
+							 						<fmt:message key="label.submit" />
+							 					</c:when>
+							 					<c:otherwise>
+							 		 				<fmt:message key="label.finished" />
+							 					</c:otherwise>
+							 				</c:choose>
+							 			</span>
 									</html:link>
 								</c:otherwise>
 							</c:choose> </span>
Index: lams_tool_survey/web/pages/learning/runoffline.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_survey/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_survey/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -84,7 +84,16 @@
 				<c:otherwise>
 					<html:link href="#nogo" property="FinishButton" styleId="finishButton"
 						onclick="return finishSession()" styleClass="button">
-						<span class="nextActivity"><fmt:message key="label.finished" /></span>
+						<span class="nextActivity">
+							<c:choose>
+			 					<c:when test="${sessionMap.activityPosition.last}">
+			 						<fmt:message key="label.submit" />
+			 					</c:when>
+			 					<c:otherwise>
+			 		 				<fmt:message key="label.finished" />
+			 					</c:otherwise>
+			 				</c:choose>
+			 			</span>
 					</html:link>
 				</c:otherwise>
 			</c:choose>
Index: lams_tool_task/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rd64e745f43f56f59cbfe3e4f21613d1cbe0f0783 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_task/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision d64e745f43f56f59cbfe3e4f21613d1cbe0f0783)
+++ lams_tool_task/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -152,6 +152,7 @@
 button.close  =Close
 message.alertContentEdit  =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information.
 label.finished  =Next Activity
+label.submit =Finish
 label.finish  =Next Activity
 label.default.user.name  =Instructor
 output.desc.learner.number.of.tasks.completed  =Number of Tasks Completed
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java
===================================================================
diff -u -rc142236c124ecebfa9f29ea91c71759c579e1c61 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java	(.../LearningAction.java)	(revision c142236c124ecebfa9f29ea91c71759c579e1c61)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -52,6 +52,8 @@
 import org.apache.struts.action.ActionRedirect;
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
+import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -323,6 +325,10 @@
 		taskList.setDefineLater(false);
 		service.saveOrUpdateTaskList(taskList);
 		
+        	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId,
+        		request, getServlet().getServletContext());
+        	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
+
 		//add run offline support
 		if(taskList.getRunOffline()){
 			sessionMap.put(TaskListConstants.PARAM_RUN_OFFLINE, true);
Index: lams_tool_task/web/pages/learning/learning.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_task/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_task/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -211,7 +211,16 @@
 					<c:otherwise>
 						<html:link href="#nogo" property="FinishButton" styleId="finishButton"
 							onclick="return finishSession()" styleClass="button">
-							<span class="nextActivity"><fmt:message key="label.finished" /></span>
+							<span class="nextActivity">
+								<c:choose>
+									<c:when test="${sessionMap.activityPosition.last}">
+										<fmt:message key="label.submit" />
+									</c:when>
+									<c:otherwise>
+										<fmt:message key="label.finished" />
+									</c:otherwise>
+								</c:choose>
+							</span>
 						</html:link>
 					</c:otherwise>
 				</c:choose>
Index: lams_tool_task/web/pages/learning/parts/notebook.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_task/web/pages/learning/parts/notebook.jsp	(.../notebook.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_task/web/pages/learning/parts/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -43,7 +43,16 @@
 
 			<div class="space-bottom-top align-right">
 				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-					<span class="nextActivity"><fmt:message key="label.finish" /></span>
+					<span class="nextActivity">
+						<c:choose>
+							<c:when test="${sessionMap.activityPosition.last}">
+								<fmt:message key="label.submit" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.finished" />
+							</c:otherwise>
+						</c:choose>
+					</span>
 				</html:link>
 			</div>
 		</div>
Index: lams_tool_task/web/pages/learning/runoffline.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_task/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_task/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -81,7 +81,16 @@
 				<c:otherwise>
 					<html:link href="#nogo" property="FinishButton" styleId="finishButton"
 						onclick="return finishSession()" styleClass="button">
-						<span class="nextActivity"><fmt:message key="label.finished" /></span>
+						<span class="nextActivity">
+							<c:choose>
+								<c:when test="${sessionMap.activityPosition.last}">
+									<fmt:message key="label.submit" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="label.finished" />
+								</c:otherwise>
+							</c:choose>
+						</span>
 					</html:link>
 				</c:otherwise>
 			</c:choose>
Index: lams_tool_videorecorder/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r542c2cefed9f7ef2c515eff59a06f508330e24f7 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_videorecorder/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 542c2cefed9f7ef2c515eff59a06f508330e24f7)
+++ lams_tool_videorecorder/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -85,6 +85,7 @@
 button.try.again  =Try Again
 message.learner.blank.input  =You have not written anything. Are you sure this is correct?
 button.finish  =Next Activity
+button.submit =Finish
 button.continue  =Continue
 message.warnLockOnFinish  =Note: After you click on "Next Activity" and you come back to this Notebook, you won't be able to continue adding notes.
 message.activityLocked  =The instructor has set this activity not to allow notes after you have finished it. As you are returning to this Notebook, you are able to see your notes but not allowed to add more.
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java
===================================================================
diff -u -r228482c7a091c7691a9fc9651e46a8d98e29a6e1 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 228482c7a091c7691a9fc9651e46a8d98e29a6e1)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -36,6 +36,8 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.lamsfoundation.lams.dao.IBaseDAO;
+import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.ToolSession;
@@ -164,6 +166,9 @@
 			videoRecorder.setContentInUse(new Boolean(true));
 			videoRecorderService.saveOrUpdateVideoRecorder(videoRecorder);
 		}
+		
+        	LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet()
+        		.getServletContext());
 
 		// check runOffline
 		if (videoRecorder.isRunOffline()) {
Index: lams_tool_videorecorder/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_videorecorder/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_videorecorder/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -60,7 +60,16 @@
 			<c:otherwise>
 				<html:hidden property="dispatch" value="finishActivity" />
 				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-					<span class="nextActivity"><fmt:message key="button.finish" /></span>
+					<span class="nextActivity">
+						<c:choose>
+		 					<c:when test="${activityPosition.last}">
+		 						<fmt:message key="button.submit" />
+		 					</c:when>
+		 					<c:otherwise>
+		 		 				<fmt:message key="button.finish" />
+		 					</c:otherwise>
+		 				</c:choose>
+		 			</span>
 				</html:link>
 			</c:otherwise>
 		</c:choose>
Index: lams_tool_vote/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r542c2cefed9f7ef2c515eff59a06f508330e24f7 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_vote/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 542c2cefed9f7ef2c515eff59a06f508330e24f7)
+++ lams_tool_vote/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -77,6 +77,7 @@
 label.retake  =Redo Vote
 label.submit.vote  =Submit Vote
 button.endLearning  =Next Activity
+button.submitActivity =Finish
 label.user  =User
 label.attemptTime  =Voting Time
 sbmt.learner.nominations.successful  =Your votes have been submitted.
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java
===================================================================
diff -u -r618abc7cca98f08ef288878ab371a3693492d835 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	(.../VoteLearningAction.java)	(revision 618abc7cca98f08ef288878ab371a3693492d835)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	(.../VoteLearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -43,6 +43,7 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
@@ -298,6 +299,10 @@
 	logger.debug("view-only voteGeneralLearnerFlowDTO: " + voteGeneralLearnerFlowDTO);
 	request.setAttribute(VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO);
 
+
+	LearningWebUtil.putActivityPositionInRequestByToolSessionId(new Long(toolSessionID), request, getServlet()
+		.getServletContext());
+	
 	logger.debug("fwding to ALL_NOMINATIONS: " + ALL_NOMINATIONS);
 	return (mapping.findForward(ALL_NOMINATIONS));
     }
@@ -382,6 +387,10 @@
 	logger.debug("final voteGeneralLearnerFlowDTO: " + voteGeneralLearnerFlowDTO);
 	request.setAttribute(VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO);
 
+
+	LearningWebUtil.putActivityPositionInRequestByToolSessionId(new Long(toolSessionID), request, getServlet()
+		.getServletContext());
+	
 	logger.debug("fwd'ing to : " + VIEW_ANSWERS);
 	return (mapping.findForward(VIEW_ANSWERS));
     }
@@ -957,6 +966,9 @@
 	logger.debug("final voteGeneralLearnerFlowDTO: " + voteGeneralLearnerFlowDTO);
 	voteLearningForm.resetCommands();
 
+	LearningWebUtil.putActivityPositionInRequestByToolSessionId(new Long(toolSessionID), request, getServlet()
+		.getServletContext());
+	
 	logger.debug("fwd'ing to: " + NOTEBOOK);
 	return (mapping.findForward(NOTEBOOK));
     }
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java
===================================================================
diff -u -r57a242c8553eeec5781c2106493aa9f34efa5489 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	(.../VoteLearningStarterAction.java)	(revision 57a242c8553eeec5781c2106493aa9f34efa5489)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	(.../VoteLearningStarterAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -175,6 +175,7 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.vote.VoteAppConstants;
@@ -381,6 +382,9 @@
 	/* by now, we know that the mode is learner */
 	putNotebookEntryIntoVoteGeneralLearnerFlowDTO(voteService, voteGeneralLearnerFlowDTO, toolSessionID, userID);
 
+	LearningWebUtil.putActivityPositionInRequestByToolSessionId(new Long(toolSessionID), request, getServlet()
+		.getServletContext());
+	
 	/*
 	 * find out if the content is set to run offline or online. If it is set to run offline , the learners are
 	 * informed about that.
Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
diff -u -rdb4fc43d6e110f7298d227fae4683af2e1e681f3 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision db4fc43d6e110f7298d227fae4683af2e1e681f3)
+++ lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -250,7 +250,16 @@
 						<html:link href="#" property="learnerFinished"
 							onclick="javascript:submitMethod('learnerFinished');return false"
 							styleClass="button" style="float:right" styleId="finishButton">
-							<span class="nextActivity"><fmt:message key="label.finished" /></span>
+							<span class="nextActivity">
+								<c:choose>
+									<c:when test="${activityPosition.last}">
+										<fmt:message key="button.submitActivity" />
+									</c:when>
+									<c:otherwise>
+										<fmt:message key="button.endLearning" />
+									</c:otherwise>
+								</c:choose>
+							</span>
 						</html:link>
 					</c:if>
 
Index: lams_tool_vote/web/learning/ExitLearning.jsp
===================================================================
diff -u -rdb4fc43d6e110f7298d227fae4683af2e1e681f3 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_vote/web/learning/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision db4fc43d6e110f7298d227fae4683af2e1e681f3)
+++ lams_tool_vote/web/learning/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -119,7 +119,16 @@
 					<div class="space-bottom-top align-right">
 						<html:link href="#nogo" property="learnerFinished" styleClass="button" styleId="finishButton"
 							onclick="submitMethod('learnerFinished');return false">
-							<span class="nextActivity"><fmt:message key="label.finished" /></span>
+							<span class="nextActivity">
+								<c:choose>
+									<c:when test="${activityPosition.last}">
+										<fmt:message key="button.submitActivity" />
+									</c:when>
+									<c:otherwise>
+										<fmt:message key="button.endLearning" />
+									</c:otherwise>
+								</c:choose>
+						</span>
 						</html:link>
 					</div>
 				</c:if>
Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -121,7 +121,16 @@
 						<html:link href="#nogo" property="learnerFinished" styleId="finishButton"
 							onclick="javascript:submitMethod('learnerFinished');return false"
 							styleClass="button">
-							<span class="nextActivity"><fmt:message key="label.finished" /></span>
+							<span class="nextActivity">
+								<c:choose>
+									<c:when test="${activityPosition.last}">
+										<fmt:message key="button.submitActivity" />
+									</c:when>
+									<c:otherwise>
+										<fmt:message key="button.endLearning" />
+									</c:otherwise>
+								</c:choose>
+							</span>
 						</html:link>
 					</span>
 				</c:when>
Index: lams_tool_vote/web/learning/RevisitedAllNominations.jsp
===================================================================
diff -u -rdb4fc43d6e110f7298d227fae4683af2e1e681f3 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_vote/web/learning/RevisitedAllNominations.jsp	(.../RevisitedAllNominations.jsp)	(revision db4fc43d6e110f7298d227fae4683af2e1e681f3)
+++ lams_tool_vote/web/learning/RevisitedAllNominations.jsp	(.../RevisitedAllNominations.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -118,7 +118,16 @@
 				<html:link href="#nogo" property="learnerFinished" styleId="finishButton"
 					onclick="javascript:submitMethod('learnerFinished');return false"
 					styleClass="button">
-					<span class="nextActivity"><fmt:message key="label.finished" /></span>
+					<span class="nextActivity">
+						<c:choose>
+							<c:when test="${activityPosition.last}">
+								<fmt:message key="button.submitActivity" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.endLearning" />
+							</c:otherwise>
+						</c:choose>
+					</span>
 				</html:link>
 			</div>
 		</html:form>
Index: lams_tool_vote/web/learning/RunOffline.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_vote/web/learning/RunOffline.jsp	(.../RunOffline.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_vote/web/learning/RunOffline.jsp	(.../RunOffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -82,8 +82,17 @@
 				      <html:link href="#nogo" property="endLearning" styleId="finishButton" 
 				      onclick="javascript:submitMethod('learnerFinished');return false"
 				      styleClass="button">
-					<span class="nextActivity"><fmt:message key="label.finished" /></span>
-				      </html:link>
+						<span class="nextActivity">
+							<c:choose>
+								<c:when test="${activityPosition.last}">
+									<fmt:message key="button.submitActivity" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="button.endLearning" />
+								</c:otherwise>
+							</c:choose>
+						</span>
+					</html:link>
 
 				</c:if>
 
Index: lams_tool_vote/web/learning/mobile/AllNominations.jsp
===================================================================
diff -u -rdb4fc43d6e110f7298d227fae4683af2e1e681f3 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_vote/web/learning/mobile/AllNominations.jsp	(.../AllNominations.jsp)	(revision db4fc43d6e110f7298d227fae4683af2e1e681f3)
+++ lams_tool_vote/web/learning/mobile/AllNominations.jsp	(.../AllNominations.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -265,7 +265,16 @@
 					<a href="#" name="learnerFinished"
 						onclick="javascript:submitMethod('learnerFinished');return false"
 						style="float:right" id="finishButton" data-role="button" data-icon="arrow-r" data-theme="b">
-						<span class="nextActivity"><fmt:message key="label.finished" /></span>
+						<span class="nextActivity">
+							<c:choose>
+								<c:when test="${activityPosition.last}">
+									<fmt:message key="button.submitActivity" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="button.endLearning" />
+								</c:otherwise>
+							</c:choose>
+						</span>
 					</a>
 				</c:if>
 	
Index: lams_tool_vote/web/learning/mobile/ExitLearning.jsp
===================================================================
diff -u -rdb4fc43d6e110f7298d227fae4683af2e1e681f3 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_vote/web/learning/mobile/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision db4fc43d6e110f7298d227fae4683af2e1e681f3)
+++ lams_tool_vote/web/learning/mobile/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -130,7 +130,16 @@
 			<span class="ui-finishbtn-right">
 				<a href="#" name="learnerFinished" id="finishButton"
 					onclick="javascript:submitMethod('learnerFinished');return false" data-role="button" data-icon="arrow-r" data-theme="b">
-					<span class="nextActivity"><fmt:message key="label.finished" /></span>
+					<span class="nextActivity">
+						<c:choose>
+							<c:when test="${activityPosition.last}">
+								<fmt:message key="button.submitActivity" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.endLearning" />
+							</c:otherwise>
+						</c:choose>
+					</span>
 				</a>
 			</span>
 		</c:if>
Index: lams_tool_vote/web/learning/mobile/IndividualLearnerResults.jsp
===================================================================
diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_vote/web/learning/mobile/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 35a0e719d061c08b52e705135bb2f2126079ed21)
+++ lams_tool_vote/web/learning/mobile/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -130,7 +130,16 @@
 							<a href="#nogo" name="learnerFinished" id="finishButton"
 								onclick="javascript:submitMethod('learnerFinished');return false"
 								data-icon="arrow-r" data-theme="b">
-								<span class="nextActivity"><fmt:message key="label.finished" /></span>
+								<span class="nextActivity">
+									<c:choose>
+										<c:when test="${activityPosition.last}">
+											<fmt:message key="button.submitActivity" />
+										</c:when>
+										<c:otherwise>
+											<fmt:message key="button.endLearning" />
+										</c:otherwise>
+									</c:choose>
+								</span>
 							</a>
 						</span>
 					</c:when>
Index: lams_tool_vote/web/learning/mobile/RevisitedAllNominations.jsp
===================================================================
diff -u -rdb4fc43d6e110f7298d227fae4683af2e1e681f3 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_vote/web/learning/mobile/RevisitedAllNominations.jsp	(.../RevisitedAllNominations.jsp)	(revision db4fc43d6e110f7298d227fae4683af2e1e681f3)
+++ lams_tool_vote/web/learning/mobile/RevisitedAllNominations.jsp	(.../RevisitedAllNominations.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -125,7 +125,16 @@
 			<span class="ui-finishbtn-right">
 				<a href="#nogo" name="learnerFinished" id="finishButton"
 					onclick="javascript:submitMethod('learnerFinished');return false" data-role="button" data-icon="arrow-r" data-theme="b">
-					<span class="nextActivity"><fmt:message key="label.finished" /></span>
+					<span class="nextActivity">
+						<c:choose>
+							<c:when test="${activityPosition.last}">
+								<fmt:message key="button.submitActivity" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.endLearning" />
+							</c:otherwise>
+						</c:choose>
+					</span>
 				</a>
 			</span>	
 	</div><!-- /footer -->
Index: lams_tool_vote/web/learning/mobile/RunOffline.jsp
===================================================================
diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_vote/web/learning/mobile/RunOffline.jsp	(.../RunOffline.jsp)	(revision 35a0e719d061c08b52e705135bb2f2126079ed21)
+++ lams_tool_vote/web/learning/mobile/RunOffline.jsp	(.../RunOffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -88,7 +88,16 @@
 				<c:if test="${voteGeneralLearnerFlowDTO.reflection != 'true'}">
 				      <a href="#nogo" name="endLearning" id="finishButton" 
 				      onclick="javascript:submitMethod('learnerFinished');return false" data-role="button" data-icon="arrow-r" data-theme="b">
-					<span class="nextActivity"><fmt:message key="label.finished" /></span>
+					<span class="nextActivity">
+						<c:choose>
+							<c:when test="${activityPosition.last}">
+								<fmt:message key="button.submitActivity" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.endLearning" />
+							</c:otherwise>
+						</c:choose>
+					</span>
 				      </a>
 				</c:if>
 
Index: lams_tool_wiki/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -re9f3814b6b6ca31db204710d2eed84d6339807da -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_wiki/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e9f3814b6b6ca31db204710d2eed84d6339807da)
+++ lams_tool_wiki/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -94,6 +94,7 @@
 button.try.again  =Try Again
 message.learner.blank.input  =You have not written anything. Are you sure this is correct?
 button.finish  =Next Activity
+button.submit =Finish
 message.alertContentEdit  =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information.
 message.warnLockOnFinish  =Note: After you click on "Next Activity" and you come back to this Wiki, you won't be able to continue editing.
 message.activityLocked  =The instructor has set this activity not to allow editing after you have finished it. As you are returning to this Wiki, you are able to see your Wiki but not allowed to edit it.
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java
===================================================================
diff -u -r228482c7a091c7691a9fc9651e46a8d98e29a6e1 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 228482c7a091c7691a9fc9651e46a8d98e29a6e1)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -37,6 +37,7 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.lamsfoundation.lams.events.IEventNotificationService;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -137,7 +138,10 @@
 	    wiki.setContentInUse(new Boolean(true));
 	    wikiService.saveOrUpdateWiki(wiki);
 	}
-
+	
+	LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet()
+		.getServletContext());
+	
 	// check runOffline
 	if (wiki.isRunOffline()) {
 	    return mapping.findForward("runOffline");
@@ -326,7 +330,10 @@
 	if (notebookEntry != null) {
 	    lrnForm.setEntryText(notebookEntry.getEntry());
 	}
-
+	
+	LearningWebUtil.putActivityPositionInRequestByToolSessionId(lrnForm.getToolSessionID(), request, getServlet()
+		.getServletContext());
+	
 	return mapping.findForward("notebook");
     }
 
Index: lams_tool_wiki/web/pages/learning/notebook.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_wiki/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_wiki/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -29,7 +29,16 @@
 		<div class="space-bottom-top align-right">
 			<html:hidden property="dispatch" value="submitReflection" />
 			<html:link href="#nogo" styleClass="button" styleId="finishButton"  onclick="submitForm('finish');return false">
-				<span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
+				<span class="nextActivity">
+					<c:choose>
+						<c:when test="${activityPosition.last}">
+							<fmt:message key="button.submit" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="button.finish" />
+						</c:otherwise>
+					</c:choose>
+				</span>
 			</html:link>
 		</div>
 	</html:form>
Index: lams_tool_wiki/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_wiki/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_wiki/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -57,10 +57,20 @@
 			<c:otherwise>
 
 			<div align="right" class="space-bottom-top">
-				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="javascript:continueOrFinish('finishActivity'); return false">
-					<span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
-				</html:link>
-			</div>
+					<html:link href="#nogo" styleClass="button" styleId="finishButton"
+						onclick="javascript:continueOrFinish('finishActivity'); return false">
+						<span class="nextActivity">
+							<c:choose>
+								<c:when test="${activityPosition.last}">
+									<fmt:message key="button.submit" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="button.finish" />
+								</c:otherwise>
+							</c:choose>
+						</span>
+					</html:link>
+				</div>
 			</c:otherwise>
 		</c:choose>
 	</div>
Index: lams_tool_wiki/web/pages/learning/runOffline.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_wiki/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_wiki/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -25,7 +25,16 @@
 
 			<div align="right" class="space-bottom-top">
 				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="javascript:submitForm('finish'); return false">
-					<span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
+					<span class="nextActivity">
+						<c:choose>
+							<c:when test="${activityPosition.last}">
+								<fmt:message key="button.submit" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.finish" />
+							</c:otherwise>
+						</c:choose>
+					</span>
 				</html:link>
 			</div>
 		</html:form>
Index: lams_tool_wookie/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r542c2cefed9f7ef2c515eff59a06f508330e24f7 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_wookie/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 542c2cefed9f7ef2c515eff59a06f508330e24f7)
+++ lams_tool_wookie/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -74,6 +74,7 @@
 error.mandatoryField  ={0} field is mandatory.
 button.try.again  =Try Again
 button.finish  =Next Activity
+button.submit =Finish
 message.alertContentEdit  =Warning: One of more students have accessed this activity. Changing this content will result in students getting different information.
 message.warnLockOnFinish  =Note: After you click on "Next Activity" and you come back to this Wookie activity, you won't be able the activity will be hidden and you will not be able to edit it.
 message.activityLocked  =The instructor has set this activity to be locked after you have finished it. As you are returning to this activity, you cannot edit anymore.
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java
===================================================================
diff -u -r228482c7a091c7691a9fc9651e46a8d98e29a6e1 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 228482c7a091c7691a9fc9651e46a8d98e29a6e1)
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -42,6 +42,7 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -129,7 +130,10 @@
 	    wookie.setContentInUse(new Boolean(true));
 	    wookieService.saveOrUpdateWookie(wookie);
 	}
-
+	
+	LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet()
+		.getServletContext());
+	
 	// check runOffline
 	if (wookie.isRunOffline()) {
 	    return mapping.findForward("runOffline");
@@ -314,6 +318,9 @@
 	    lrnForm.setEntryText(notebookEntry.getEntry());
 	}
 
+	LearningWebUtil.putActivityPositionInRequestByToolSessionId(lrnForm.getToolSessionID(), request, getServlet()
+		.getServletContext());
+
 	return mapping.findForward("notebook");
     }
 
Index: lams_tool_wookie/web/pages/learning/notebook.jsp
===================================================================
diff -u -r74b71c544bb3970571e885fd2e56fb22c9880f19 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_wookie/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 74b71c544bb3970571e885fd2e56fb22c9880f19)
+++ lams_tool_wookie/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -54,7 +54,16 @@
 				<div class="space-bottom-top align-right">
 					<html:hidden property="dispatch" value="submitReflection" />
 					<html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-						<span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
+						<span class="nextActivity">
+							<c:choose>
+								<c:when test="${activityPosition.last}">
+									<fmt:message key="button.submit" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="button.finish" />
+								</c:otherwise>
+							</c:choose>
+						</span>
 					</html:link>
 				</div>
 			</html:form>
Index: lams_tool_wookie/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -refb1dfc1149cd22eb0b47ff1d1fe35f6af95086e -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_wookie/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision efb1dfc1149cd22eb0b47ff1d1fe35f6af95086e)
+++ lams_tool_wookie/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -55,7 +55,16 @@
 			<c:otherwise>
 				<html:hidden property="dispatch" value="finishActivity" />
 				<html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finished');">
-					<span class="nextActivity"><fmt:message key="button.finish" /></span>
+					<span class="nextActivity">
+						<c:choose>
+							<c:when test="${activityPosition.last}">
+								<fmt:message key="button.submit" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.finish" />
+							</c:otherwise>
+						</c:choose>
+					</span>
 				</html:link>
 			</c:otherwise>
 		</c:choose>
Index: lams_tool_wookie/web/pages/learning/runOffline.jsp
===================================================================
diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_wookie/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision 7c52d117dbe910bd67630b5506346429e25b99a9)
+++ lams_tool_wookie/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -26,7 +26,16 @@
 
 			<div align="right" class="space-bottom-top">
 				<html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-					<span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
+					<span class="nextActivity">
+						<c:choose>
+							<c:when test="${activityPosition.last}">
+								<fmt:message key="button.submit" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.finish" />
+							</c:otherwise>
+						</c:choose>
+					</span>
 				</html:link>
 			</div>
 		</html:form>