Index: lams_central/web/author.jsp
===================================================================
diff -u -r281f6a30b1f4c8977f091d349679288943e33a0b -re6cbe41a37d798651893c8ba69bfc080c4ca2342
--- lams_central/web/author.jsp	(.../author.jsp)	(revision 281f6a30b1f4c8977f091d349679288943e33a0b)
+++ lams_central/web/author.jsp	(.../author.jsp)	(revision e6cbe41a37d798651893c8ba69bfc080c4ca2342)
@@ -33,6 +33,11 @@
 var previewWin = null;
 var previewSessionId = null;
 
+// Use for handling popup windows
+var pWins = new Array();
+var iWins = 0;
+	
+
 function getWindowSize() {
   var myWidth = 0, myHeight = 0;
   if( typeof( window.innerWidth ) == 'number' ) {
@@ -115,8 +120,21 @@
 	//		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);
 	//}
+
+	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();
+				return;	
+			}
+		}
+	}
+	
+	pWins[iWins] = window.open(args,title,"HEIGHT="+h+",WIDTH="+w+",resizable="+resize+",scrollbars=yes,status="+status+",menubar="+menubar+", toolbar="+toolbar);
+	iWins++;
 }
 
 function openPopUpFS(args){
@@ -171,6 +189,7 @@
 }
 
 function closeWindow(){
+	
 	// refresh the parent window
 	var parentURL = "${notifyCloseURL}";
 	
@@ -185,6 +204,15 @@
 	} 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 setSaved(args){
Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
diff -u -r281f6a30b1f4c8977f091d349679288943e33a0b -re6cbe41a37d798651893c8ba69bfc080c4ca2342
--- lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision 281f6a30b1f4c8977f091d349679288943e33a0b)
+++ lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision e6cbe41a37d798651893c8ba69bfc080c4ca2342)
@@ -18,7 +18,7 @@
 		var copyrightWin = null;
 		
 		function closeAllChildren(){
-			if (authorWin && !authorWin.closed) authorWin.close();
+			if (authorWin && !authorWin.closed) authorWin.closeWindow();
 			if (learnWin && !learnWin.closed) learnWin.close();
 			if (monitorLessonWin && !monitorLessonWin.closed) monitorLessonWin.close();
 			if (addLessonWin && !addLessonWin.closed) addLessonWin.close();