Index: lams_central/web/author.jsp
===================================================================
diff -u -r64938df458cbab9999f9a826ef2902d061648d7d -r281f6a30b1f4c8977f091d349679288943e33a0b
--- lams_central/web/author.jsp	(.../author.jsp)	(revision 64938df458cbab9999f9a826ef2902d061648d7d)
+++ lams_central/web/author.jsp	(.../author.jsp)	(revision 281f6a30b1f4c8977f091d349679288943e33a0b)
@@ -14,6 +14,7 @@
 
 <lams:html>
 <lams:head>
+<script src="<lams:LAMSURL/>includes/javascript/openUrls.js" type="text/javascript"></script>
 <script src="<lams:LAMSURL/>includes/javascript/AC_RunActiveContent.js" type="text/javascript"></script>
 <script src="<lams:LAMSURL/>includes/javascript/getSysInfo.js" type="text/javascript"></script>
 <script language="JavaScript" type="text/JavaScript">
@@ -80,7 +81,7 @@
 	}else if(command == "openURL"){
 		openURL(args, "_blank");
 	}else if(command == "openMonitorLesson") {
-		openMonitorLesson(args);
+		openMonitorLesson(args); 
 	}
 
 }
@@ -209,8 +210,12 @@
 	}
 }
 
-function openMonitorLesson(lessonID) {
-	window.opener.openMonitorLesson(lessonID);
+function openMonitorLesson(lessonID) {	
+	try{
+		window.opener.openMonitorLesson(lessonID);
+	}catch(e){
+		returnToMonitorLessonIntegrated(lessonID);
+	}
 }
 		
 
Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r281f6a30b1f4c8977f091d349679288943e33a0b
--- lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision 281f6a30b1f4c8977f091d349679288943e33a0b)
@@ -90,6 +90,16 @@
 				}
 			}
 		}
+		
+		function openAuthorForEditOnFlyIntegrated( learningDesignID )
+		{
+			window.location = '../home.do?method=author&layout=editonfly&learningDesignID='+learningDesignID;
+		}
+		
+		function returnToMonitorLessonIntegrated( lessonID )
+		{
+			window.location = 'home.do?method=monitorLesson&lessonID='+lessonID;
+		}
 
 		function openMonitorLesson( lessonID )
 		{
Index: lams_monitoring/web/monitorLesson.jsp
===================================================================
diff -u -r64938df458cbab9999f9a826ef2902d061648d7d -r281f6a30b1f4c8977f091d349679288943e33a0b
--- lams_monitoring/web/monitorLesson.jsp	(.../monitorLesson.jsp)	(revision 64938df458cbab9999f9a826ef2902d061648d7d)
+++ lams_monitoring/web/monitorLesson.jsp	(.../monitorLesson.jsp)	(revision 281f6a30b1f4c8977f091d349679288943e33a0b)
@@ -35,6 +35,7 @@
 	<lams:css style="core"/>
 	<title><fmt:message key="monitor.title"/></title>
 	
+	<script src="<lams:LAMSURL/>includes/javascript/openUrls.js" type="text/javascript"></script>
 	<script src="<lams:LAMSURL/>includes/javascript/AC_RunActiveContent.js" type="text/javascript"></script>
 	<script language="JavaScript" type="text/JavaScript">
 	<!--
@@ -54,7 +55,7 @@
 			}else if(command == "openAuthorForEditOnFly") {
 				openAuthorForEditOnFly(args);
 			}else if(command == "reloadWindow") {
-				reloadWindow();
+				reloadWindow(); 
 			}
 			
 		}
@@ -117,7 +118,13 @@
 		}
 		
 		function openAuthorForEditOnFly(learningDesignID) {
-			window.opener.openAuthorForEditOnFly(learningDesignID);
+			try{
+				window.opener.openAuthorForEditOnFly(learningDesignID);
+			}
+			catch(e)
+			{
+				openAuthorForEditOnFlyIntegrated(learningDesignID);
+			}
 		}
 		
 		function openURL(args){