Index: lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java,v
diff -u -r1.20 -r1.21
--- lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java	17 Sep 2006 06:17:57 -0000	1.20
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java	29 Oct 2006 23:29:58 -0000	1.21
@@ -241,8 +241,10 @@
             }
             //recurvisely call back to calculateProgress to calculate completed
             //parent activity.
-            else
+            else {
+    	        learnerProgress.setPreviousActivity(complexParent);
                 calculateProgress(learner, parent, learnerProgress);
+            }
         }
         //lesson is meant to be completed if there is no transition and no parent.
         else {
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java,v
diff -u -r1.12 -r1.13
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java	24 Oct 2006 04:40:05 -0000	1.12
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java	29 Oct 2006 23:29:58 -0000	1.13
@@ -33,7 +33,6 @@
 import org.lamsfoundation.lams.learning.service.ICoreLearnerService;
 import org.lamsfoundation.lams.learning.web.util.ActivityMapping;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
-import org.lamsfoundation.lams.learning.web.form.ActivityForm;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.lesson.LearnerProgress;
 import org.lamsfoundation.lams.lesson.Lesson;
@@ -88,16 +87,8 @@
 
 		// need to do the choose first as the chooseActivity changes the progress details 
 		setupProgressString(actionForm, request);
-		
-		ActivityForm activityForm = (ActivityForm) actionForm;
-		ActionForward forward = null;
-		
-		if(activityForm.getInFrame())
-			// escape child frame and open url in parent frame
-			forward = actionMappings.getRedirectForward(progress, true);
-		else
-			forward = actionMappings.getActivityForward(activity, progress, true);
-		
+
+		ActionForward forward = actionMappings.getActivityForward(activity, progress, true);
 		return forward;
 	}
 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java,v
diff -u -r1.13 -r1.14
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java	24 Oct 2006 05:13:52 -0000	1.13
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java	29 Oct 2006 23:29:58 -0000	1.14
@@ -34,7 +34,6 @@
 import org.lamsfoundation.lams.learning.service.LearnerServiceException;
 import org.lamsfoundation.lams.learning.web.util.ActivityMapping;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
-import org.lamsfoundation.lams.learning.web.form.ActivityForm;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.lesson.LearnerProgress;
 
@@ -95,16 +94,9 @@
 		
 		// need to do the calculateProgress first as the chooseActivity changes the progress details 
 		setupProgressString(actionForm, request);
+
+		ActionForward forward = actionMappings.getProgressForward(progress,true,request, learnerService);
 		
-		ActivityForm activityForm = (ActivityForm) actionForm;
-		ActionForward forward = null;
-		
-		if(activityForm.getInFrame())
-			// escape child frame and open url in parent frame
-			forward = actionMappings.getRedirectForward(progress, true);
-		else
-			forward = actionMappings.getProgressForward(progress,true,request, learnerService);
-		
 		return forward;
 	}
 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java,v
diff -u -r1.14 -r1.15
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java	24 Oct 2006 04:40:05 -0000	1.14
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java	29 Oct 2006 23:29:58 -0000	1.15
@@ -118,11 +118,6 @@
 		setupProgressString(form, request);
 
 		String forward = "displayOptions";
-	
-		// set frame flag if last run activity was Parallel Activity
-		if(learnerProgress.getCurrentActivity().isParallelActivity())
-			form.setInFrame(true);
-		
 		return mapping.findForward(forward);
 	}
 	
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java,v
diff -u -r1.10 -r1.11
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java	24 Oct 2006 04:40:05 -0000	1.10
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java	29 Oct 2006 23:29:58 -0000	1.11
@@ -56,8 +56,6 @@
 	/** Lesson to which this activity belongs. Id comes from the learner progress */
 	private Long lessonID;
 	
-	private boolean inFrame;
-	
 	/** 
 	 * Method reset
 	 * @param mapping
@@ -103,11 +101,4 @@
 		this.lessonID = lessonID;
 	}
 	
-	public boolean getInFrame() {
-		return inFrame;
-	}
-	
-	public void setInFrame(boolean inFrame) {
-		this.inFrame = inFrame;
-	}
 }
\ No newline at end of file
Index: lams_learning/web/optionsActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/optionsActivity.jsp,v
diff -u -r1.21 -r1.22
--- lams_learning/web/optionsActivity.jsp	24 Oct 2006 05:13:52 -0000	1.21
+++ lams_learning/web/optionsActivity.jsp	29 Oct 2006 23:29:58 -0000	1.22
@@ -57,7 +57,6 @@
 	
 	<html:form action="/ChooseActivity" method="POST">
 	<input type="hidden" name="lams_token" value="<c:out value='${lams_token}' />" />
-	<input type="hidden" name="inFrame" value="<c:out value="${optionsActivityForm.inFrame}" />" />
 	
 	<div id="content">
 
@@ -117,7 +116,6 @@
 	<html:form action="/CompleteActivity" method="POST">
 		<input type="hidden" name="lams_token" value="<c:out value='${lams_token}' />" />
 		<input type="hidden" name="activityID" value="<c:out value="${optionsActivityForm.activityID}" />" />
-		<input type="hidden" name="inFrame" value="<c:out value="${optionsActivityForm.inFrame}" />" />
 		
 	</html:form>