Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java,v diff -u -r1.20 -r1.21 --- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 27 Sep 2006 00:06:38 -0000 1.20 +++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 19 Oct 2006 06:08:17 -0000 1.21 @@ -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/learner.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/Attic/learner.jsp,v diff -u -r1.9 -r1.10 --- lams_central/web/learner.jsp 28 Sep 2006 23:27:36 -0000 1.9 +++ lams_central/web/learner.jsp 19 Oct 2006 06:08:16 -0000 1.10 @@ -5,7 +5,7 @@ - "> + &mode="> <fmt:message key="title.learner.window"/> Index: lams_central/web/includes/javascript/openUrls.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/openUrls.js,v diff -u -r1.18 -r1.19 --- lams_central/web/includes/javascript/openUrls.js 13 Oct 2006 01:44:31 -0000 1.18 +++ lams_central/web/includes/javascript/openUrls.js 19 Oct 2006 06:08:16 -0000 1.19 @@ -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'); } } }