Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -re17801350a2c5490a2a47f6adccc87901bd8a9cb
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java	(.../CompleteActivityAction.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java	(.../CompleteActivityAction.java)	(revision e17801350a2c5490a2a47f6adccc87901bd8a9cb)
@@ -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
===================================================================
diff -u -rf3e61ae90d8b2e951ff3d0fda1185720e839c8e3 -re17801350a2c5490a2a47f6adccc87901bd8a9cb
--- lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision f3e61ae90d8b2e951ff3d0fda1185720e839c8e3)
+++ lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision e17801350a2c5490a2a47f6adccc87901bd8a9cb)
@@ -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-->