Index: lams_central/web/includes/javascript/openUrls.js =================================================================== diff -u -rf4123b69cb430e472b97b66223e6c75eb8bb7907 -rf9ddfe5a890306be3ab774cf537eacd29f7f3c2a --- lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision f4123b69cb430e472b97b66223e6c75eb8bb7907) +++ lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision f9ddfe5a890306be3ab774cf537eacd29f7f3c2a) @@ -47,13 +47,38 @@ window.location = '/lams/home/monitorLesson.do?lessonID='+lessonID; } -function openMonitorLesson( lessonID, url ) { +function openMonitorLesson( lessonID, url, displayFullScreen ) { if (!url) { - url = '/lams/home/monitorLesson.do?'; + // change back to Home controller after upgrade!! + url = '/lams/monitoring/monitoring/monitorLesson.do?'; } url += 'lessonID='+ lessonID; - window.location.href = url; + if (displayFullScreen) { + window.location.href = url; + return; + } + + url += '&newUI=false'; + + if (isMac) { + if(belowMinRes) { + monitorLessonWin = window.open(url,'mWindow','width=' + monitor_width + + ',height=' + monitor_height + ',resizable,scrollbars' + getCenterParams(monitor_width, monitor_height)); + } else { + monitorLessonWin = window.open(url,'mWindow','width=' + monitor_width + + ',height=' + monitor_height + ',resizable,scrollbars' + getCenterParams(monitor_width, monitor_height)); + } + } else { + if (monitorLessonWin && !monitorLessonWin.closed) { + monitorLessonWin.location = url; + monitorLessonWin.focus(); + } else { + monitorLessonWin = window.open(url,'mWindow','width=' + monitor_width + + ',height=' + monitor_height + ',resizable,resizable,scrollbars' + + getCenterParams(monitor_width, monitor_height)); + } + } } function openTBLMonitorLesson( lessonID ) {