Index: lams_central/web/includes/javascript/openUrls.js =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0e9eca8da006863730e793b75a47803bc6142c67 --- lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision 0e9eca8da006863730e793b75a47803bc6142c67) @@ -61,32 +61,32 @@ } function returnToMonitorLessonIntegrated( lessonID ) { - window.location = 'home.do?method=monitorLesson&lessonID='+lessonID; + window.location = 'home/monitorLesson.do?lessonID='+lessonID; } function openMonitorLesson( lessonID ) { if (isMac) { if(belowMinRes) { - monitorLessonWin = window.open('home.do?method=monitorLesson&lessonID='+ lessonID,'mWindow','width=' + monitor_width + monitorLessonWin = window.open('home/monitorLesson.do?lessonID='+ lessonID,'mWindow','width=' + monitor_width + ',height=' + monitor_height + ',resizable,scrollbars' + getCenterParams(monitor_width, monitor_height)); } else { - monitorLessonWin = window.open('home.do?method=monitorLesson&lessonID='+lessonID,'mWindow','width=' + monitor_width + monitorLessonWin = window.open('home/monitorLesson.do?lessonID='+lessonID,'mWindow','width=' + monitor_width + ',height=' + monitor_height + ',resizable,scrollbars' + getCenterParams(monitor_width, monitor_height)); } } else { if (monitorLessonWin && !monitorLessonWin.closed) { - monitorLessonWin.location = 'home.do?method=monitorLesson&lessonID='+lessonID; + monitorLessonWin.location = 'home/monitorLesson.do?lessonID='+lessonID; monitorLessonWin.focus(); } else { - monitorLessonWin = window.open('home.do?method=monitorLesson&lessonID='+lessonID,'mWindow','width=' + monitor_width + monitorLessonWin = window.open('home/monitorLesson.do?lessonID='+lessonID,'mWindow','width=' + monitor_width + ',height=' + monitor_height + ',resizable,resizable,scrollbars' + getCenterParams(monitor_width, monitor_height)); } } } function openLearner( lessonId ) { - var learnerUrl = 'home.do?method=learner&lessonID=' + lessonId; + var learnerUrl = 'home/learner.do?lessonID=' + lessonId; if (isMac) { learnWin = window.open(learnerUrl,'lWindow','width=' + learner_width + ',height=' + learner_height @@ -126,15 +126,15 @@ */ function openLearnerShortenedUrl( lessonId ) { if (isMac) { - learnWin = window.open('../home.do?method=learner&lessonID='+lessonId,'lWindow','width=' + learner_width + learnWin = window.open('../home/learner.do?lessonID='+lessonId,'lWindow','width=' + learner_width + ',height=' + learner_height + ',resizable,scrollbars=yes,status=yes' + getCenterParams(learner_width, learner_height)); } else { if (learnWin && !learnWin.closed ) { - learnWin.location = '../home.do?method=learner&lessonID='+lessonId; + learnWin.location = '../home/learner.do?lessonID='+lessonId; learnWin.focus(); } else { - learnWin = window.open('../home.do?method=learner&lessonID='+lessonId,'lWindow','width=' + learnWin = window.open('../home/learner.do?lessonID='+lessonId,'lWindow','width=' + learner_width + ',height=' + learner_height + ',resizable,scrollbars=yes,status=yes' + getCenterParams(learner_width, learner_height)); }