Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
diff -u -r388b3abd9fd8b750b4fbb12028fa856a0a11249e -rd0a8679bc756e47321aff67f3ed1eb737b8535ff
--- lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision 388b3abd9fd8b750b4fbb12028fa856a0a11249e)
+++ lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision d0a8679bc756e47321aff67f3ed1eb737b8535ff)
@@ -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,27 @@
  */
 function openLearnerShortenedUrl( lessonId ) {
 	if (isMac) {
+<<<<<<< HEAD
+		learnWin = window.open('../home/learner.do?lessonID='+lessonId,'lWindow','width=' + learner_width 
+=======
 		learnWin = window.open('../home/learner.do&lessonID='+lessonId,'lWindow','width=' + learner_width 
+>>>>>>> refs/remotes/asia/LDEV-4440
 				   + ',height=' + learner_height + ',resizable,scrollbars=yes,status=yes'
 				   + getCenterParams(learner_width, learner_height));
 	} else {
 		if (learnWin && !learnWin.closed ) {
+<<<<<<< HEAD
+			learnWin.location = '../home/learner.do?lessonID='+lessonId;		
+=======
 			learnWin.location = '../home/learner.do&lessonID='+lessonId;		
+>>>>>>> refs/remotes/asia/LDEV-4440
 			learnWin.focus();
 		} else {
+<<<<<<< HEAD
+			learnWin = window.open('../home/learner.do?lessonID='+lessonId,'lWindow','width='
+=======
 			learnWin = window.open('../home/learner.do&lessonID='+lessonId,'lWindow','width='
+>>>>>>> refs/remotes/asia/LDEV-4440
 					   + learner_width + ',height=' + learner_height + ',resizable,scrollbars=yes,status=yes'
 					   + getCenterParams(learner_width, learner_height));
 		}