Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java =================================================================== diff -u -r7344f2fa950025f1e9a204014af7cfe132057f17 -re674ee8c8ff4d3d75456b57586d1ea5c090d55b9 --- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision 7344f2fa950025f1e9a204014af7cfe132057f17) +++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision e674ee8c8ff4d3d75456b57586d1ea5c090d55b9) @@ -139,6 +139,8 @@ log.debug("request learner"); Long lessonId = WebUtil.readLongParam(req, AttributeNames.PARAM_LESSON_ID); + String mode = WebUtil.readStrParam(req, AttributeNames.PARAM_MODE, true); + UserDTO user = getUser(); if ( user == null ) { log.error("learner: User missing from session. "); @@ -153,6 +155,9 @@ log.error("learner: User "+user.getLogin()+" is not a learner in the requested lesson. Cannot access the lesson."); return displayMessage(mapping, req, "error.authorisation"); } + + if(mode != null) + req.setAttribute(AttributeNames.PARAM_MODE, mode); String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL); req.setAttribute("serverUrl", serverUrl); Index: lams_central/web/includes/javascript/openUrls.js =================================================================== diff -u -r8631b0fa18d10b78cd3150b63cd7da4e6926d2b0 -re674ee8c8ff4d3d75456b57586d1ea5c090d55b9 --- lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision 8631b0fa18d10b78cd3150b63cd7da4e6926d2b0) +++ lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision e674ee8c8ff4d3d75456b57586d1ea5c090d55b9) @@ -149,18 +149,18 @@ { if(isMac) { - previewWin = window.open('home.do?method=learner&lessonID='+lessonId,'pWindow','width=796,height=570,resizable,status=yes'); + previewWin = window.open('home.do?method=learner&mode=preview&lessonID='+lessonId,'pWindow','width=796,height=570,resizable,status=yes'); } else { if(previewWin && !previewWin.closed ) { - previewWin.location = 'home.do?method=learner&lessonID='+lessonId; + previewWin.location = 'home.do?method=learner&mode=preview&lessonID='+lessonId; previewWin.focus(); } else { - previewWin = window.open('home.do?method=learner&lessonID='+lessonId,'pWindow','width=796,height=570,resizable,status=yes'); + previewWin = window.open('home.do?method=learner&mode=preview&lessonID='+lessonId,'pWindow','width=796,height=570,resizable,status=yes'); } } } Index: lams_central/web/learner.jsp =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -re674ee8c8ff4d3d75456b57586d1ea5c090d55b9 --- lams_central/web/learner.jsp (.../learner.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_central/web/learner.jsp (.../learner.jsp) (revision e674ee8c8ff4d3d75456b57586d1ea5c090d55b9) @@ -5,7 +5,7 @@ - "> + &mode="> <fmt:message key="title.learner.window"/>