Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/openUrls.js,v
diff -u -r1.23 -r1.24
--- lams_central/web/includes/javascript/openUrls.js	11 Oct 2007 04:45:06 -0000	1.23
+++ lams_central/web/includes/javascript/openUrls.js	29 Oct 2007 06:21:48 -0000	1.24
@@ -20,7 +20,8 @@
 		function closeAllChildren(){
 			if (authorWin && !authorWin.closed) authorWin.closeWindow();
 			if (learnWin && !learnWin.closed) learnWin.close();
-			if (monitorLessonWin && !monitorLessonWin.closed) monitorLessonWin.close();
+			//if (monitorLessonWin && !monitorLessonWin.closed) monitorLessonWin.close();
+			if (monitorLessonWin && !monitorLessonWin.closed) monitorLessonWin.closeWindow();
 			if (addLessonWin && !addLessonWin.closed) addLessonWin.close();
 			if (epWin && !epWin.closed) epWin.close();
 			if (sysadminWin && !sysadminWin.closed) sysadminWin.close();
Index: lams_monitoring/web/monitorLesson.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/monitorLesson.jsp,v
diff -u -r1.20 -r1.21
--- lams_monitoring/web/monitorLesson.jsp	13 Sep 2007 04:55:11 -0000	1.20
+++ lams_monitoring/web/monitorLesson.jsp	29 Oct 2007 06:21:48 -0000	1.21
@@ -39,6 +39,10 @@
 	<script src="<lams:LAMSURL/>includes/javascript/AC_RunActiveContent.js" type="text/javascript"></script>
 	<script language="JavaScript" type="text/JavaScript">
 	<!--
+		
+		// Use for handling popup windows
+  	 	var pWins = new Array();
+  	 	var iWins = 0;
 	
 		var isInternetExplorer = navigator.appName.indexOf("Microsoft") != -1;
 		
@@ -71,11 +75,14 @@
 		}	
 		
 		function openPopUpFS(args){
-			var params = args.split(",");
+			var params = args.split(",");		
+			var urlparams = args.split("&");
 			
+			var activityID = urlparams[1];
+
 			// assigned the args
 			var url = params[0];
-			var title = params[1];
+			var title = params[1] + "_" + activityID;
 			var h = params[2];
 			var w = params[3];
 			var resize = params[4];
@@ -98,8 +105,24 @@
 	//		thePopUp.focus();
 			
 	//}else{
-		thePopUp = window.open(args,title,"HEIGHT="+h+",WIDTH="+w+",resizable="+resize+",scrollbars=yes,status="+status+",menubar="+menubar+", toolbar="+toolbar);
-	//}
+	//	thePopUp = window.open(args,title,"HEIGHT="+h+",WIDTH="+w+",resizable="+resize+",scrollbars=yes,status="+status+",menubar="+menubar+", toolbar="+toolbar);
+	//}		
+			var found = false;
+			
+			for(var i=0; i<pWins.length; i++) {
+				if(pWins[i] != null && !pWins[i].closed && pWins[i].open) {
+					if(pWins[i].name == title) {
+						window.blur();
+						pWins[i].focus();
+						found = true;	
+					}
+				}
+			}
+			
+			if(!found) {
+				pWins[iWins] = window.open(args,title,"HEIGHT="+h+",WIDTH="+w+",resizable="+resize+",scrollbars=yes,status="+status+",menubar="+menubar+", toolbar="+toolbar);
+				iWins++;
+			}
 		}
 		
 		function closeWindow() {
@@ -110,6 +133,14 @@
 			} else {
 				window.location.href = "javascript: window.close()";
 			}
+			// close all open windows
+  	 		if(window.closed) {
+  	 			for(var i=0; i<pWins.length; i++) {
+  	 		    	if(pWins[i] != null && !pWins[i].closed) {
+  	 		        	pWins[i].close();
+  	 		        }
+  	 		    }
+  	 		}
 		}
 		
 		function closeWindowRefresh() {