Index: lams_central/src/flash/org/lamsfoundation/lams/learner/ls/Lesson.as
===================================================================
diff -u -r3edbffec5a8ccd6fe86125f5ba7cc29d8a9880f0 -rc8ec5b63498f327776c4b3806c17b37c25eae8fc
--- lams_central/src/flash/org/lamsfoundation/lams/learner/ls/Lesson.as	(.../Lesson.as)	(revision 3edbffec5a8ccd6fe86125f5ba7cc29d8a9880f0)
+++ lams_central/src/flash/org/lamsfoundation/lams/learner/ls/Lesson.as	(.../Lesson.as)	(revision c8ec5b63498f327776c4b3806c17b37c25eae8fc)
@@ -147,20 +147,17 @@
 	}
 	
 	public function exitLesson():Boolean {
-		var callback:Function = Proxy.create(this,closeLesson);
+		getURL('javascript:top.window.close();');
 		
-		// call action
-		var lessonId:Number = lessonModel.ID;
-		
-		// do request
-		Application.getInstance().getComms().getRequest('learning/learner.do?method=exitLesson&lessonID='+String(lessonId), callback, false);
-		
 		return true;
 	}
 	
 	public function exportLesson(){
 		// do export call
-		getURL(_root.serverURL + 'learning/exportWaitingPage.jsp?mode=learner&lessonID='+String(lessonModel.ID), "_blank");
+		var exp_url:String = _root.serverURL + 'learning/exportWaitingPage.jsp?mode=learner&lessonID='+String(lessonModel.ID);
+		
+		JsPopup.getInstance().launchPopupWindow(exp_url, 'ExportPortfolioLearner', 300, 400, true, true, false, false, false);
+	
 	}
 	
 	private function storeLessonData(dto:Object){
@@ -274,7 +271,8 @@
 	private function popupActivity(url:Object){
 		Debugger.log('loading activity (popup window) : ' + url.activityID + '\npath: ' + url.activityURL,Debugger.CRITICAL,'loadActivity','org.lamsfoundation.lams.Lesson');
 
-		getURL(url.activityURL,"_blank");
+		JsPopup.getInstance().launchPopupWindow(url.activityURL, 'LearnerActivity', 600, 800, true, true, true, false, false);
+	
 	}
 	
 	/**