Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.126 -r1.127
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	11 May 2016 07:30:12 -0000	1.126
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	22 Sep 2016 11:22:33 -0000	1.127
@@ -1,8 +1,6 @@
 appName = lams_central 
 #language code: en 
-#locale code: AU 
-
-
+#locale code: AU
  
 #=================== labels for LAMS Central =================# 
 
@@ -671,4 +669,18 @@
 label.top.comments=Top Comments
 label.add.sticky=Stick To Top
 label.remove.sticky=Remove Sticky 
+
+label.organisations  =Select course with the lessons that needs to be export
+label.lesson.id  =Lesson ID
+label.display.design.image =Display sequence image?
+label.select.sequence  =You must select a sequence before proceeding
+label.choose.sequence  =Choose Lams sequence
+label.author.sequence  =Author new LAMS lessons
+label.open.monitor  =Open Monitor
+label.your.progress  =Your Lesson Progress
+label.you.completed.this.lesson  =You have completed this lesson.
+label.total.activities.depend.on.path  =Total activities depend on your learning path.
+label.lesson.not.completed  =Lesson is not yet completed.
+label.you.completed.activities  =You have completed {0} activities
+
 #======= End labels: Exported 439 labels for en AU =====
Index: lams_central/conf/xdoclet/servlet-mappings.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/servlet-mappings.xml,v
diff -u -r1.27 -r1.28
--- lams_central/conf/xdoclet/servlet-mappings.xml	28 Apr 2015 11:52:07 -0000	1.27
+++ lams_central/conf/xdoclet/servlet-mappings.xml	22 Sep 2016 11:22:33 -0000	1.28
@@ -31,6 +31,11 @@
 </servlet-mapping>
 
 <servlet-mapping>
+	<servlet-name>LoginRequestLti</servlet-name>
+	<url-pattern>/LoginRequestLti</url-pattern>
+</servlet-mapping>
+
+<servlet-mapping>
 	<servlet-name>LearningDesignRepository</servlet-name>
 	<url-pattern>/services/xml/LearningDesignRepository/*</url-pattern>
 </servlet-mapping>
Index: lams_central/conf/xdoclet/servlets.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/servlets.xml,v
diff -u -r1.28 -r1.29
--- lams_central/conf/xdoclet/servlets.xml	28 Apr 2015 11:52:07 -0000	1.28
+++ lams_central/conf/xdoclet/servlets.xml	22 Sep 2016 11:22:33 -0000	1.29
@@ -62,6 +62,14 @@
 </servlet>
 
 <servlet>
+	<servlet-name>LoginRequestLti</servlet-name>
+	
+	<servlet-class>
+		org.lamsfoundation.lams.web.LoginRequestLtiServlet
+	</servlet-class>
+</servlet>
+
+<servlet>
 	<servlet-name>LearningDesignRepository</servlet-name>
 	
 	<servlet-class>
Index: lams_central/conf/xdoclet/web-security.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/web-security.xml,v
diff -u -r1.29 -r1.30
--- lams_central/conf/xdoclet/web-security.xml	14 Oct 2015 13:20:05 -0000	1.29
+++ lams_central/conf/xdoclet/web-security.xml	22 Sep 2016 11:22:33 -0000	1.30
@@ -20,6 +20,7 @@
 	    	<web-resource-name>Public content</web-resource-name>
  	    	<!-- Integrations -->
     		<url-pattern>/LoginRequest</url-pattern>
+    		<url-pattern>/LoginRequestLti</url-pattern>
     		<url-pattern>/services/xml/LessonManager/*</url-pattern>
     		<url-pattern>/services/xml/LearningDesignRepository/*</url-pattern>
     		<url-pattern>/services/LearningDesignSVG/*</url-pattern>
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.75 -r1.76
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	27 Jul 2016 16:45:00 -0000	1.75
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	22 Sep 2016 11:23:24 -0000	1.76
@@ -468,18 +468,18 @@
      * Redirects to URL specified in redirectURL parameter. Used by LoginRequest.
      */
     public ActionForward redirect(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse res) throws IOException, ServletException {
+	    HttpServletResponse response) throws IOException, ServletException {
 	String redirectUrlParam = request.getParameter("redirectURL");
 	if (redirectUrlParam != null) {
-//	    redirectUrlParam = URLDecoder.decode(redirectUrlParam, "UTF8");
 	    log.info("home.do?method=redirect is requested. Redirecting to " + redirectUrlParam);
-	    res.sendRedirect(redirectUrlParam);
+	    redirectUrlParam = response.encodeRedirectURL(redirectUrlParam);
+	    response.sendRedirect(redirectUrlParam);
 	    return null;
 	}
 	
 	log.warn("home.do?method=redirect is requested but no redirectURL paramter is provided.");
 	String defaultUrl = request.getContextPath() + "/index.jsp";
-	res.sendRedirect(defaultUrl);
+	response.sendRedirect(defaultUrl);
 	return null;
     }
 
Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java,v
diff -u -r1.56 -r1.57
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	5 May 2016 08:10:16 -0000	1.56
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	22 Sep 2016 11:23:34 -0000	1.57
@@ -162,7 +162,7 @@
 	    if (IndexAction.isPedagogicalPlannerAvailable()) {
 		headerLinks.add(new IndexLinkBean("index.planner", "javascript:openPedagogicalPlanner()"));
 	    }
-	    headerLinks.add(new IndexLinkBean("index.author", "javascript:openAuthor()"));
+	    headerLinks.add(new IndexLinkBean("index.author", "javascript:openAuthor(false)"));
 	}
 	headerLinks.add(new IndexLinkBean("index.myprofile", "index.do?tab=profile"));
 
Index: lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java	22 Sep 2016 11:23:14 -0000	1.1
@@ -0,0 +1,318 @@
+package org.lamsfoundation.lams.web.action;
+
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.http.HttpStatus;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionRedirect;
+import org.apache.tomcat.util.json.JSONException;
+import org.imsglobal.lti.BasicLTIConstants;
+import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
+import org.lamsfoundation.lams.integration.ExtCourseClassMap;
+import org.lamsfoundation.lams.integration.ExtServerLessonMap;
+import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.ExtUserUseridMap;
+import org.lamsfoundation.lams.integration.UserInfoFetchException;
+import org.lamsfoundation.lams.integration.UserInfoValidationException;
+import org.lamsfoundation.lams.integration.service.IIntegrationService;
+import org.lamsfoundation.lams.integration.service.IntegrationService;
+import org.lamsfoundation.lams.integration.util.LoginRequestDispatcher;
+import org.lamsfoundation.lams.integration.util.LtiUtils;
+import org.lamsfoundation.lams.learningdesign.service.ILearningDesignService;
+import org.lamsfoundation.lams.lesson.LearnerProgress;
+import org.lamsfoundation.lams.lesson.Lesson;
+import org.lamsfoundation.lams.lesson.dto.LearnerProgressDTO;
+import org.lamsfoundation.lams.lesson.service.ILessonService;
+import org.lamsfoundation.lams.monitoring.service.IMonitoringService;
+import org.lamsfoundation.lams.security.ISecurityService;
+import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.Role;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.usermanagement.exception.UserAccessDeniedException;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.CentralConstants;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.util.svg.SVGGenerator;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.lamsfoundation.lams.workspace.service.IWorkspaceManagementService;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ * Shows either addLesson.jsp or learnerMonitor.jsp pages.
+ * 
+ * @author Andrey Balan
+ *
+ * @struts:action path="/lti" scope="request"
+ *                parameter="method" validate="false"
+ *
+ * @struts:action-forward name="addLesson" path="/lti/addLesson.jsp"
+ * @struts:action-forward name="learnerMonitor" path="/lti/learnerMonitor.jsp"
+ * @struts:action-forward name ="learnerMonitorRedirect" path="/lti.do?method=learnerMonitor" redirect="true"
+ * @struts:action-forward name="error" path="/error.jsp"
+ */
+public class LtiAction extends LamsDispatchAction {
+
+    private static Logger log = Logger.getLogger(LtiAction.class);
+    private static IIntegrationService integrationService = null;
+    private static IMonitoringService monitoringService = null;
+    private static IUserManagementService userManagementService = null;
+    private static ILearningDesignService learningDesignService;
+    private static ILessonService lessonService = null;
+    private static IWorkspaceManagementService workspaceManagementService;
+    private static ISecurityService securityService;
+
+    /**
+     * Single entry point to LAMS LTI processing mechanism. It determines here whether to show author or learnerMonitor
+     * pages
+     */
+    public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, UserAccessDeniedException, JSONException,
+	    RepositoryCheckedException, UserInfoFetchException, UserInfoValidationException {
+	initServices();
+	String consumerKey = request.getParameter(LtiUtils.OAUTH_CONSUMER_KEY);
+	String resourceLinkId = request.getParameter(BasicLTIConstants.RESOURCE_LINK_ID);
+	String tcGradebookId = request.getParameter(BasicLTIConstants.LIS_RESULT_SOURCEDID);
+	String extUserId = request.getParameter(BasicLTIConstants.USER_ID);
+	
+	ExtServerLessonMap lesson = integrationService.getLtiConsumerLesson(consumerKey, resourceLinkId);
+	
+	//update lessonFinishCallbackUrl. We store it one time during the very first call to LAMS and it stays the same all the time afterwards
+	String lessonFinishCallbackUrl = request.getParameter(BasicLTIConstants.LIS_OUTCOME_SERVICE_URL);
+	ExtServerOrgMap serverMap = integrationService.getExtServerOrgMap(consumerKey);
+	if (StringUtils.isNotBlank(lessonFinishCallbackUrl) && StringUtils.isBlank(serverMap.getLessonFinishUrl())) {
+	    serverMap.setLessonFinishUrl(lessonFinishCallbackUrl);
+	    userManagementService.save(serverMap);
+	}
+
+	//check if learner tries to access the link that hasn't been authored by teacher yet
+	String method = request.getParameter("_" + LoginRequestDispatcher.PARAM_METHOD);
+	if (LoginRequestDispatcher.METHOD_LEARNER_STRICT_AUTHENTICATION.equals(method) && lesson == null) {
+	    String errorMsg = "Learner tries to access the link that hasn't been authored by teacher yet. resource_link_id: "
+		    + tcGradebookId;
+	    log.debug(errorMsg);
+	    request.setAttribute("error", errorMsg);
+	    request.setAttribute("javax.servlet.error.exception", new UserAccessDeniedException(errorMsg));
+	    return mapping.findForward("error");
+	}
+
+	//determine whether to show author or learnerMonitor pages	
+	if (lesson == null) {
+	    return addLesson(mapping, form, request, response);
+	    
+	} else {
+
+	    //as per LTI spec we need to update tool consumer's gradebook id on every LTI call 
+	    ExtUserUseridMap extUserMap = integrationService.getExistingExtUserUseridMap(serverMap, extUserId);
+	    extUserMap.setTcGradebookId(tcGradebookId);
+	    userManagementService.save(extUserMap);
+
+	    return learnerMonitor(mapping, form, request, response);
+	}
+
+    }
+
+    /**
+     * When teacher accesses link for the very first time, we show him addLesson page where he can choose learning
+     * design and start a lesson.
+     */
+    public ActionForward addLesson(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, UserAccessDeniedException, JSONException,
+	    RepositoryCheckedException, UserInfoFetchException, UserInfoValidationException {
+	initServices();
+	Integer userId = getUser().getUserID();
+	String contextId = request.getParameter(BasicLTIConstants.CONTEXT_ID);
+	String consumerKey = request.getParameter(LtiUtils.OAUTH_CONSUMER_KEY);
+	String resourceLinkId = request.getParameter(BasicLTIConstants.RESOURCE_LINK_ID);
+	String resourceLinkTitle = request.getParameter(BasicLTIConstants.RESOURCE_LINK_TITLE);
+	String resourceLinkDescription = request.getParameter(BasicLTIConstants.RESOURCE_LINK_DESCRIPTION);
+
+	ExtServerOrgMap serverMap = integrationService.getExtServerOrgMap(consumerKey);
+	ExtCourseClassMap orgMap = integrationService.getExtCourseClassMap(serverMap.getSid(), contextId);
+	Integer organisationId = orgMap.getOrganisation().getOrganisationId();
+	//only monitors are allowed to create lesson
+	if (!securityService.isGroupMonitor(organisationId, userId, "add lesson", false)) {
+	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a monitor in the organisation");
+	    return null;
+	}
+
+	// get all user accessible folders and LD descriptions as JSON
+	String folderContentsJSON = workspaceManagementService.getFolderContentsJSON(null, userId, false);
+	request.setAttribute("folderContents", folderContentsJSON);
+	request.setAttribute(LtiUtils.OAUTH_CONSUMER_KEY, consumerKey);
+	request.setAttribute(BasicLTIConstants.RESOURCE_LINK_ID, resourceLinkId);
+	request.setAttribute(CentralConstants.ATTR_COURSE_ID, organisationId);
+	request.setAttribute(BasicLTIConstants.CONTEXT_ID, contextId);
+	request.setAttribute(CentralConstants.PARAM_TITLE, resourceLinkTitle);
+	request.setAttribute(CentralConstants.PARAM_DESC, resourceLinkDescription);
+
+	return mapping.findForward("addLesson");
+    }
+
+    /**
+     * Starts a lesson. Then prompts to learnerMonitor page.
+     */
+    public ActionForward startLesson(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, UserAccessDeniedException, JSONException,
+	    RepositoryCheckedException, UserInfoValidationException, UserInfoFetchException {
+	initServices();
+	Integer userId = getUser().getUserID();
+	User user = getRealUser(getUser());
+
+	String consumerKey = request.getParameter(LtiUtils.OAUTH_CONSUMER_KEY);
+	String resourceLinkId = request.getParameter(BasicLTIConstants.RESOURCE_LINK_ID);
+	String title = request.getParameter(CentralConstants.PARAM_TITLE);
+	String desc = request.getParameter(CentralConstants.PARAM_DESC);
+	String ldIdStr = request.getParameter(CentralConstants.PARAM_LEARNING_DESIGN_ID);
+	String contextId = request.getParameter(BasicLTIConstants.CONTEXT_ID);
+	Integer organisationId = new Integer(WebUtil.readIntParam(request, CentralConstants.ATTR_COURSE_ID));
+	boolean enableLessonIntro = WebUtil.readBooleanParam(request, "enableLessonIntro", false);
+	
+	//only monitors are allowed to create lesson
+	if (!securityService.isGroupMonitor(organisationId, userId, "add lesson", false)) {
+	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a monitor in the organisation");
+	    return null;
+	}
+
+	ExtServerOrgMap serverMap = integrationService.getExtServerOrgMap(consumerKey);
+	Organisation organisation = monitoringService.getOrganisation(organisationId);
+
+	// 1. init lesson
+	Lesson lesson = monitoringService.initializeLesson(title, desc, new Long(ldIdStr),
+		organisation.getOrganisationId(), user.getUserId(), null, false, enableLessonIntro, false, false, false,
+		true, true, false, false, null, null);
+	// 2. create lessonClass for lesson
+	List<User> staffList = new LinkedList<User>();
+	staffList.add(user);
+	List<User> learnerList = new LinkedList<User>();
+	Vector<User> learnerVector = userManagementService
+		.getUsersFromOrganisationByRole(organisation.getOrganisationId(), Role.LEARNER, false, true);
+	learnerList.addAll(learnerVector);
+	monitoringService.createLessonClassForLesson(lesson.getLessonId(), organisation,
+		organisation.getName() + "Learners", learnerList, organisation.getName() + "Staff", staffList,
+		user.getUserId());
+	// 3. start lesson
+	monitoringService.startLesson(lesson.getLessonId(), user.getUserId());
+	// store information which extServer has started the lesson
+	integrationService.createExtServerLessonMap(lesson.getLessonId(), resourceLinkId, serverMap);
+
+	//set roles to contain monitor so that the user can see monitor link
+	ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig("learnerMonitorRedirect"));
+	redirect.addParameter(LtiUtils.OAUTH_CONSUMER_KEY, consumerKey);
+	redirect.addParameter(BasicLTIConstants.RESOURCE_LINK_ID, resourceLinkId);
+	redirect.addParameter(BasicLTIConstants.CONTEXT_ID, contextId);
+	return redirect;
+    }
+
+    /**
+     * Once lesson was created, start showing learnerMonitor page to everybody regardless of his role.
+     */
+    public ActionForward learnerMonitor(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, UserAccessDeniedException, JSONException,
+	    RepositoryCheckedException, UserInfoValidationException, UserInfoFetchException {
+	initServices();
+	Integer userId = getUser().getUserID();
+	String consumerKey = request.getParameter(LtiUtils.OAUTH_CONSUMER_KEY);
+	String resourceLinkId = request.getParameter(BasicLTIConstants.RESOURCE_LINK_ID);
+	
+	//get orgId
+//	String contextId = request.getParameter(BasicLTIConstants.CONTEXT_ID);
+//	ExtServerOrgMap serverMap = integrationService.getExtServerOrgMap(consumerKey);
+//	ExtCourseClassMap orgMap = integrationService.getExtCourseClassMap(serverMap.getSid(), contextId);
+//	Integer organisationId = orgMap.getOrganisation().getOrganisationId();
+
+	//get lesson
+	ExtServerLessonMap extLesson = integrationService.getLtiConsumerLesson(consumerKey, resourceLinkId);
+	Long lessonId = extLesson.getLessonId();
+	Lesson lesson = (Lesson) userManagementService.findById(Lesson.class, lessonId);
+
+	//set all required attributes for jsp
+	request.setAttribute("lessonId", lessonId);
+	request.setAttribute("ldId", lesson.getLearningDesign().getLearningDesignId());
+	request.setAttribute("title", lesson.getLessonName());
+	request.setAttribute("description", lesson.getLessonDescription());
+	request.setAttribute("isDisplayDesignImage", lesson.isDisplayDesignImage());
+	boolean isMonitor = securityService.isLessonMonitor(lessonId, userId, "learner monitor", false);
+	request.setAttribute("isMonitor", isMonitor);
+
+	//get learnerProgressDto
+	LearnerProgress learnProg = lessonService.getUserProgressForLesson(userId, lessonId);
+	if (learnProg != null) {
+	    LearnerProgressDTO learnerProgress = learnProg.getLearnerProgressData();
+	    request.setAttribute("learnerProgressDto", learnerProgress);
+	}
+	
+	// check if we need to create svg, png files on the server
+	if (lesson.isDisplayDesignImage() && lesson.getLearnerProgresses().isEmpty()) {
+	    Long learningDesignId = lesson.getLearningDesign().getLearningDesignId();
+	    learningDesignService.createLearningDesignSVG(learningDesignId, SVGGenerator.OUTPUT_FORMAT_SVG);
+	    learningDesignService.createLearningDesignSVG(learningDesignId, SVGGenerator.OUTPUT_FORMAT_PNG);
+	}
+
+	return mapping.findForward("learnerMonitor");
+    }
+
+    private UserDTO getUser() {
+	HttpSession ss = SessionManager.getSession();
+	return (UserDTO) ss.getAttribute(AttributeNames.USER);
+    }
+
+    private User getRealUser(UserDTO dto) {
+	return userManagementService.getUserByLogin(dto.getLogin());
+    }
+
+    private void initServices() {
+	if (integrationService == null) {
+	    integrationService = (IntegrationService) WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServlet().getServletContext()).getBean("integrationService");
+	}
+
+	if (monitoringService == null) {
+	    monitoringService = (IMonitoringService) WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServlet().getServletContext()).getBean("monitoringService");
+	}
+
+	if (userManagementService == null) {
+	    userManagementService = (IUserManagementService) WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServlet().getServletContext())
+		    .getBean("userManagementService");
+	}
+	
+	if (learningDesignService == null) {
+	    learningDesignService = (ILearningDesignService) WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServlet().getServletContext())
+		    .getBean("learningDesignService");
+	}
+
+	if (lessonService == null) {
+	    lessonService = (ILessonService) WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServlet().getServletContext()).getBean("lessonService");
+	}
+
+	if (workspaceManagementService == null) {
+	    WebApplicationContext webContext = WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServlet().getServletContext());
+	    workspaceManagementService = (IWorkspaceManagementService) webContext.getBean("workspaceManagementService");
+	}
+
+	if (securityService == null) {
+	    WebApplicationContext webContext = WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServlet().getServletContext());
+	    securityService = (ISecurityService) webContext.getBean("securityService");
+	}
+    }
+
+}
Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java,v
diff -u -r1.67 -r1.68
--- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java	15 Jul 2016 05:59:28 -0000	1.67
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java	22 Sep 2016 11:23:04 -0000	1.68
@@ -361,29 +361,29 @@
 	doGet(request, response);
     }
 
-    private Long startLesson(String serverId, String datetime, String hashValue, String username, long ldId,
+    private static Long startLesson(String serverId, String datetime, String hashValue, String username, long ldId,
 	    String courseId, String title, String desc, String countryIsoCode, String langIsoCode, String customCSV,
 	    boolean exportPortfolioEnable, boolean presenceEnable, boolean imEnable, boolean enableNotifications)
 	    throws RemoteException {
 	try {
-	    ExtServerOrgMap serverMap = LessonManagerServlet.integrationService.getExtServerOrgMap(serverId);
+	    ExtServerOrgMap serverMap = integrationService.getExtServerOrgMap(serverId);
 	    Authenticator.authenticate(serverMap, datetime, username, hashValue);
-	    ExtUserUseridMap userMap = LessonManagerServlet.integrationService.getExtUserUseridMap(serverMap, username);
-	    ExtCourseClassMap orgMap = LessonManagerServlet.integrationService.getExtCourseClassMap(serverMap, userMap,
+	    ExtUserUseridMap userMap = integrationService.getExtUserUseridMap(serverMap, username);
+	    ExtCourseClassMap orgMap = integrationService.getExtCourseClassMap(serverMap, userMap,
 		    courseId, countryIsoCode, langIsoCode, null, LoginRequestDispatcher.METHOD_MONITOR);
 	    User user = userMap.getUser();
 	    Organisation organisation = orgMap.getOrganisation();
 
 	    // 1. init lesson
-	    Lesson lesson = LessonManagerServlet.monitoringService.initializeLesson(title, desc, ldId,
+	    Lesson lesson = monitoringService.initializeLesson(title, desc, ldId,
 		    organisation.getOrganisationId(), user.getUserId(), customCSV, false, false, exportPortfolioEnable,
 		    presenceEnable, imEnable, true, enableNotifications, false, false, null, null);
 	    // 2. create lessonClass for lesson
 	    createLessonClass(lesson, organisation, user);
 	    // 3. start lesson
-	    LessonManagerServlet.monitoringService.startLesson(lesson.getLessonId(), user.getUserId());
+	    monitoringService.startLesson(lesson.getLessonId(), user.getUserId());
 	    // store information which extServer has started the lesson
-	    LessonManagerServlet.integrationService.createExtServerLessonMap(lesson.getLessonId(), serverMap);
+	    integrationService.createExtServerLessonMap(lesson.getLessonId(), serverMap);
 
 	    return lesson.getLessonId();
 	} catch (Exception e) {
@@ -785,17 +785,16 @@
     }
 
     @SuppressWarnings("unchecked")
-    private void createLessonClass(Lesson lesson, Organisation organisation, User creator) {
+    private static void createLessonClass(Lesson lesson, Organisation organisation, User creator) {
 	List<User> staffList = new LinkedList<User>();
 	staffList.add(creator);
 	List<User> learnerList = new LinkedList<User>();
-	Vector<User> learnerVector = LessonManagerServlet.userManagementService
+	Vector<User> learnerVector = userManagementService
 		.getUsersFromOrganisationByRole(organisation.getOrganisationId(), Role.LEARNER, false, true);
 	learnerList.addAll(learnerVector);
-	LessonManagerServlet.monitoringService.createLessonClassForLesson(lesson.getLessonId(), organisation,
+	monitoringService.createLessonClassForLesson(lesson.getLessonId(), organisation,
 		organisation.getName() + "Learners", learnerList, organisation.getName() + "Staff", staffList,
 		creator.getUserId());
-
     }
 
     /**
@@ -908,7 +907,11 @@
 		if ((firstNames != null) && ((firstNameArray.length != lastNameArray.length)
 			|| (firstNameArray.length != emailArray.length)
 			|| (firstNameArray.length != (learnerIdArray.length + monitorIdArray.length)))) {
-		    LessonManagerServlet.log.error("Invalid parameters sent: wrong array length.");
+		    LessonManagerServlet.log.error("Invalid parameters sent: wrong array length. " + "learnerIds="
+			    + learnerIds + " &monitorIds=" + monitorIds + " &firstNames=" + firstNames + " &lastNames="
+			    + lastNames + " &emails=" + emails + " &array lengths=" + learnerIdArray.length + "!"
+			    + monitorIdArray.length + "!" + firstNameArray.length + "!" + lastNameArray.length + "!"
+			    + emailArray.length);
 		    return false;
 		}
 
@@ -1064,14 +1067,7 @@
 	    lessonElement.setAttribute("lessonName", lesson.getLessonName());
 
 	    // calculate lesson's MaxPossibleMark
-	    Set<ToolActivity> activities = getLessonActivities(lesson);
-	    Long lessonMaxPossibleMark = 0L;
-	    for (ToolActivity activity : activities) {
-		Long activityMaxPossibleMark = LessonManagerServlet.toolService.getActivityMaxPossibleMark(activity);
-		if (activityMaxPossibleMark != null) {
-		    lessonMaxPossibleMark += activityMaxPossibleMark;
-		}
-	    }
+	    Long lessonMaxPossibleMark = toolService.getLessonMaxPossibleMark(lesson);
 	    lessonElement.setAttribute("lessonMaxPossibleMark", lessonMaxPossibleMark.toString());
 
 	    // get gradebook marks from DB
Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/openUrls.js,v
diff -u -r1.40 -r1.41
--- lams_central/web/includes/javascript/openUrls.js	10 Dec 2014 18:58:08 -0000	1.40
+++ lams_central/web/includes/javascript/openUrls.js	22 Sep 2016 11:22:16 -0000	1.41
@@ -1,4 +1,3 @@
-	<!--
 		// resolution checking
 		var belowMinRes;
 		if (screen.width <= 800 && screen.height <= 600) {
@@ -50,15 +49,17 @@
 			}
 		}
 		
-		function openAuthor() {
+		function openAuthor(isPostMessageToParent) {
+			var authorUrl = 'home.do?method=author' + (isPostMessageToParent ? "&isPostMessageToParent=true" : "");
+			
 			if (isMac) {
-					authorWin = window.open('home.do?method=author','aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable');
+					authorWin = window.open(authorUrl,'aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable');
 			} else {
 				if(authorWin && !authorWin.closed && authorWin.location.pathname.indexOf('home.do?method=author') > -1) {
 					//authorWin.location = 'home.do?method=author';
 					authorWin.focus();
 				} else {
-					authorWin = window.open('home.do?method=author','aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable');
+					authorWin = window.open(authorUrl,'aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable');
 					authorWin.focus();
 				}
 			}
@@ -133,14 +134,16 @@
 		}
 
 		function openLearner( lessonId ) {
+			var learnerUrl = 'home.do?method=learner&lessonID=' + lessonId;
+			
 			if (isMac) {
-				learnWin = window.open('home.do?method=learner&lessonID='+lessonId,'lWindow','width=' + learner_width + ',height=' + learner_height + ',resizable,status=yes');
+				learnWin = window.open(learnerUrl,'lWindow','width=' + learner_width + ',height=' + learner_height + ',resizable,status=yes');
 			} else {
 				if (learnWin && !learnWin.closed ) {
-					learnWin.location = 'home.do?method=learner&lessonID='+lessonId;		
+					learnWin.location = learnerUrl;		
 					learnWin.focus();
 				} else {
-					learnWin = window.open('home.do?method=learner&lessonID='+lessonId,'lWindow','width=' + learner_width + ',height=' + learner_height + ',resizable,status=yes');
+					learnWin = window.open(learnerUrl,'lWindow','width=' + learner_width + ',height=' + learner_height + ',resizable,status=yes');
 				}
 			}
 		}
@@ -284,4 +287,3 @@
 				gradebookMonLessonWin.focus();
 			}
 		}
-	//-->
Index: lams_central/web/lti/addLesson.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lti/addLesson.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_central/web/lti/addLesson.jsp	22 Sep 2016 11:22:16 -0000	1.1
@@ -0,0 +1,278 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
+		"http://www.w3.org/TR/html4/loose.dtd">
+
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-function" prefix="fn"%>
+<c:set var="lams" ><lams:LAMSURL/></c:set>
+
+<lams:html>
+<lams:head>
+	<title><fmt:message key="title.author.window"/></title>
+	
+	<lams:css/>
+	<link type="text/css" rel="stylesheet" href="<lams:LAMSURL/>css/yui/treeview.css">
+	<link type="text/css" rel="stylesheet" href="<lams:LAMSURL/>css/yui/folders.css">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/authoring.css" type="text/css" media="screen">
+	<style>
+		a, a:hover {
+			border-bottom: none;
+		}
+		/*.ygtvfocus .ygtvlabel, .ygtvfocus .ygtvlabel:link, .ygtvfocus ygtvlabel:visited, .ygtvfocus .ygtvlabel:hover {
+			background-color: white;
+		}*/
+		#title-table {
+			padding-top: 10px;
+			padding-bottom: 20px;
+		}
+		#preview-button {
+			visibility: hidden;
+		}
+	</style>
+	
+	<script type="text/javascript" src="includes/javascript/yui/yahoo-dom-event.js" ></script>
+	<script type="text/javascript" src="includes/javascript/yui/animation-min.js"></script>
+	<script type="text/javascript" src="includes/javascript/yui/json-min.js" ></script> 
+	<script type="text/javascript" src="includes/javascript/yui/treeview-min.js" ></script>
+	<script type="text/javascript" src="includes/javascript/getSysInfo.js"></script>
+	<script type="text/javascript" src="loadVars.jsp"></script>	
+	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="includes/javascript/addLesson.js"></script>	
+	<script type="text/javascript" src="includes/javascript/openUrls.js"></script>
+	<script type="text/javascript">
+    	var isSelected = false;
+		var tree;
+		var userId = '<lams:user property="userID"/>',
+			LAMS_URL = '<lams:LAMSURL/>',
+			LABEL_RUN_SEQUENCES_FOLDER = '<fmt:message key="label.tab.lesson.sequence.folder" />',
+			LABEL_NAME_INVALID_CHARACTERS = '<fmt:message key="error.lessonname.invalid.characters" />';
+	
+	$(document).ready(function (){
+
+		// generate LD initial tree; folderContents is declared in newLesson.jsp
+		var treeNodes = parseFolderContents(${folderContents});
+		
+		// there should be no focus, just highlight
+		//YAHOO.widget.TreeView.FOCUS_CLASS_NAME = null;
+		tree = new YAHOO.widget.TreeView('learningDesignTree', treeNodes);
+		tree.setDynamicLoad(function(node, callback){
+			// load subfolder contents
+			$.ajax({
+				url : LAMS_URL + 'home.do',
+				data : {
+					'method' : 'getFolderContents',
+					'folderID' : node.data.folderID
+				},
+				cache : false,
+				async: false,
+				dataType : 'json',
+				success : function(result) {
+					var childNodeData = parseFolderContents(result);
+					$.each(childNodeData, function(){
+							new YAHOO.widget.TextNode(this, node);
+						});
+					}
+				}
+			);
+			
+			// required by YUI
+			callback();
+		});
+
+		tree.singleNodeHighlight = true;
+		tree.subscribe('clickEvent', function(event){
+	         // if the selected object is a sequence (id!=0) then we assign the id to the hidden ldId
+	         // also if the name is blank we just add the name of the sequence to the name too.
+	         var obj = event.node.data.learningDesignId;
+				
+	         document.getElementsByName("ldId")[0].value = obj;
+
+	         if ((typeof obj === "undefined") || (obj==0)) {
+	         	isSelected = false;
+	     		document.getElementById('preview-button').style.visibility='hidden';
+	     		
+	         } else {
+	         	if (document.getElementsByName("title")[0].value == '') {
+	         	    document.getElementsByName("title")[0].value = name;
+	         	}
+	         	isSelected = true;
+	         	document.getElementById('preview-button').style.visibility='visible';
+	         }
+		});
+		tree.subscribe('clickEvent',tree.onEventToggleHighlight);
+		tree.render();
+		
+		// expand the first (user) folder
+		tree.getRoot().children[0].expand();
+
+	});
+
+	function openPreview() {
+    	var ldId = document.getElementsByName("ldId")[0].value;
+        var title = document.lessonForm.title.value;
+		
+		// initialize, create and enter the preview lesson
+		$.ajax({
+			url : LAMS_URL + 'monitoring/monitoring.do',
+			data : {
+				'method' : 'initializeLesson',
+				'learningDesignID' : ldId,
+				'copyType' : 3,
+				'lessonName' : "<fmt:message key='authoring.fla.preview.lesson.default.title' />"
+			},
+			cache : false,
+			dataType : 'text',
+			success : function(lessonID) {
+				if (!lessonID) {
+					alert("<fmt:message key='authoring.fla.preview.error' />");
+					return;
+				}
+				
+				$.ajax({
+					url : LAMS_URL + 'monitoring/monitoring.do',
+					data : {
+						'method' : 'startPreviewLesson',
+						'lessonID' : lessonID
+					},
+					cache : false,
+					dataType : 'text',
+					success : function() {
+						// open preview pop up window
+						window.open(LAMS_URL + 'home.do?method=learner&mode=preview&lessonID='+lessonID,'Preview',
+									'width=920,height=700,resizable,status=yes');
+					}
+				});
+
+			}
+		});
+	}
+     
+     // Refresh the LAMS sequence list (tigra tree)
+     function refreshSeqList() {
+        document.getElementById("ldId").value="0";
+        document.location.reload();
+     }
+     
+     // Do form vaildation
+     // Check that a title has been supplied
+	function confirmSubmit() {
+         
+		var title = rettrim(document.lessonForm.title.value);
+		if ((title == "")||(title == null)) {
+			alert("<fmt:message key='authoring.fla.save.sequence.title.prompt' />");
+			return false;
+		}
+         if(!isSelected) {
+             //Error Message
+             alert("<fmt:message key='label.select.sequence' />");
+             return false;
+         }
+	}
+		
+     // Utility function to trim
+     function rettrim(stringToTrim) {
+         return stringToTrim.replace(/^\s+|\s+$/g,"");
+     }
+     
+     function receiveMessage(event) {
+     	var lamsServerUrl = "${lams}";
+     	alert(""+lamsServerUrl.substring(0, event.origin.length) + "!" + event.origin +"!" +event.data);
+     	
+     	// verify the sender of this message
+     	if ((lamsServerUrl.substring(0, event.origin.length) === event.origin) && (event.data == "refresh")) {
+     		window.location.reload();
+     	}
+     }
+     
+	if (window.addEventListener){
+		window.addEventListener("message", receiveMessage, false);
+	} else if (window.attachEvent){
+		window.attachEvent("message", receiveMessage);
+	}		
+
+	</script>
+	
+</lams:head>
+
+<body class="stripes">
+	
+	<div id="content">
+	
+	<h2>
+		<fmt:message key="label.create.lesson"/>
+	</h2>
+		
+	<%-- Form to Collect ID of Selected LAMS Sequence --%>
+    <form name="lessonForm" id="lesson-form" action="lti.do?method=startLesson" method="post" onSubmit="return confirmSubmit();">
+    	<input type="hidden" name="oauth_consumer_key" value="${oauth_consumer_key}">
+    	<input type="hidden" name="resource_link_id" value="${resource_link_id}">
+        <input type="hidden" name="courseId" value="${courseId}">
+        <input type="hidden" name="context_id" value="${context_id}">
+    	<input type="hidden" name="ldId" id="ldId" value="0">
+    	
+    	<table id="title-table">
+			<tr>
+				<td>
+					<label for="title">
+						<fmt:message key="authoring.fla.page.dialog.ld.title" />
+					</label>
+				</td>
+				<td>
+					<input type="text" name="title" size="70" id="title" value="${title}"/>
+				<td>
+			</tr>
+			
+			<tr>
+				<td>
+					<label for="description">
+						<fmt:message key="authoring.fla.page.prop.description" />
+					</label>
+				</td>
+				<td>
+					<textarea name="desc" cols="70" rows="3" id="desc">${desc}</textarea>
+				</td>
+			</tr>
+		</table>
+            
+        <h4>
+        	<fmt:message key="label.choose.sequence"/>
+		</h4>
+		
+		<%-- Preview and Author Buttons --%>			    
+		<div class="float-right">
+			<input type="button" id="preview-button" onclick="openPreview(); return false;" 
+					class="button" value="<fmt:message key="authoring.fla.preview.lesson.default.title" />" >
+						
+			<input type="button" onclick="openAuthor(true); return false;" 
+					class="button" value="<fmt:message key="label.author.sequence" />" >
+			    
+			<input type="button" onclick="window.location.reload(); return false;" 
+					class="button" value="<fmt:message key="authoring.fla.refresh.button" />" >
+		</div>
+            
+		<div id="learningDesignTree"></div>
+		<div id="updatesequence"></div>
+				
+		<p>
+			<input type="checkbox" name="enableLessonIntro" class="noBorder" id="design-image" value="true"/>
+			<label for="design-image">
+				<fmt:message key="label.display.design.image" />
+			</label>
+		</p>
+			
+		<div class="space-bottom-top align-right">
+			<input type="submit" class="button" value="<fmt:message key="authoring.fla.save.button" />">
+		</div>
+    </form>
+
+	</div>
+	   
+	<div id="footer"></div>
+
+</body>
+	
+</lams:html>
+ 
Index: lams_central/web/lti/learnerMonitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lti/learnerMonitor.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_central/web/lti/learnerMonitor.jsp	22 Sep 2016 11:22:16 -0000	1.1
@@ -0,0 +1,141 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
+		"http://www.w3.org/TR/html4/loose.dtd">
+
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-function" prefix="fn"%>
+<c:set var="lams" ><lams:LAMSURL/></c:set>
+<c:set var="pngImageSrc" value="${lams}www/secure/learning-design-images/${ldId}.png" />
+<c:set var="svgImageSrc" value="${lams}www/secure/learning-design-images/${ldId}.svg" />
+
+<lams:html>
+<lams:head>
+	<title><fmt:message key="title.author.window"/></title>
+	
+	<lams:css/>
+	<script language="JavaScript" type="text/javascript" src="includes/javascript/css.browser.selector.js"></script>
+	<style type="text/css"> 
+		#progress-area {
+			text-align: center; 
+			border: #d3d3d3 1px solid;
+			margin: 10px;
+			padding: 10px 10px 2px;
+		}
+		.smalltext {
+			text-align:right;
+			font-size: 0.75em;
+		}
+		.super {
+			position:relative;
+			bottom:0.5em;
+			color:red;
+			font-size:0.8em;
+		}
+		.progress-header {
+			text-align:center;
+			font-weight: bold;
+			padding-top: 5px; 
+			padding-bottom:5px;
+		}
+		.left-text-align{
+			text-align: left;
+		}
+		#buttons {
+		    height: 30px;
+		    padding-top: 10px;
+		}
+		
+		div.svg-object { display: none }
+		.ie div.svg-object { display: inline }
+		.ie img.svg { display: none }
+		.gecko div.svg-object { display: inline }
+		.gecko img.svg { display: none }
+		
+		#sequence-preview {padding: 10px; text-align: center;}
+	</style>
+	
+	<script type="text/javascript" src="includes/javascript/getSysInfo.js"></script>
+	<script type="text/javascript" src="loadVars.jsp"></script>
+	<script type="text/javascript" src="includes/javascript/openUrls.js"></script>
+	
+</lams:head>
+
+<body class="stripes">
+	
+	<div id="content">
+	
+		<h1>
+			${title}
+		</h1>
+
+		<c:if test="${not empty description}">
+		    <div class="vtbegenerated"> 
+		    	${description} 
+		    </div>
+		</c:if>
+    
+		<c:if test="${isDisplayDesignImage}">
+			<div id="sequence-preview">
+				<img src="${pngImageSrc}" alt="Sequence Preview" class="svg" />
+				<div class="svg-object">
+					<object data="${svgImageSrc}" type="image/svg+xml">
+			 			<img src="${pngImageSrc}" alt="Sequence Preview"/>
+					</object>
+				</div>
+			</div>
+		</c:if>
+    
+		<c:if test="${fn:length(learnerProgressDto.attemptedActivities) > 0 || learnerProgressDto.lessonComplete}">
+		    <div id="progress-area">
+		    	<div class="progress-header">
+		    		<fmt:message key="label.your.progress"/>
+		    	</div>
+		    	
+		    	<c:choose>    	
+			    	<c:when test="${!learnerProgressDto.lessonComplete}">
+				    	<p class="left-text-align">
+				    		<fmt:message key="label.lesson.not.completed"/>
+				    	</p>
+				    	
+				    	<p class="left-text-align">
+				    		<fmt:message key="label.you.completed.activities">
+				    			<fmt:param>
+				    				${fn:length(learnerProgressDto.completedActivities)}
+				    			</fmt:param>
+				    		</fmt:message> 
+				    		<span class="super">[*]</span>
+				    	</p>
+				    	
+				    	<div class="smalltext">
+				    		<span class="super">*</span>
+				    		<fmt:message key="label.total.activities.depend.on.path"/>
+				    	</div>
+				    </c:when>
+			    	<c:otherwise>
+			    	 	<p>
+				    		<fmt:message key="label.you.completed.this.lesson"/>
+				    	</p>
+			    	 </c:otherwise>
+		    	 </c:choose>
+		    </div>
+		</c:if>	
+		
+		<div class="" id="buttons">
+	        <c:if test="${isMonitor}">
+		        <input type="button" onclick="javascript:openMonitorLesson(${lessonId}); return false;" 
+						class="button float-right" value="<fmt:message key="label.open.monitor" />" >
+	        </c:if>
+	        
+			<input type="button" onclick="javascript:openLearner(${lessonId}); return false;" 
+					class="button float-right space-right" value="<fmt:message key="label.open.lesson" />" >
+        </div>
+
+	</div>
+	   
+	<div id="footer"></div>
+
+</body>	
+</lams:html>