Index: lams_central/web/authoring/svgGenerator.jsp =================================================================== diff -u -re76d41cc608a95ad9ae7e13ac05692d98dd64ba2 -r5e9fc57b2fde4a487da7c72f6de7e286bc4ae6ee --- lams_central/web/authoring/svgGenerator.jsp (.../svgGenerator.jsp) (revision e76d41cc608a95ad9ae7e13ac05692d98dd64ba2) +++ lams_central/web/authoring/svgGenerator.jsp (.../svgGenerator.jsp) (revision 5e9fc57b2fde4a487da7c72f6de7e286bc4ae6ee) @@ -49,7 +49,8 @@ canSetReadOnly = false, isReadOnlyMode = true, activitiesOnlySelectable = ${param.selectable eq 'true'}, - initLearningDesignID = '${param.learningDesignID}'; + initLearningDesignID = '${param.learningDesignID}', + initRelaunchMonitorLessonID = null; Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js =================================================================== diff -u -rf6247c953cc7bf9a17d4025ea8e8728ae55c11ed -r5e9fc57b2fde4a487da7c72f6de7e286bc4ae6ee --- lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision f6247c953cc7bf9a17d4025ea8e8728ae55c11ed) +++ lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision 5e9fc57b2fde4a487da7c72f6de7e286bc4ae6ee) @@ -10,7 +10,7 @@ GeneralInitLib.initAll(); // we display authoring in separate window if LAMS acts as a LTI 1.3 Tool - if (isLtiContentSelection) { + if (isLtiContentSelection || initRelaunchMonitorLessonID) { window.onbeforeunload = function(e) { if (window.opener && typeof window.opener.refreshSeqList === 'function') { window.opener.refreshSeqList(); @@ -1574,8 +1574,7 @@ 'cancelled' : 'true' }, success : function() { - GeneralLib.setModified(false); - window.parent.closeDialog('dialogAuthoring'); + window.location.href = LAMS_URL + 'home/monitorLesson.do?lessonID=' + initRelaunchMonitorLessonID; } }); } else { @@ -3106,8 +3105,8 @@ // close the Live Edit dialog layout.infoDialog.data('show')(LABELS.LIVEEDIT_SAVE_SUCCESSFUL, true); setTimeout(function(){ - window.parent.closeDialog('dialogAuthoring'); - }, 5000); + window.location.href = LAMS_URL + 'home/monitorLesson.do?lessonID=' + initRelaunchMonitorLessonID; + }, 3000); } }); Index: lams_central/web/includes/javascript/dialog5.js =================================================================== diff -u -r2c3627f7919f0ae53ab283d1fb0a7f82bf1994c0 -r5e9fc57b2fde4a487da7c72f6de7e286bc4ae6ee --- lams_central/web/includes/javascript/dialog5.js (.../dialog5.js) (revision 2c3627f7919f0ae53ab283d1fb0a7f82bf1994c0) +++ lams_central/web/includes/javascript/dialog5.js (.../dialog5.js) (revision 5e9fc57b2fde4a487da7c72f6de7e286bc4ae6ee) @@ -348,6 +348,18 @@ // $('#' + id).dialog('moveToTop'); } +function openAuthoring(learningDesignID, relaunchMonitorLessonID) { + var url = LAMS_URL + 'authoring/openAuthoring.do'; + + if (learningDesignID) { + url += '?learningDesignID=' + learningDesignID; + } + if (relaunchMonitorLessonID) { + url += '&relaunchMonitorLessonID=' + relaunchMonitorLessonID; + } + + window.location.href = url; +} //used by both /lams_central/web/main.jsp and /lams_central/web/lti/addlesson.jsp pages function showAuthoringDialog(learningDesignID, relaunchMonitorLessonID){ Index: lams_monitoring/web/includes/javascript/monitorLesson5.js =================================================================== diff -u -r198c8a9ea2d927fdf19aa00b222831934f6af176 -r5e9fc57b2fde4a487da7c72f6de7e286bc4ae6ee --- lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision 198c8a9ea2d927fdf19aa00b222831934f6af176) +++ lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision 5e9fc57b2fde4a487da7c72f6de7e286bc4ae6ee) @@ -2324,8 +2324,7 @@ if (response) { alert(response); } else { - window.parent.showAuthoringDialog(ldId, lessonId); - closeMonitorLessonDialog(); + openAuthoring(ldId, lessonId); } } }); Index: lams_monitoring/web/monitor-sequence-tab.jsp =================================================================== diff -u -r732a4ae6cac3f936d7bee690671dc0a8c0200f8a -r5e9fc57b2fde4a487da7c72f6de7e286bc4ae6ee --- lams_monitoring/web/monitor-sequence-tab.jsp (.../monitor-sequence-tab.jsp) (revision 732a4ae6cac3f936d7bee690671dc0a8c0200f8a) +++ lams_monitoring/web/monitor-sequence-tab.jsp (.../monitor-sequence-tab.jsp) (revision 5e9fc57b2fde4a487da7c72f6de7e286bc4ae6ee) @@ -6,7 +6,7 @@