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.12 -r1.13
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java	17 Sep 2006 06:17:57 -0000	1.12
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java	24 Oct 2006 05:13:52 -0000	1.13
@@ -34,6 +34,7 @@
 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;
 
@@ -94,9 +95,16 @@
 		
 		// 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/web/optionsActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/optionsActivity.jsp,v
diff -u -r1.20 -r1.21
--- lams_learning/web/optionsActivity.jsp	24 Oct 2006 04:40:06 -0000	1.20
+++ lams_learning/web/optionsActivity.jsp	24 Oct 2006 05:13:52 -0000	1.21
@@ -117,6 +117,8 @@
 	<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>
 
 	</div>  <!--closes content-->