Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java,v
diff -u -r1.60.2.12 -r1.60.2.13
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	2 Sep 2015 11:36:51 -0000	1.60.2.12
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	2 Sep 2015 13:02:43 -0000	1.60.2.13
@@ -254,6 +254,62 @@
     }
 
     /**
+     * request for old, Flash author environment
+     */
+    public ActionForward authorFlash(ActionMapping mapping, ActionForm form, HttpServletRequest req,
+	    HttpServletResponse res) throws IOException, ServletException {
+	try {
+	    UserDTO user = getUser();
+	    if (user == null) {
+		HomeAction.log.error("admin: User missing from session. ");
+		return mapping.findForward("error");
+	    }
+
+	    Long learningDesignID = null;
+	    String layout = null;
+	    String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL);
+	    req.setAttribute("serverUrl", serverUrl);
+
+	    String requestSrc = req.getParameter("requestSrc");
+	    String notifyCloseURL = req.getParameter(AttributeNames.PARAM_NOTIFY_CLOSE_URL);
+	    String isPostMessageToParent = req.getParameter("isPostMessageToParent");
+	    String customCSV = req.getParameter(AttributeNames.PARAM_CUSTOM_CSV);
+	    String extLmsId = req.getParameter(AttributeNames.PARAM_EXT_LMS_ID);
+
+	    if (req.getParameter("learningDesignID") != null) {
+		learningDesignID = WebUtil.readLongParam(req, "learningDesignID");
+	    }
+
+	    if (req.getParameter("layout") != null) {
+		layout = WebUtil.readStrParam(req, "layout");
+	    }
+
+	    if (layout != null) {
+		req.setAttribute("layout", layout);
+	    }
+
+	    if (req.getParameter("learningDesignID") != null) {
+		learningDesignID = WebUtil.readLongParam(req, "learningDesignID");
+	    }
+
+	    if (learningDesignID != null) {
+		req.setAttribute("learningDesignID", learningDesignID);
+	    }
+
+	    req.setAttribute("requestSrc", requestSrc);
+	    req.setAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL, notifyCloseURL);
+	    req.setAttribute("isPostMessageToParent", isPostMessageToParent);
+	    req.setAttribute(AttributeNames.PARAM_CUSTOM_CSV, customCSV);
+	    req.setAttribute(AttributeNames.PARAM_EXT_LMS_ID, extLmsId);
+
+	    return mapping.findForward("author");
+	} catch (Exception e) {
+	    HomeAction.log.error("Failed to load author", e);
+	    return mapping.findForward("error");
+	}
+    }
+
+    /**
      * Request for Monitor environment.
      */
     public ActionForward monitorLesson(ActionMapping mapping, ActionForm form, HttpServletRequest req,
Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/openUrls.js,v
diff -u -r1.38.2.3 -r1.38.2.4
--- lams_central/web/includes/javascript/openUrls.js	17 Dec 2014 12:57:34 -0000	1.38.2.3
+++ lams_central/web/includes/javascript/openUrls.js	2 Sep 2015 13:02:43 -0000	1.38.2.4
@@ -52,13 +52,13 @@
 		
 		function openAuthor() {
 			if (isMac) {
-					authorWin = window.open('home.do?method=author','aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable');
+					authorWin = window.open('home.do?method=authorFlash','aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable');
 			} else {
 				if(authorWin && !authorWin.closed && authorWin.location.pathname.indexOf('home.do?method=author') > -1) {
 					//authorWin.location = 'home.do?method=author';
 					authorWin.focus();
 				} else {
-					authorWin = window.open('home.do?method=author','aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable');
+					authorWin = window.open('home.do?method=authorFlash','aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable');
 					authorWin.focus();
 				}
 			}
@@ -76,24 +76,7 @@
 				}
 			}
 		}
-
-		function openAuthorForEditOnFly( learningDesignID ) {
-			if (isMac) {
-				monitorLessonWin = window.open('../home.do?method=author&layout=editonfly&learningDesignID='+learningDesignID,'mWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable');
-			} else {
-				if(monitorLessonWin && !monitorLessonWin.closed) {
-					monitorLessonWin.location = '../home.do?method=author&layout=editonfly&learningDesignID='+learningDesignID;
-				} else {
-					monitorLessonWin = window.open('../home.do?method=author&layout=editonfly&learningDesignID='+learningDesignID,'mWindow', 'width=' + authoring_width + ',height=' + authoring_height + ',resizable');
-					monitorLessonWin.focus();
-				}
-			}
-		}
 		
-		function openAuthorForEditOnFlyIntegrated( learningDesignID ) {
-			window.location = '../home.do?method=author&layout=editonfly&learningDesignID='+learningDesignID;
-		}
-		
 		function returnToMonitorLessonIntegrated( lessonID ) {
 			window.location = 'home.do?method=monitorLesson&lessonID='+lessonID;
 		}
Index: lams_central/web/includes/javascript/pedagogicalPlanner.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/pedagogicalPlanner.js,v
diff -u -r1.30 -r1.30.2.1
--- lams_central/web/includes/javascript/pedagogicalPlanner.js	30 Jan 2014 23:27:31 -0000	1.30
+++ lams_central/web/includes/javascript/pedagogicalPlanner.js	2 Sep 2015 13:02:43 -0000	1.30.2.1
@@ -181,7 +181,7 @@
   	   		startPreview(startPreviewUrl);
   	   	}
   	   	else if (actionAfterCompleted==ACTION_OPEN_AUTHOR){
-  	   		var openAuthorURL = "home.do?method=author&learningDesignID=" + learningDesignId;
+  	   		var openAuthorURL = "home.do?method=authorFlash&learningDesignID=" + learningDesignId;
   	   		if (requestSrc != "") {
   	   			openAuthorURL += "&requestSrc=" + requestSrc;
   	   		}
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/includes/javascript/monitorLesson.js,v
diff -u -r1.44.2.13 -r1.44.2.14
--- lams_monitoring/web/includes/javascript/monitorLesson.js	15 Jul 2015 10:14:26 -0000	1.44.2.13
+++ lams_monitoring/web/includes/javascript/monitorLesson.js	2 Sep 2015 13:02:45 -0000	1.44.2.14
@@ -1452,7 +1452,7 @@
 				if (response) {
 					alert(response);
 				} else {
-					openPopUp(LAMS_URL + 'home.do?method=author&layout=editonfly&learningDesignID=' + ldId,
+					openPopUp(LAMS_URL + 'home.do?method=authorFlash&layout=editonfly&learningDesignID=' + ldId,
 							'LiveEdit', 600, 800, false);
 					closeMonitorLessonDialog();
 				}