Fisheye: Tag ff911101cbe92d6813691c20c292fa04519820b4 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag ff911101cbe92d6813691c20c292fa04519820b4 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/ClearSessionAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag ff911101cbe92d6813691c20c292fa04519820b4 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag ff911101cbe92d6813691c20c292fa04519820b4 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/MonitoringAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag ff911101cbe92d6813691c20c292fa04519820b4 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/PedagogicalPlannerAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/AuthoringController.java
===================================================================
diff -u
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/AuthoringController.java	(revision 0)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/AuthoringController.java	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -0,0 +1,401 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.tool.kaltura.web.controller;
+
+import java.io.IOException;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.tool.kaltura.model.Kaltura;
+import org.lamsfoundation.lams.tool.kaltura.model.KalturaItem;
+import org.lamsfoundation.lams.tool.kaltura.model.KalturaUser;
+import org.lamsfoundation.lams.tool.kaltura.service.IKalturaService;
+import org.lamsfoundation.lams.tool.kaltura.util.KalturaConstants;
+import org.lamsfoundation.lams.tool.kaltura.util.KalturaException;
+import org.lamsfoundation.lams.tool.kaltura.util.KalturaItemComparator;
+import org.lamsfoundation.lams.tool.kaltura.web.forms.AuthoringForm;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.lamsfoundation.lams.web.util.SessionMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+/**
+ * @author Andrey Balan
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+@Controller
+@RequestMapping("/authoring")
+public class AuthoringController {
+
+    private static Logger logger = Logger.getLogger(AuthoringController.class);
+
+    @Autowired
+    @Qualifier("kalturaService")
+    private IKalturaService kalturaService;
+
+    // Authoring SessionMap key names
+    private static final String KEY_TOOL_CONTENT_ID = "toolContentID";
+    private static final String KEY_CONTENT_FOLDER_ID = "contentFolderID";
+    private static final String KEY_MODE = "mode";
+
+    @RequestMapping("")
+    protected String unspecified(@ModelAttribute("authoringForm") AuthoringForm authoringForm,
+	    HttpServletRequest request) {
+
+	// Extract toolContentID from parameters.
+	Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
+
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+
+	ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request);
+
+	// retrieving Kaltura with given toolContentID
+	Kaltura kaltura = kalturaService.getKalturaByContentId(toolContentID);
+	if (kaltura == null) {
+	    kaltura = kalturaService.copyDefaultContent(toolContentID);
+	    kaltura.setCreateDate(new Date());
+	    kalturaService.saveOrUpdateKaltura(kaltura);
+	}
+
+	if (mode.isTeacher()) {
+	    // Set the defineLater flag so that learners cannot use content
+	    // while we
+	    // are editing. This flag is released when updateContent is called.
+	    kaltura.setDefineLater(true);
+	    kalturaService.saveOrUpdateKaltura(kaltura);
+
+	    //audit log the teacher has started editing activity in monitor
+	    kalturaService.auditLogStartEditingActivityInMonitor(toolContentID);
+	}
+
+	// Set up the authForm.
+	authoringForm.setTitle(kaltura.getTitle());
+	authoringForm.setInstructions(kaltura.getInstructions());
+	authoringForm.setLockOnFinished(kaltura.isLockOnFinished());
+	authoringForm.setAllowContributeVideos(kaltura.isAllowContributeVideos());
+	authoringForm.setAllowSeeingOtherUsersRecordings(kaltura.isAllowSeeingOtherUsersRecordings());
+	authoringForm.setLearnerContributionLimit(kaltura.getLearnerContributionLimit());
+	authoringForm.setAllowComments(kaltura.isAllowComments());
+	authoringForm.setAllowRatings(kaltura.isAllowRatings());
+	authoringForm.setReflectOnActivity(kaltura.isReflectOnActivity());
+	authoringForm.setReflectInstructions(kaltura.getReflectInstructions());
+
+	// Set up sessionMap
+	SessionMap<String, Object> sessionMap = new SessionMap<>();
+	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+	request.setAttribute(KalturaConstants.ATTR_SESSION_MAP, sessionMap);
+	authoringForm.setSessionMapID(sessionMap.getSessionID());
+
+	sessionMap.put(AuthoringController.KEY_MODE, mode);
+	sessionMap.put(AuthoringController.KEY_CONTENT_FOLDER_ID, contentFolderID);
+	sessionMap.put(AuthoringController.KEY_TOOL_CONTENT_ID, toolContentID);
+
+	Set<KalturaItem> items = kaltura.getKalturaItems();
+	// init taskList item list
+	SortedSet<KalturaItem> taskListItemList = getItemList(sessionMap);
+	taskListItemList.clear();
+	taskListItemList.addAll(items);
+
+	return "pages/authoring/authoring";
+    }
+
+    @RequestMapping(path = "/updateContent", method = RequestMethod.POST)
+    public String updateContent(@ModelAttribute("authoringForm") AuthoringForm authoringForm,
+	    HttpServletRequest request) {
+
+	// get authForm and session map.
+	SessionMap<String, Object> sessionMap = getSessionMap(request, authoringForm);
+
+	// get kaltura content.
+	Long toolContentId = (Long) sessionMap.get(AuthoringController.KEY_TOOL_CONTENT_ID);
+	Kaltura kaltura = kalturaService.getKalturaByContentId(toolContentId);
+
+	// update kaltura content using form inputs
+	kaltura.setTitle(authoringForm.getTitle());
+	kaltura.setInstructions(authoringForm.getInstructions());
+	kaltura.setLockOnFinished(authoringForm.isLockOnFinished());
+	kaltura.setAllowContributeVideos(authoringForm.isAllowContributeVideos());
+	kaltura.setLearnerContributionLimit(authoringForm.getLearnerContributionLimit());
+	kaltura.setAllowSeeingOtherUsersRecordings(authoringForm.isAllowSeeingOtherUsersRecordings());
+	kaltura.setAllowComments(authoringForm.isAllowComments());
+	kaltura.setAllowRatings(authoringForm.isAllowRatings());
+	kaltura.setReflectOnActivity(authoringForm.isReflectOnActivity());
+	kaltura.setReflectInstructions(authoringForm.getReflectInstructions());
+
+	// *******************************Handle user*******************
+	HttpSession ss = SessionManager.getSession();
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	KalturaUser kalturaUser = kalturaService.getUserByUserIdAndContentId(new Long(user.getUserID().intValue()),
+		toolContentId);
+	if (kalturaUser == null) {
+	    kalturaUser = new KalturaUser(user, kaltura);
+	}
+
+	kaltura.setCreatedBy(kalturaUser);
+
+	// ************************* Handle taskList items *******************
+	Set itemList = new LinkedHashSet();
+	SortedSet<KalturaItem> items = getItemList(sessionMap);
+	for (KalturaItem item : items) {
+	    if (item != null) {
+		// This flushs user UID info to message if this user is a new user.
+		item.setCreatedBy(kalturaUser);
+		itemList.add(item);
+	    }
+	}
+	kaltura.setKalturaItems(itemList);
+
+	// delete KalturaItems from database.
+	for (KalturaItem item : getDeletedItemList(sessionMap)) {
+	    if (item.getUid() != null) {
+		kalturaService.deleteKalturaItem(item.getUid());
+	    }
+	}
+
+	// set the update date
+	kaltura.setUpdateDate(new Date());
+
+	// releasing defineLater flag so that learner can start using the tool.
+	kaltura.setDefineLater(false);
+
+	kalturaService.saveOrUpdateKaltura(kaltura);
+
+	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+
+	// add the sessionMapID to form
+	authoringForm.setSessionMapID(sessionMap.getSessionID());
+
+	request.setAttribute(KalturaConstants.ATTR_SESSION_MAP, sessionMap);
+
+	return "pages/authoring/authoring";
+    }
+
+    /**
+     * Stores uploaded entryId(s).
+     */
+
+    @RequestMapping("/addItem")
+    public String addItem(HttpServletRequest request) throws IOException {
+
+	String sessionMapID = WebUtil.readStrParam(request, KalturaConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+	request.setAttribute(KalturaConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+
+	// check whether it is "edit(old item)" or "add(new item)"
+	SortedSet<KalturaItem> itemList = getItemList(sessionMap);
+	KalturaItem item = new KalturaItem();
+	item.setCreateDate(new Timestamp(new Date().getTime()));
+	int maxSeq = 1;
+	if (itemList != null && itemList.size() > 0) {
+	    KalturaItem last = itemList.last();
+	    maxSeq = last.getSequenceId() + 1;
+	}
+	item.setSequenceId(maxSeq);
+	itemList.add(item);
+
+	String title = WebUtil.readStrParam(request, KalturaConstants.PARAM_ITEM_TITLE, true);
+	if (StringUtils.isBlank(title)) {
+	    String itemLocalized = kalturaService.getLocalisedMessage("label.authoring.item", null);
+	    title = itemLocalized + " " + maxSeq;
+	}
+	item.setTitle(title);
+
+	int duration = WebUtil.readIntParam(request, KalturaConstants.PARAM_ITEM_DURATION);
+	item.setDuration(duration);
+
+	String entryId = WebUtil.readStrParam(request, KalturaConstants.PARAM_ITEM_ENTRY_ID);
+	if (StringUtils.isBlank(entryId)) {
+	    String errorMsg = "Add item failed due to missing entityId (received from Kaltura server).";
+	    logger.error(errorMsg);
+	    throw new KalturaException(errorMsg);
+	}
+	item.setEntryId(entryId);
+
+	item.setCreateByAuthor(true);
+	item.setHidden(false);
+
+	return "pages/authoring/itemlist";
+    }
+
+    /**
+     * Preview uploaded entryId.
+     */
+    @RequestMapping("/preview")
+    public String preview(HttpServletRequest request) throws IOException {
+
+	// get back sessionMAP
+	String sessionMapID = WebUtil.readStrParam(request, KalturaConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+
+	int itemIdx = NumberUtils.stringToInt(request.getParameter(KalturaConstants.PARAM_ITEM_INDEX), -1);
+	if (itemIdx != -1) {
+	    SortedSet<KalturaItem> itemList = getItemList(sessionMap);
+	    List<KalturaItem> rList = new ArrayList<>(itemList);
+	    KalturaItem item = rList.get(itemIdx);
+	    request.setAttribute(KalturaConstants.ATTR_ITEM, item);
+	}
+
+	return "pages/authoring/preview";
+    }
+
+    /**
+     * Remove kaltura item from HttpSession list and update page display. As authoring rule, all persist only happen
+     * when user submit whole page. So this remove is just impact HttpSession values.
+     */
+    @RequestMapping("/removeItem")
+    public String removeItem(HttpServletRequest request) {
+
+	// get back sessionMAP
+	String sessionMapID = WebUtil.readStrParam(request, KalturaConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+	request.setAttribute(KalturaConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+
+	int itemIdx = NumberUtils.stringToInt(request.getParameter(KalturaConstants.PARAM_ITEM_INDEX), -1);
+	if (itemIdx != -1) {
+	    SortedSet<KalturaItem> itemList = getItemList(sessionMap);
+	    List<KalturaItem> rList = new ArrayList<>(itemList);
+	    KalturaItem item = rList.remove(itemIdx);
+	    itemList.clear();
+	    itemList.addAll(rList);
+	    // add to delList
+	    List<KalturaItem> delList = getDeletedItemList(sessionMap);
+	    delList.add(item);
+	}
+
+	return "pages/authoring/itemlist";
+    }
+
+    /**
+     * Move up current item.
+     */
+    @RequestMapping("/upItem")
+    public String upItem(HttpServletRequest request) {
+	return switchItem(request, true);
+    }
+
+    /**
+     * Move down current item.
+     */
+    @RequestMapping("/downItem")
+    public String downItem(HttpServletRequest request) {
+	return switchItem(request, false);
+    }
+
+    private String switchItem(HttpServletRequest request, boolean up) {
+	// get back sessionMAP
+	String sessionMapID = WebUtil.readStrParam(request, KalturaConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	request.setAttribute(KalturaConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+
+	int itemIdx = NumberUtils.stringToInt(request.getParameter(KalturaConstants.PARAM_ITEM_INDEX), -1);
+	if (itemIdx != -1) {
+	    SortedSet<KalturaItem> kalturaList = getItemList(sessionMap);
+	    List<KalturaItem> rList = new ArrayList<>(kalturaList);
+	    // get current and the target item, and switch their sequnece
+	    KalturaItem item = rList.get(itemIdx);
+	    KalturaItem repItem;
+	    if (up) {
+		repItem = rList.get(--itemIdx);
+	    } else {
+		repItem = rList.get(++itemIdx);
+	    }
+	    int upSeqId = repItem.getSequenceId();
+	    repItem.setSequenceId(item.getSequenceId());
+	    item.setSequenceId(upSeqId);
+
+	    // put back list, it will be sorted again
+	    kalturaList.clear();
+	    kalturaList.addAll(rList);
+	}
+
+	return "pages/authoring/itemlist";
+    }
+
+    /**
+     * Retrieve the SessionMap from the HttpSession.
+     */
+    private SessionMap<String, Object> getSessionMap(HttpServletRequest request, AuthoringForm authForm) {
+	return (SessionMap<String, Object>) request.getSession().getAttribute(authForm.getSessionMapID());
+    }
+
+    /**
+     * List save current taskList items.
+     */
+    private SortedSet<KalturaItem> getItemList(SessionMap<String, Object> sessionMap) {
+	SortedSet<KalturaItem> list = (SortedSet<KalturaItem>) sessionMap.get(KalturaConstants.ATTR_ITEM_LIST);
+	if (list == null) {
+	    list = new TreeSet<>(new KalturaItemComparator());
+	    sessionMap.put(KalturaConstants.ATTR_ITEM_LIST, list);
+	}
+	return list;
+    }
+
+    /**
+     * List save deleted taskList items, which could be persisted or non-persisted items.
+     */
+    private List<KalturaItem> getDeletedItemList(SessionMap<String, Object> sessionMap) {
+	return getListFromSession(sessionMap, KalturaConstants.ATTR_DELETED_ITEM_LIST);
+    }
+
+    /**
+     * Get <code>java.util.List</code> from HttpSession by given name.
+     */
+    private List getListFromSession(SessionMap sessionMap, String name) {
+	List list = (List) sessionMap.get(name);
+	if (list == null) {
+	    list = new ArrayList();
+	    sessionMap.put(name, list);
+	}
+	return list;
+    }
+}
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/ClearSessionController.java
===================================================================
diff -u
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/ClearSessionController.java	(revision 0)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/ClearSessionController.java	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -0,0 +1,67 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+
+package org.lamsfoundation.lams.tool.kaltura.web.controller;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishController;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.context.WebApplicationContext;
+
+/**
+ * This class give a chance to clear HttpSession when user save/close authoring page.
+ *
+ * @author Andrey Balan
+ *
+ *
+ *
+ */
+@Controller
+public class ClearSessionController extends LamsAuthoringFinishController {
+
+    @Autowired
+    private WebApplicationContext applicationContext;
+
+    @RequestMapping("/clearsession")
+    public void execute(HttpServletRequest request, HttpServletResponse response) throws IOException {
+	super.execute(request, response, applicationContext);
+    }
+
+    @Override
+    public void clearSession(String customiseSessionID, HttpSession session, ToolAccessMode mode) {
+	if (mode.isAuthor()) {
+	    session.removeAttribute(customiseSessionID);
+	}
+    }
+
+}
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/LearningController.java
===================================================================
diff -u
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/LearningController.java	(revision 0)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/LearningController.java	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -0,0 +1,613 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.tool.kaltura.web.controller;
+
+import java.io.IOException;
+import java.sql.Timestamp;
+import java.util.Date;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.TreeSet;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
+import org.lamsfoundation.lams.notebook.model.NotebookEntry;
+import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.tool.exception.ToolException;
+import org.lamsfoundation.lams.tool.kaltura.dto.AverageRatingDTO;
+import org.lamsfoundation.lams.tool.kaltura.model.Kaltura;
+import org.lamsfoundation.lams.tool.kaltura.model.KalturaComment;
+import org.lamsfoundation.lams.tool.kaltura.model.KalturaItem;
+import org.lamsfoundation.lams.tool.kaltura.model.KalturaSession;
+import org.lamsfoundation.lams.tool.kaltura.model.KalturaUser;
+import org.lamsfoundation.lams.tool.kaltura.service.IKalturaService;
+import org.lamsfoundation.lams.tool.kaltura.util.KalturaCommentComparator;
+import org.lamsfoundation.lams.tool.kaltura.util.KalturaConstants;
+import org.lamsfoundation.lams.tool.kaltura.util.KalturaException;
+import org.lamsfoundation.lams.tool.kaltura.util.KalturaItemComparator;
+import org.lamsfoundation.lams.tool.kaltura.web.forms.ReflectionForm;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.DateUtil;
+import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.lamsfoundation.lams.web.util.SessionMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Controller;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.context.WebApplicationContext;
+
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+/**
+ * @author Andrey Balan
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+@Controller
+@RequestMapping("/learning")
+public class LearningController {
+
+    private static Logger log = Logger.getLogger(LearningController.class);
+
+    @Autowired
+    @Qualifier("kalturaService")
+    private IKalturaService kalturaService;
+
+    @Autowired
+    private WebApplicationContext applicationContext;
+
+    @Autowired
+    @Qualifier("kalturaMessageService")
+    private MessageService messageService;
+
+    @RequestMapping("")
+    public String unspecified(HttpServletRequest request) throws Exception {
+
+	// initialize Session Map
+	SessionMap<String, Object> sessionMap = new SessionMap<>();
+	String sessionMapId = sessionMap.getSessionID();
+	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+	request.setAttribute(KalturaConstants.ATTR_SESSION_MAP_ID, sessionMapId);
+
+	// 'toolSessionID' and 'mode' paramters are expected to be present.
+	ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, false);
+	sessionMap.put(AttributeNames.PARAM_MODE, mode);
+	Long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
+	sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionId);
+
+	// Retrieve the session and content.
+	KalturaSession kalturaSession = kalturaService.getSessionBySessionId(toolSessionId);
+	if (kalturaSession == null) {
+	    throw new KalturaException("Cannot retrieve session with toolSessionID" + toolSessionId);
+	}
+	Kaltura kaltura = kalturaSession.getKaltura();
+	//init getCreatedBy to avoid session close error in proxy object
+	if (kaltura.getCreatedBy() != null) {
+	    kaltura.getCreatedBy().getLoginName();
+	}
+
+	//if this parameter true - this request is sent when Monitoring Group
+	boolean isGroupMonitoring = WebUtil.readBooleanParam(request, KalturaConstants.ATTR_IS_GROUP_MONITORING, false);
+	sessionMap.put(KalturaConstants.ATTR_IS_GROUP_MONITORING, isGroupMonitoring);
+
+	KalturaUser user;
+	if (mode.equals(ToolAccessMode.TEACHER) && !isGroupMonitoring) {
+	    Long userID = WebUtil.readLongParam(request, AttributeNames.PARAM_USER_ID, false);
+	    user = kalturaService.getUserByUserIdAndSessionId(userID, toolSessionId);
+	} else {
+	    //in case of lerning and group monitoring create new user
+	    user = getCurrentUser(toolSessionId);
+	}
+
+	// check defineLater
+	if (kaltura.isDefineLater()) {
+	    return "pages/learning/defineLater";
+	}
+
+	// Set the content in use flag.
+	if (!kaltura.isContentInUse()) {
+	    kaltura.setContentInUse(new Boolean(true));
+	    kalturaService.saveOrUpdateKaltura(kaltura);
+	}
+
+	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(
+		toolSessionId, request, applicationContext.getServletContext());
+	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
+
+	// reflection information
+	String entryText = new String();
+	NotebookEntry notebookEntry = kalturaService.getEntry(toolSessionId, user.getUserId().intValue());
+	if (notebookEntry != null) {
+	    entryText = notebookEntry.getEntry();
+	}
+	sessionMap.put(KalturaConstants.ATTR_REFLECTION_ON, kaltura.isReflectOnActivity());
+	sessionMap.put(KalturaConstants.ATTR_REFLECTION_INSTRUCTION, kaltura.getReflectInstructions());
+	sessionMap.put(KalturaConstants.ATTR_REFLECTION_ENTRY, entryText);
+
+	// check whehter finish lock is on/off
+	boolean lockOnFinish = kaltura.isLockOnFinished() && user != null && user.isFinishedActivity();
+	sessionMap.put(KalturaConstants.ATTR_FINISHED_LOCK, lockOnFinish);
+	sessionMap.put(KalturaConstants.ATTR_LOCK_ON_FINISH, kaltura.isLockOnFinished());
+	sessionMap.put(KalturaConstants.ATTR_USER_FINISHED, user != null && user.isFinishedActivity());
+
+	// date and time restriction
+	Date submissionDeadline = kaltura.getSubmissionDeadline();
+	if (submissionDeadline != null) {
+	    // store submission deadline to sessionMap
+	    sessionMap.put(KalturaConstants.ATTR_SUBMISSION_DEADLINE, submissionDeadline);
+
+	    HttpSession ss = SessionManager.getSession();
+	    UserDTO learnerDto = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    TimeZone learnerTimeZone = learnerDto.getTimeZone();
+	    Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, submissionDeadline);
+	    Date currentLearnerDate = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, new Date());
+
+	    // calculate whether deadline has passed, and if so forward to "submissionDeadline"
+	    if (currentLearnerDate.after(tzSubmissionDeadline)) {
+		return "pages/learning/submissionDeadline";
+	    }
+	}
+
+	sessionMap.put(KalturaConstants.ATTR_KALTURA, kaltura);
+	sessionMap.put(AttributeNames.USER, user);
+
+	TreeSet<KalturaItem> items = getItems(mode, kaltura, toolSessionId, user.getUserId());
+	//skip the next parameter if the tool doesn't contain videos
+	if (items.isEmpty()) {
+	    KalturaItem item = new KalturaItem();
+	    item.setUid(new Long(-1));
+	    sessionMap.put(KalturaConstants.ATTR_ITEM, item);
+	    sessionMap.put(KalturaConstants.ATTR_IS_ALLOW_UPLOADS, isAllowUpload(sessionMap, items));
+	    return "pages/learning/learning";
+	}
+
+	String redirectURL = "redirect:learning/viewItem.do?";
+	redirectURL = WebUtil.appendParameterToURL(redirectURL, KalturaConstants.ATTR_SESSION_MAP_ID, sessionMapId);
+	redirectURL = WebUtil.appendParameterToURL(redirectURL, KalturaConstants.PARAM_ITEM_UID,
+		items.first().getUid().toString());
+	return redirectURL;
+    }
+
+    @RequestMapping("/viewItem")
+    public String viewItem(HttpServletRequest request) {
+
+	// get back SessionMap
+	String sessionMapID = request.getParameter(KalturaConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	request.setAttribute(KalturaConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+	KalturaUser user = (KalturaUser) sessionMap.get(AttributeNames.USER);
+	Long userId = user.getUserId();
+	Long toolSessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+	Kaltura kaltura = (Kaltura) sessionMap.get(KalturaConstants.ATTR_KALTURA);
+	ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
+
+	//get back item
+	Long itemUid = WebUtil.readLongParam(request, KalturaConstants.PARAM_ITEM_UID);
+	KalturaItem item = kalturaService.getKalturaItem(itemUid);
+	if (mode.isLearner()) {
+	    kalturaService.logItemWatched(item.getUid(), userId, toolSessionId);
+	}
+
+	//items from DB
+	TreeSet<KalturaItem> items = getItems(mode, kaltura, toolSessionId, userId);
+
+	//filter comments and store current item comments to sessionMap
+	if (kaltura.isAllowComments()) {
+
+	    //filter out comments from the other groups. We need this to display number of comments
+	    for (KalturaItem dbItem : items) {
+		Set<KalturaComment> groupComments = getGroupComments(dbItem, toolSessionId, mode);
+		//set to groupComments to avoid session flushing changes to DB
+		dbItem.setGroupComments(groupComments);
+	    }
+	}
+
+	if (kaltura.isAllowRatings()) {
+	    boolean isUserItemAuthor = (item.getCreatedBy() == null) && (kaltura.getCreatedBy() != null)
+		    && kaltura.getCreatedBy().getUserId().equals(userId)
+		    || (item.getCreatedBy() != null) && item.getCreatedBy().equals(user);
+	    sessionMap.put(KalturaConstants.ATTR_IS_USER_ITEM_AUTHOR, isUserItemAuthor);
+
+	    for (KalturaItem dbItem : items) {
+		AverageRatingDTO averageRatingDto = kalturaService.getAverageRatingDto(dbItem.getUid(), toolSessionId);
+		dbItem.setAverageRatingDto(averageRatingDto);
+	    }
+	}
+
+	sessionMap.put(KalturaConstants.ATTR_IS_ALLOW_UPLOADS, isAllowUpload(sessionMap, items));
+
+	//refresh items
+	items.remove(item);
+	sessionMap.put(KalturaConstants.ATTR_ITEM, item);
+	sessionMap.put(KalturaConstants.ATTR_ITEMS, items);
+
+	return "pages/learning/learning";
+    }
+
+    /**
+     * Stores uploaded entryId(s).
+     */
+    @RequestMapping(path = "/saveNewItem", method = RequestMethod.POST)
+    @ResponseBody
+    public String saveNewItem(HttpServletRequest request, HttpServletResponse response) throws IOException {
+
+	String sessionMapID = WebUtil.readStrParam(request, KalturaConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+	KalturaUser user = (KalturaUser) sessionMap.get(AttributeNames.USER);
+	Long toolSessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+
+	KalturaSession kalturaSession = kalturaService.getSessionBySessionId(toolSessionId);
+	Kaltura kaltura = kalturaSession.getKaltura();
+	TreeSet<KalturaItem> allItems = new TreeSet<>(new KalturaItemComparator());
+	allItems.addAll(kaltura.getKalturaItems());
+
+	// check user can upload item
+	boolean isAllowUpload = isAllowUpload(sessionMap, allItems);
+	if (!isAllowUpload) {
+	    return null;
+	}
+
+	KalturaItem item = new KalturaItem();
+	item.setCreateDate(new Timestamp(new Date().getTime()));
+	int maxSeq = 1;
+	if (allItems != null && allItems.size() > 0) {
+	    KalturaItem last = allItems.last();
+	    maxSeq = last.getSequenceId() + 1;
+	}
+	item.setSequenceId(maxSeq);
+
+	String title = WebUtil.readStrParam(request, KalturaConstants.PARAM_ITEM_TITLE, true);
+	if (StringUtils.isBlank(title)) {
+	    String itemLocalized = kalturaService.getLocalisedMessage("label.authoring.item", null);
+	    title = itemLocalized + " " + maxSeq;
+	}
+	item.setTitle(title);
+
+	int duration = WebUtil.readIntParam(request, KalturaConstants.PARAM_ITEM_DURATION);
+	item.setDuration(duration);
+
+	String entryId = WebUtil.readStrParam(request, KalturaConstants.PARAM_ITEM_ENTRY_ID);
+	if (StringUtils.isBlank(entryId)) {
+	    String errorMsg = "Add item failed due to missing entityId (received from Kaltura server).";
+	    log.error(errorMsg);
+	    throw new KalturaException(errorMsg);
+	}
+	item.setEntryId(entryId);
+
+	item.setCreatedBy(user);
+	item.setCreateByAuthor(false);
+	item.setHidden(false);
+	item.setKalturaUid(kaltura.getUid());
+	kalturaService.saveKalturaItem(item);
+
+	ObjectNode ObjectNode = JsonNodeFactory.instance.objectNode();
+	ObjectNode.put(KalturaConstants.PARAM_ITEM_UID, item.getUid());
+	response.setContentType("application/json;charset=utf-8");
+	return ObjectNode.toString();
+    }
+
+    /**
+     * Comment current item.
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/commentItem")
+    public String commentItem(HttpServletRequest request) {
+	String sessionMapID = WebUtil.readStrParam(request, KalturaConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+	request.setAttribute(KalturaConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+	Long toolSessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+	ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
+	String commentMessage = WebUtil.readStrParam(request, KalturaConstants.ATTR_COMMENT, true);
+
+	if (StringUtils.isBlank(commentMessage)) {
+	    MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
+	    errorMap.add("GLOBAL", messageService.getMessage(KalturaConstants.ERROR_MSG_COMMENT_BLANK));
+	    request.setAttribute("errorMap", errorMap);
+	    return "pages/learning/commentlist";
+	}
+
+	KalturaComment comment = new KalturaComment();
+	comment.setComment(commentMessage);
+	UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
+	KalturaUser kalturaUser = kalturaService.getUserByUserIdAndSessionId(new Long(user.getUserID().intValue()),
+		toolSessionId);
+	comment.setCreateBy(kalturaUser);
+	comment.setCreateDate(new Timestamp(new Date().getTime()));
+
+	// persist Kaltura changes in DB
+	Long currentItemUid = new Long(request.getParameter(KalturaConstants.PARAM_ITEM_UID));
+	KalturaItem item = kalturaService.getKalturaItem(currentItemUid);
+	Set<KalturaComment> dbComments = item.getComments();
+	dbComments.add(comment);
+	kalturaService.saveKalturaItem(item);
+
+	//refresh comments in the sessisonMap
+	KalturaItem sessionMapItem = (KalturaItem) sessionMap.get(KalturaConstants.ATTR_ITEM);
+	Set<KalturaComment> groupComments = getGroupComments(item, toolSessionId, mode);
+	sessionMapItem.setGroupComments(groupComments);
+
+	return "pages/learning/commentlist";
+    }
+
+    /**
+     * Rates items submitted by other learners.
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws JSONException
+     * @throws IOException
+     * @throws ServletException
+     * @throws ToolException
+     */
+    @RequestMapping("/rateItem")
+    @ResponseBody
+    public String rateItem(HttpServletRequest request, HttpServletResponse response) throws IOException {
+
+	String sessionMapID = WebUtil.readStrParam(request, KalturaConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+	Long toolSessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+	KalturaUser user = (KalturaUser) sessionMap.get(AttributeNames.USER);
+
+	float rating = Float.parseFloat(request.getParameter("rate"));
+	Long itemUid = WebUtil.readLongParam(request, "idBox");
+
+	AverageRatingDTO averageRatingDto = kalturaService.rateMessage(itemUid, user.getUserId(), toolSessionId,
+		rating);
+
+	//refresh averageRatingDto in sessionMap
+	KalturaItem item = (KalturaItem) sessionMap.get(KalturaConstants.ATTR_ITEM);
+	item.setAverageRatingDto(averageRatingDto);
+
+	ObjectNode ObjectNode = JsonNodeFactory.instance.objectNode();
+	ObjectNode.put("averageRating", averageRatingDto.getRating());
+	ObjectNode.put("numberOfVotes", averageRatingDto.getNumberOfVotes());
+	response.setContentType("application/json;charset=utf-8");
+	return ObjectNode.toString();
+    }
+
+    /**
+     * Display empty reflection form.
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/newReflection")
+    public String newReflection(@ModelAttribute("messageForm") ReflectionForm messageForm, HttpServletRequest request) {
+
+	// get session value
+	String sessionMapID = WebUtil.readStrParam(request, KalturaConstants.ATTR_SESSION_MAP_ID);
+
+	HttpSession ss = SessionManager.getSession();
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+
+	messageForm.setUserID(user.getUserID());
+	messageForm.setSessionMapID(sessionMapID);
+
+	SessionMap<String, Object> map = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
+	Long toolSessionID = (Long) map.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+	NotebookEntry entry = kalturaService.getEntry(toolSessionID, user.getUserID());
+
+	if (entry != null) {
+	    messageForm.setEntryText(entry.getEntry());
+	}
+
+	return "pages/learning/notebook";
+    }
+
+    /**
+     * Submit reflection form input database.
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(path = "/submitReflection", method = RequestMethod.POST)
+    public String submitReflection(@ModelAttribute("messageForm") ReflectionForm messageForm,
+	    HttpServletRequest request) {
+
+	Integer userId = messageForm.getUserID();
+
+	String sessionMapID = WebUtil.readStrParam(request, KalturaConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+	Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+
+	// check for existing notebook entry
+	NotebookEntry entry = kalturaService.getEntry(sessionId, userId);
+
+	if (entry == null) {
+	    // create new entry
+	    kalturaService.createNotebookEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
+		    KalturaConstants.TOOL_SIGNATURE, userId, messageForm.getEntryText());
+	} else {
+	    // update existing entry
+	    entry.setEntry(messageForm.getEntryText());
+	    entry.setLastModified(new Date());
+	    kalturaService.updateEntry(entry);
+	}
+
+	return finishActivity(messageForm, request);
+    }
+
+    @RequestMapping("/finishActivity")
+    public String finishActivity(@ModelAttribute("messageForm") ReflectionForm messageForm,
+	    HttpServletRequest request) {
+
+	// get back SessionMap
+	String sessionMapID = request.getParameter(KalturaConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+
+	Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+
+	// get sessionId from HttpServletRequest
+	String nextActivityUrl = null;
+	try {
+	    HttpSession ss = SessionManager.getSession();
+	    UserDTO userDTO = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    Long userID = new Long(userDTO.getUserID().longValue());
+
+	    nextActivityUrl = kalturaService.finishToolSession(sessionId, userID);
+	    request.setAttribute(KalturaConstants.ATTR_NEXT_ACTIVITY_URL, nextActivityUrl);
+	} catch (KalturaException e) {
+	    LearningController.log.error("Failed get next activity url:" + e.getMessage());
+	}
+
+	return "pages/learning/finish";
+    }
+
+    // *************************************************************************************
+    // Private methods
+    // *************************************************************************************
+
+    /**
+     * Gets items from the DB. IF the mode is learner filters them based on the group sessionId
+     */
+    private TreeSet<KalturaItem> getItems(ToolAccessMode mode, Kaltura kaltura, Long toolSessionId, Long userId) {
+
+	// Create set of images, along with this filtering out items added by users from other groups
+	TreeSet<KalturaItem> items = new TreeSet<>(new KalturaItemComparator());
+	items.addAll(kalturaService.getGroupItems(kaltura.getToolContentId(), toolSessionId, userId, mode.isTeacher()));
+
+	for (KalturaItem item : items) {
+	    // initialize login name to avoid session close error in proxy object
+	    if (item.getCreatedBy() != null) {
+		item.getCreatedBy().getLoginName();
+	    }
+	}
+
+	return items;
+    }
+
+    /**
+     * Checks whether further upload is allowed.
+     */
+    private boolean isAllowUpload(SessionMap<String, Object> sessionMap, Set<KalturaItem> items) {
+	Kaltura kaltura = (Kaltura) sessionMap.get(KalturaConstants.ATTR_KALTURA);
+	ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
+	KalturaUser user = (KalturaUser) sessionMap.get(AttributeNames.USER);
+
+	boolean isAllowUpload = false;
+	if (kaltura.isAllowContributeVideos() && !mode.equals(ToolAccessMode.TEACHER)) {
+	    int numberOfUploadedItems = 0;
+	    for (KalturaItem item : items) {
+		if (item.getCreatedBy() != null && item.getCreatedBy().equals(user)) {
+		    numberOfUploadedItems++;
+		}
+	    }
+	    int learnerContributionLimit = kaltura.getLearnerContributionLimit();
+	    isAllowUpload = (learnerContributionLimit == Kaltura.TYPE_LEARNER_CONTRIBUTION_LIMIT_UNLIMITED)
+		    || (numberOfUploadedItems < kaltura.getLearnerContributionLimit());
+	}
+
+	return isAllowUpload;
+    }
+
+    /**
+     * Returns all comments done by teacher and learners of the specified group.
+     */
+    private Set<KalturaComment> getGroupComments(KalturaItem item, Long sessionId, ToolAccessMode mode) {
+	TreeSet<KalturaComment> comments = new TreeSet<>(new KalturaCommentComparator());
+	Set<KalturaComment> itemComments = item.getComments();
+
+	//only authored items can be seen by different groups
+	if (item.isCreateByAuthor()) {
+	    for (KalturaComment comment : itemComments) {
+
+		//skip hidden comments
+		if (comment.isHidden() && mode.isLearner()) {
+		    continue;
+
+		    // if made by teacher - add
+		} else if (comment.getCreateBy() == null) {
+		    comments.add(comment);
+
+		    // if made by learner of the specified group - also add
+		} else if (comment.getCreateBy().getSession().getSessionId().equals(sessionId)) {
+		    comments.add(comment);
+		}
+	    }
+
+	} else {
+	    comments.addAll(itemComments);
+	}
+
+	return comments;
+    }
+
+    private KalturaUser getCurrentUser(Long toolSessionId) {
+	UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
+
+	// attempt to retrieve user using userId and toolSessionId
+	KalturaUser kalturaUser = kalturaService.getUserByUserIdAndSessionId(new Long(user.getUserID().intValue()),
+		toolSessionId);
+
+	if (kalturaUser == null) {
+	    KalturaSession kalturaSession = kalturaService.getSessionBySessionId(toolSessionId);
+	    kalturaUser = kalturaService.createKalturaUser(user, kalturaSession);
+	}
+
+	return kalturaUser;
+    }
+}
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/MonitoringController.java
===================================================================
diff -u
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/MonitoringController.java	(revision 0)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/MonitoringController.java	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -0,0 +1,206 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.tool.kaltura.web.controller;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.TreeSet;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.tool.kaltura.dto.KalturaSessionDTO;
+import org.lamsfoundation.lams.tool.kaltura.dto.NotebookEntryDTO;
+import org.lamsfoundation.lams.tool.kaltura.model.Kaltura;
+import org.lamsfoundation.lams.tool.kaltura.model.KalturaSession;
+import org.lamsfoundation.lams.tool.kaltura.service.IKalturaService;
+import org.lamsfoundation.lams.tool.kaltura.util.KalturaConstants;
+import org.lamsfoundation.lams.tool.kaltura.util.KalturaSessionDTOComparator;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.DateUtil;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * @author Andrey Balan
+ */
+@Controller
+@RequestMapping("/monitoring")
+public class MonitoringController {
+
+    private static Logger log = Logger.getLogger(MonitoringController.class);
+
+    @Autowired
+    @Qualifier("kalturaService")
+    private IKalturaService kalturaService;
+
+    @RequestMapping("")
+    public String unspecified(HttpServletRequest request) {
+
+	request.setAttribute("initialTabId", WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB, true));
+	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+
+	Kaltura kaltura = kalturaService.getKalturaByContentId(toolContentID);
+	boolean isGroupedActivity = kalturaService.isGroupedActivity(toolContentID);
+	request.setAttribute(KalturaConstants.ATTR_KALTURA, kaltura);
+	request.setAttribute("contentFolderID", contentFolderID);
+	request.setAttribute("isGroupedActivity", isGroupedActivity);
+
+	Set<KalturaSessionDTO> sessionDTOs = new TreeSet<>(new KalturaSessionDTOComparator());
+	for (KalturaSession session : (Set<KalturaSession>) kaltura.getKalturaSessions()) {
+	    KalturaSessionDTO sessionDTO = new KalturaSessionDTO(session);
+	    sessionDTOs.add(sessionDTO);
+	}
+	request.setAttribute("sessionDTOs", sessionDTOs);
+
+	// Create reflectList if reflection is enabled.
+	if (kaltura.isReflectOnActivity()) {
+	    List<NotebookEntryDTO> reflectList = kalturaService.getReflectList(kaltura);
+	    request.setAttribute(KalturaConstants.ATTR_REFLECT_LIST, reflectList);
+	}
+
+	Date submissionDeadline = kaltura.getSubmissionDeadline();
+	if (submissionDeadline != null) {
+	    HttpSession ss = SessionManager.getSession();
+	    UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    TimeZone teacherTimeZone = teacher.getTimeZone();
+	    Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, submissionDeadline);
+	    request.setAttribute(KalturaConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime());
+	    // use the unconverted time, as convertToStringForJSON() does the timezone conversion if needed
+	    request.setAttribute(KalturaConstants.ATTR_SUBMISSION_DEADLINE_DATESTRING,
+		    DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale()));
+	}
+	String dispatch = request.getParameter("dispatch");
+	if("markItem".equals(dispatch)) {
+	    return markItem(request);
+	}
+
+
+
+	return "pages/monitoring/monitoring";
+    }
+
+    @RequestMapping("/showGroupLearning")
+    public String showGroupLearning(HttpServletRequest request) {
+
+	String toolSessionID = WebUtil.readStrParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
+	UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
+
+	String redirectURL = "redirect:/learning.do";
+	//to distinguish from opening learning page from monitor's Learners tab pass this parameter
+	redirectURL = WebUtil.appendParameterToURL(redirectURL, KalturaConstants.ATTR_IS_GROUP_MONITORING, "true");
+	redirectURL = WebUtil.appendParameterToURL(redirectURL, AttributeNames.PARAM_MODE, "teacher");
+	redirectURL = WebUtil.appendParameterToURL(redirectURL, AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionID);
+	redirectURL = WebUtil.appendParameterToURL(redirectURL, AttributeNames.PARAM_USER_ID,
+		user.getUserID().toString());
+	return redirectURL;
+    }
+
+    /**
+     * Update item's mark. If it's not long then store 0.
+     */
+    @RequestMapping("/markItem")
+    @ResponseBody
+    public String markItem(HttpServletRequest request) {
+
+	String markStr = WebUtil.readStrParam(request, "content");
+	try {
+	    Long mark = Long.parseLong(markStr);
+	    Long itemUid = WebUtil.readLongParam(request, KalturaConstants.PARAM_ITEM_UID);
+	    kalturaService.markItem(itemUid, mark);
+	} catch (NumberFormatException e) {
+	    log.debug(e.getMessage());
+	}
+	return null;
+    }
+
+    @RequestMapping("/setItemVisibility")
+    @ResponseBody
+    public void setItemVisibility(HttpServletRequest request) {
+
+	Long itemUid = WebUtil.readLongParam(request, KalturaConstants.PARAM_ITEM_UID);
+	boolean isHide = WebUtil.readBooleanParam(request, KalturaConstants.PARAM_IS_HIDING);
+	kalturaService.hideItem(itemUid, isHide);
+
+    }
+
+    @RequestMapping("/setCommentVisibility")
+    @ResponseBody
+    public void setCommentVisibility(HttpServletRequest request) {
+
+	Long commentUid = WebUtil.readLongParam(request, KalturaConstants.PARAM_COMMENT_UID);
+	boolean isHide = WebUtil.readBooleanParam(request, KalturaConstants.PARAM_IS_HIDING);
+	kalturaService.hideComment(commentUid, isHide);
+
+    }
+
+    /**
+     * Set Submission Deadline
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws IOException
+     */
+    @RequestMapping("/setSubmissionDeadline")
+    @ResponseBody
+    public void setSubmissionDeadline(HttpServletRequest request, HttpServletResponse response) throws IOException {
+
+	Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+
+	Kaltura kaltura = kalturaService.getKalturaByContentId(contentID);
+
+	Long dateParameter = WebUtil.readLongParam(request, KalturaConstants.ATTR_SUBMISSION_DEADLINE, true);
+	Date tzSubmissionDeadline = null;
+	String formattedDate = "";
+	if (dateParameter != null) {
+	    Date submissionDeadline = new Date(dateParameter);
+	    HttpSession ss = SessionManager.getSession();
+	    org.lamsfoundation.lams.usermanagement.dto.UserDTO teacher = (org.lamsfoundation.lams.usermanagement.dto.UserDTO) ss
+		    .getAttribute(AttributeNames.USER);
+	    TimeZone teacherTimeZone = teacher.getTimeZone();
+	    tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline);
+	    formattedDate = DateUtil.convertToStringForJSON(tzSubmissionDeadline, request.getLocale());
+	}
+	kaltura.setSubmissionDeadline(tzSubmissionDeadline);
+	kalturaService.saveOrUpdateKaltura(kaltura);
+
+	response.setContentType("text/plain;charset=utf-8");
+	response.getWriter().print(formattedDate);
+    }
+}
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/PedagogicalPlannerController.java
===================================================================
diff -u
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/PedagogicalPlannerController.java	(revision 0)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/PedagogicalPlannerController.java	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -0,0 +1,103 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.tool.kaltura.web.controller;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.tool.kaltura.model.Kaltura;
+import org.lamsfoundation.lams.tool.kaltura.service.IKalturaService;
+import org.lamsfoundation.lams.tool.kaltura.web.forms.KalturaPedagogicalPlannerForm;
+import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Controller;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+/**
+ * @author Andrey Balan
+ *
+ *
+ *
+ *
+ *
+ */
+@Controller
+@RequestMapping("/pedagogicalPlanner")
+public class PedagogicalPlannerController {
+
+    private static Logger logger = Logger.getLogger(PedagogicalPlannerController.class);
+
+    @Autowired
+    @Qualifier("kalturaService")
+    private IKalturaService kalturaService;
+    
+    @Autowired
+    @Qualifier("kalturaMessageService")
+    private MessageService messageService;
+
+    @RequestMapping("")
+    protected String unspecified(
+	    @ModelAttribute("pedagogicalPlannerForm") KalturaPedagogicalPlannerForm pedagogicalPlannerForm,
+	    HttpServletRequest request) {
+	return initPedagogicalPlannerForm(pedagogicalPlannerForm, request);
+    }
+
+    @RequestMapping("/initPedagogicalPlannerForm")
+    public String initPedagogicalPlannerForm(
+	    @ModelAttribute("pedagogicalPlannerForm") KalturaPedagogicalPlannerForm pedagogicalPlannerForm,
+	    HttpServletRequest request) {
+	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	Kaltura kaltura = kalturaService.getKalturaByContentId(toolContentID);
+	pedagogicalPlannerForm.fillForm(kaltura);
+	String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	pedagogicalPlannerForm.setContentFolderID(contentFolderId);
+	return "pages/authoring/pedagogicalPlannerForm";
+    }
+
+    @RequestMapping(path = "/saveOrUpdatePedagogicalPlannerForm", method = RequestMethod.POST)
+    public String saveOrUpdatePedagogicalPlannerForm(
+	    @ModelAttribute("pedagogicalPlannerForm") KalturaPedagogicalPlannerForm pedagogicalPlannerForm,
+	    HttpServletRequest request) throws IOException {
+	MultiValueMap<String, String> errorMap = pedagogicalPlannerForm.validate(messageService);
+	if (errorMap.isEmpty()) {
+	    String instructions = pedagogicalPlannerForm.getInstructions();
+	    Long toolContentID = pedagogicalPlannerForm.getToolContentID();
+	    Kaltura kaltura = kalturaService.getKalturaByContentId(toolContentID);
+	    kaltura.setInstructions(instructions);
+	    kalturaService.saveOrUpdateKaltura(kaltura);
+	} else {
+	    request.setAttribute("errorMap", errorMap);
+	}
+	return "pages/authoring/pedagogicalPlannerForm";
+    }
+
+}
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/AuthoringForm.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -21,23 +21,14 @@
  * ****************************************************************
  */
 
-
-
 package org.lamsfoundation.lams.tool.kaltura.web.forms;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
 import org.lamsfoundation.lams.web.util.SessionMap;
 
 /**
  *
  */
-public class AuthoringForm extends ActionForm {
+public class AuthoringForm {
 
     private static final long serialVersionUID = 3950453134542135495L;
 
@@ -61,8 +52,6 @@
 
     private String currentTab;
 
-    private String dispatch;
-
     private String sessionMapID;
 
     private Long deleteFileUuid;
@@ -73,14 +62,6 @@
 
     private SessionMap sessionMap;
 
-    @Override
-    public ActionErrors validate(ActionMapping arg0, HttpServletRequest arg1) {
-	ActionErrors ac = new ActionErrors();
-	ac.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("this is an error"));
-
-	return ac;
-    }
-
     public String getSessionMapID() {
 	return sessionMapID;
     }
@@ -97,14 +78,6 @@
 	this.currentTab = currentTab;
     }
 
-    public String getDispatch() {
-	return dispatch;
-    }
-
-    public void setDispatch(String dispatch) {
-	this.dispatch = dispatch;
-    }
-
     public String getInstructions() {
 	return instructions;
     }
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/KalturaPedagogicalPlannerForm.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/KalturaPedagogicalPlannerForm.java	(.../KalturaPedagogicalPlannerForm.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/KalturaPedagogicalPlannerForm.java	(.../KalturaPedagogicalPlannerForm.java)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -20,16 +20,15 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.kaltura.web.forms;
 
 import org.lamsfoundation.lams.tool.kaltura.model.Kaltura;
-import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm;
+import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivitySpringForm;
 
 /**
  *
  */
-public class KalturaPedagogicalPlannerForm extends PedagogicalPlannerActivityForm {
+public class KalturaPedagogicalPlannerForm extends PedagogicalPlannerActivitySpringForm {
     String instructions;
     String contentFolderID;
 
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/ReflectionForm.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/ReflectionForm.java	(.../ReflectionForm.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/ReflectionForm.java	(.../ReflectionForm.java)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -33,7 +33,7 @@
  *
  *
  */
-public class ReflectionForm extends ValidatorForm {
+public class ReflectionForm{
     private static final long serialVersionUID = -9054365604649146735L;
     private static Logger logger = Logger.getLogger(ReflectionForm.class.getName());
 
Index: lams_tool_kaltura/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u
--- lams_tool_kaltura/web/WEB-INF/spring-servlet.xml	(revision 0)
+++ lams_tool_kaltura/web/WEB-INF/spring-servlet.xml	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+           				   http://www.springframework.org/schema/context 
+   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
+	<!-- Spring MVC -->
+	<context:component-scan base-package="org.lamsfoundation.lams.tool.kaltura.web.controller" />
+	
+	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+		<property name="prefix" value="/" />
+		<property name="suffix" value=".jsp" />
+	</bean>
+</beans>
\ No newline at end of file
Index: lams_tool_kaltura/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -32,7 +32,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -123,11 +122,11 @@
     }  				
 </script>	
 <div id="saveCancelButtons" >
-		<html:link href="javascript:doSubmit_Form_Only();" styleId="saveButton" property="submit" styleClass="btn btn-primary pull-right">
+		<a href="javascript:doSubmit_Form_Only();" id="saveButton" name="submit" class="btn btn-primary pull-right">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
-		</html:link>
-		<html:link href="javascript:;" property="cancel" styleId="cancelButton" onclick="javascript:doCancel()" styleClass="btn btn-default roffset5 pull-right">
+		</a>
+		<a href="javascript:;" name="cancel" id="cancelButton" onclick="javascript:doCancel()" class="btn btn-default roffset5 pull-right">
 			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
-		</html:link>
+		</a>
 </div>
 <!-- end tab content -->
\ No newline at end of file
Index: lams_tool_kaltura/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_kaltura/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -284,42 +283,42 @@
 					<label for="minimum-rates">
 						<fmt:message key="${minimumLabel}" />
 					</label>
-					<html:select property="${formContentPrefix}minimumRates" styleId="minimum-rates" onmouseup="validateRatingLimits(true);" 
-							styleClass="form-control form-control-inline">
-						<html:option value="0">
+					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" onmouseup="validateRatingLimits(true);" 
+							cssClass="form-control form-control-inline">
+						<form:option value="0">
 							<fmt:message key="${noMinimumLabel}" />
-						</html:option>
-						<html:option value="1">1</html:option>
-						<html:option value="2">2</html:option>
-						<html:option value="3">3</html:option>
-						<html:option value="4">4</html:option>
-						<html:option value="5">5</html:option>
-						<html:option value="6">6</html:option>
-						<html:option value="7">7</html:option>
-						<html:option value="8">8</html:option>
-						<html:option value="9">9</html:option>
-						<html:option value="10">10</html:option>
-					</html:select>
+						</form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
+					</form:select>
 				
 					<label for="maximum-rates">
 						<fmt:message key="${maximumLabel}" />
 					</label>
-					<html:select property="${formContentPrefix}maximumRates" styleId="maximum-rates" onmouseup="validateRatingLimits(false);" 
-							styleClass="form-control form-control-inline">
-						<html:option value="0">
+					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" onmouseup="validateRatingLimits(false);" 
+							cssClass="form-control form-control-inline">
+						<form:option value="0">
 							<fmt:message key="${noMaximumLabel}" />
-						</html:option>
-						<html:option value="1">1</html:option>
-						<html:option value="2">2</html:option>
-						<html:option value="3">3</html:option>
-						<html:option value="4">4</html:option>
-						<html:option value="5">5</html:option>
-						<html:option value="6">6</html:option>
-						<html:option value="7">7</html:option>
-						<html:option value="8">8</html:option>
-						<html:option value="9">9</html:option>
-						<html:option value="10">10</html:option>
-					</html:select>
+						</form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
+					</form:select>
 				</div>
 			</c:if>
 	
Index: lams_tool_kaltura/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -1,5 +1,4 @@
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
@@ -42,23 +41,23 @@
 
 <div class="checkbox">
 	<label>
-	<html:checkbox property="${allowCommentsVariableName}" value="1"
-		styleId="${allowCommentsVariableName}">
-	</html:checkbox>
+	<form:checkbox path="${allowCommentsVariableName}" value="1"
+		id="${allowCommentsVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowCommentLabelKey}"/>
 	</label>
 </div>
 
 <div id="likedislike">
 <div class="loffset20">
-		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
-		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
+		<form:radiobutton path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<form:radiobutton path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
 <div class="checkbox">
 	<label>
-	<html:checkbox property="${allowAnonymousVariableName}" 
-		styleId="${allowAnonymousVariableName}">
-	</html:checkbox>
+	<form:checkbox path="${allowAnonymousVariableName}" 
+		id="${allowAnonymousVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_tool_kaltura/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -4,6 +4,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
@@ -88,8 +89,8 @@
 					</c:if>
 				</c:if>
 			</c:if>
-			<c:if test="${empty toolSessionId}">
-				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+			<c:if test="${empty toolSessionId and not empty formID}">
+				<c:set var="toolForm" value="${requestScope[formID]}" />
 				<c:if test="${not empty toolForm}"> 
 				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
 				</c:if>
Index: lams_tool_kaltura/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_kaltura/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_kaltura/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -34,7 +34,6 @@
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
 
 <c:set var="class" value=""/>
 <c:if test="${id == 1}">
Index: lams_tool_kaltura/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -30,7 +30,6 @@
 
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
 
 <div class="panel-body panel-monitor-body">
 	 <jsp:doBody />
Index: lams_tool_kaltura/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -32,12 +32,11 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
 <%-- Required attributes --%>
 <%@ attribute name="sessionMapID" required="true" rtexprvalue="true" %>
-<%@ attribute name="wrapInFormTag" required="true" rtexprvalue="true" %>
 
 <%-- Optional attributes --%>
 <%@ attribute name="action" required="false" rtexprvalue="true" %>
@@ -53,10 +52,10 @@
 
 <%-- Default value for message key --%>
 <c:if test="${empty action}">
-	<c:set var="action" value="authoring/textsearch.do" scope="request"/>
+	<c:set var="action" value="textsearch.do" scope="request"/>
 </c:if>
 <c:if test="${empty cancelAction}">
-	<c:set var="cancelAction" value="authoring/textsearchCancel.do" scope="request"/>
+	<c:set var="cancelAction" value="textsearchCancel.do" scope="request"/>
 </c:if>
 <c:if test="${empty formID}">
 	<c:set var="formID" value="textSearchForm" scope="request"/>
@@ -85,52 +84,40 @@
 
 <!-- begin text search form content -->
 	
-<c:if test="${wrapInFormTag}">
-	<form action="${action}" id="${formID}" name="${formID}">
-</c:if>
-		<html:hidden property="sessionMapID" />
-		<h4><fmt:message key="${headingLabelKey}" /></h4>
-		<table>
-			<tr>
-				<td>
-					<fmt:message key="${allWordsLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="allWords" />
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${phraseLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="phrase" />
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${anyWordsLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="anyWords" /> 
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${excludedWordsLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="excludedWords" /> 
-				</td>
-			</tr>
-		</table>
-<c:if test="${wrapInFormTag}">
-	<lams:ImgButtonWrapper>
-		<a href="#" onclick="${formID}.submit();" class="button-add-item"><fmt:message key="${saveButtonLabelKey}" />
-		</a>
-		<a href="#" onclick="location.href='${cancelAction}'" class="button space-left"><fmt:message key="${cancelButtonLabelKey}" />
-		</a>
-	</lams:ImgButtonWrapper>
-	</form>
-</c:if>
+	<form:hidden path="sessionMapID" />
+	<h4><fmt:message key="${headingLabelKey}" /></h4>
+	<table>
+		<tr>
+			<td>
+				<fmt:message key="${allWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="allWords" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${phraseLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="phrase" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${anyWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="anyWords" /> 
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${excludedWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="excludedWords" /> 
+			</td>
+		</tr>
+	</table>
 <!-- end text search form content -->
\ No newline at end of file
Index: lams_tool_kaltura/web/WEB-INF/web.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/WEB-INF/web.xml	(.../web.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/WEB-INF/web.xml	(.../web.xml)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -64,24 +64,10 @@
 	</listener>
 
 	<servlet>
-		<servlet-name>action</servlet-name>
-		<servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
-		<init-param>
-			<param-name>config</param-name>
-			<param-value>/WEB-INF/struts-config.xml</param-value>
-		</init-param>
-		<init-param>
-			<param-name>debug</param-name>
-			<param-value>999</param-value>
-		</init-param>
-		<init-param>
-			<param-name>detail</param-name>
-			<param-value>2</param-value>
-		</init-param>
-		<init-param>
-			<param-name>validate</param-name>
-			<param-value>true</param-value>
-		</init-param>
+		<servlet-name>spring</servlet-name>
+		<servlet-class>
+			org.springframework.web.servlet.DispatcherServlet
+		</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 
@@ -115,7 +101,7 @@
 
 
 	<servlet-mapping>
-		<servlet-name>action</servlet-name>
+		<servlet-name>spring</servlet-name>
 		<url-pattern>*.do</url-pattern>
 	</servlet-mapping>
 
Index: lams_tool_kaltura/web/common/messages.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/common/messages.jsp	(.../messages.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/common/messages.jsp	(.../messages.jsp)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -1,8 +1,9 @@
 <%-- Error Messages --%>
-<logic:messagesPresent>
-	<lams:Alert id="errorMessages" type="danger" close="false">
-		<html:messages id="error">
-			<c:out value="${error}" escapeXml="false"/><br/>
-		</html:messages>
-	</lams:Alert>
-</logic:messagesPresent>
+ <c:set var="errorKey" value="GLOBAL" /> 
+ <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
+     <lams:Alert id="error" type="danger" close="false"> 
+         <c:forEach var="error" items="${errorMap[errorKey]}"> 
+             <c:out value="${error}" /><br /> 
+         </c:forEach> 
+     </lams:Alert> 
+</c:if>
\ No newline at end of file
Index: lams_tool_kaltura/web/common/taglibs.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -1,12 +1,6 @@
 <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%>
-
-<%@ taglib uri="tags-bean" prefix="bean"%>
-<%@ taglib uri="tags-logic" prefix="logic"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
-<%@ taglib uri="tags-tiles" prefix="tiles"%>
-<%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-
- 
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
Fisheye: Tag ff911101cbe92d6813691c20c292fa04519820b4 refers to a dead (removed) revision in file `lams_tool_kaltura/web/layouts/defaultLayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag ff911101cbe92d6813691c20c292fa04519820b4 refers to a dead (removed) revision in file `lams_tool_kaltura/web/layouts/learningLayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag ff911101cbe92d6813691c20c292fa04519820b4 refers to a dead (removed) revision in file `lams_tool_kaltura/web/layouts/tabLayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_kaltura/web/pages/authoring/advanced.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -1,5 +1,4 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
 <script lang="javascript">
 	$(document).ready(function() {
@@ -15,7 +14,7 @@
 			}
 		});
 		
-		<c:if test="${!formBean.allowContributeVideos}">
+		<c:if test="${!authoringForm.allowContributeVideos}">
 			$("#allowSeeingOtherUsersRecordings").prop("disabled", true);
 			$("#learner-contribution-limit").prop("disabled", true);
 		</c:if>
@@ -32,48 +31,48 @@
 
 	<div class="checkbox">
 		<label for="allowContributeVideos">
-			<html:checkbox property="allowContributeVideos" styleId="allowContributeVideos"/>
+			<form:checkbox path="allowContributeVideos" id="allowContributeVideos"/>
 			<fmt:message key="advanced.allowContributeVideos" />
 		</label>
 	</div>
 	
 	<div class="checkbox loffset20">
 		<label for="allowSeeingOtherUsersRecordings">
-			<html:checkbox property="allowSeeingOtherUsersRecordings" styleId="allowSeeingOtherUsersRecordings"/>
+			<form:checkbox path="allowSeeingOtherUsersRecordings" id="allowSeeingOtherUsersRecordings"/>
 			<fmt:message key="advanced.allowSeeingOtherUsersRecordings" />
 		</label>
 	</div>
 	
 	<div class="form-inline form-group loffset20">
 		<label for="learner-contribution-limit">
 			<fmt:message key="advanced.learnerContributionLimit" />&nbsp;
-			<html:select property="learnerContributionLimit" styleId="learner-contribution-limit" styleClass="form-control input-sm">
-			<html:option value="-1"><fmt:message key="advanced.unlimited" /></html:option>
-			<html:option value="1">1</html:option>
-			<html:option value="2">2</html:option>
-			<html:option value="3">3</html:option>
-			<html:option value="4">4</html:option>
-			<html:option value="5">5</html:option>
-			<html:option value="6">6</html:option>
-			<html:option value="7">7</html:option>
-			<html:option value="8">8</html:option>
-			<html:option value="9">9</html:option>
-			<html:option value="10">10</html:option>
-		</html:select>
+			<form:select path="learnerContributionLimit" id="learner-contribution-limit" cssClass="form-control input-sm">
+			<form:option value="-1"><fmt:message key="advanced.unlimited" /></form:option>
+			<form:option value="1">1</form:option>
+			<form:option value="2">2</form:option>
+			<form:option value="3">3</form:option>
+			<form:option value="4">4</form:option>
+			<form:option value="5">5</form:option>
+			<form:option value="6">6</form:option>
+			<form:option value="7">7</form:option>
+			<form:option value="8">8</form:option>
+			<form:option value="9">9</form:option>
+			<form:option value="10">10</form:option>
+		</form:select>
 		
 		</label>
 	</div>
 	
 	<div class="checkbox">
 		<label for="allow-comments">
-			<html:checkbox property="allowComments" styleId="allow-comments"/>
+			<form:checkbox path="allowComments" id="allow-comments"/>
 			<fmt:message key="advanced.allowComments" />
 		</label>
 	</div>
 	
 	<div class="checkbox">
 		<label for="allow-ratings">
-			<html:checkbox property="allowRatings" styleId="allow-ratings"/>
+			<form:checkbox path="allowRatings" id="allow-ratings"/>
 			<fmt:message key="advanced.allowRatings" />
 		</label>
 	</div>
@@ -84,20 +83,20 @@
 
 <div class="checkbox">
 	<label for="lock-on-finished">
-		<html:checkbox property="lockOnFinished" styleId="lock-on-finished"/>
+		<form:checkbox path="lockOnFinished" id="lock-on-finished"/>
 		<fmt:message key="advanced.lockOnFinished" />
 	</label>
 </div>
 
 <div class="checkbox">
 	<label for="reflect-on-activity">
-		<html:checkbox property="reflectOnActivity" styleId="reflect-on-activity" />
+		<form:checkbox path="reflectOnActivity" id="reflect-on-activity" />
 		<fmt:message key="advanced.reflectOnActivity" />
 	</label>
 </div>
 
 <div class="form-group">
-	<html:textarea property="reflectInstructions" styleId="reflect-instructions" styleClass="form-control" rows="3"	/>
+	<form:textarea path="reflectInstructions" id="reflect-instructions" cssClass="form-control" rows="3"	/>
 </div>
 
 </lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_kaltura/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -1,41 +1,69 @@
+<!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.kaltura.util.KalturaConstants"%>
-
-<html:form action="/authoring" styleId="authoringForm" method="post" enctype="multipart/form-data">
-	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-	<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
+<lams:html>
+	<c:set var="lams">
+		<lams:LAMSURL />
+	</c:set>
+	<c:set var="tool">
+		<lams:WebAppURL />
+	</c:set>
 	
-	<html:hidden property="currentTab" styleId="currentTab" />
-	<html:hidden property="dispatch" value="updateContent" />
-	<html:hidden property="sessionMapID" />
-	
-	<c:set var="title"><fmt:message key="activity.title" /></c:set>
-	<lams:Tabs control="true" title="${title}" helpToolSignature="<%= KalturaConstants.TOOL_SIGNATURE %>" helpModule="authoring">
-		<lams:Tab id="1" key="button.basic" />
-		<lams:Tab id="2" key="button.advanced" />
-	</lams:Tabs>
-	
-	<lams:TabBodyArea>
-		<%@ include file="/common/messages.jsp"%>
-		 		
-		<!--  Set up tabs  -->
-		<lams:TabBodys>
-   			<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
- 			<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
-  		</lams:TabBodys>
+	<lams:head>
+		<title>
+			<fmt:message key="activity.title" />
+		</title>
+		<lams:headItems />
+		<c:set var="lams">
+			<lams:LAMSURL />
+		</c:set>
+		<c:set var="tool">
+			<lams:WebAppURL />
+		</c:set>
+		<link href="${lams}css/thickbox.css" rel="stylesheet" type="text/css" media="screen">
 		
-		<!-- Button Row -->
-		<div id="saveCancelButtons">
-			<lams:AuthoringButton formID="authoringForm"
-				clearSessionActionUrl="/clearsession.do" toolSignature="<%=KalturaConstants.TOOL_SIGNATURE%>"
-				cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
-				toolContentID="${sessionMap.toolContentID}"
-				accessMode="${sessionMap.mode}" defineLater="${sessionMap.mode=='teacher'}"
-				contentFolderID="${sessionMap.contentFolderID}" />
-		</div>
-	</lams:TabBodyArea>
+		<script type="text/javascript" src="${tool}includes/javascript/authoring.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/thickbox.js"></script>
+	</lams:head>
+	<body class="stripes" onload="init();">
 
-</html:form>
-
-<div id="footer"></div>
-
+		<lams:Page title='<fmt:message key="pageTitle.authoring" />' type="navbar">
+			<form:form action="/lams/tool/lakalt11/authoring/updateContent.do" modelAttribute="authoringForm" id="authoringForm" method="post" enctype="multipart/form-data">
+				<c:set var="sessionMap" value="${sessionScope[authoringForm.sessionMapID]}" />
+				
+				<form:hidden path="currentTab" id="currentTab" />
+				<form:hidden path="sessionMapID" />
+				
+				<c:set var="title"><fmt:message key="activity.title" /></c:set>
+				<lams:Tabs control="true" title="${title}" helpToolSignature="<%= KalturaConstants.TOOL_SIGNATURE %>" helpModule="authoring">
+					<lams:Tab id="1" key="button.basic" />
+					<lams:Tab id="2" key="button.advanced" />
+				</lams:Tabs>
+				
+				<lams:TabBodyArea>
+					<%@ include file="/common/messages.jsp"%>
+					 		
+					<!--  Set up tabs  -->
+					<lams:TabBodys>
+			   			<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
+			 			<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
+			  		</lams:TabBodys>
+					
+					<!-- Button Row -->
+					<div id="saveCancelButtons">
+						<lams:AuthoringButton formID="authoringForm"
+							clearSessionActionUrl="/clearsession.do" toolSignature="<%=KalturaConstants.TOOL_SIGNATURE%>"
+							cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
+							toolContentID="${sessionMap.toolContentID}"
+							accessMode="${sessionMap.mode}" defineLater="${sessionMap.mode=='teacher'}"
+							contentFolderID="${sessionMap.contentFolderID}" />
+					</div>
+				</lams:TabBodyArea>
+			
+			</form:form>
+			
+			<div id="footer"></div>
+		</lams:Page>
+		
+	</body>
+</lams:html>
Index: lams_tool_kaltura/web/pages/authoring/basic.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -9,9 +9,8 @@
 <c:set var="KCW_UI_CONF_ID"><%=Configuration.get(ConfigurationKeys.KALTURA_KCW_UI_CONF_ID)%></c:set>
 <c:set var="KDP_UI_CONF_ID"><%=Configuration.get(ConfigurationKeys.KALTURA_KDP_UI_CONF_ID)%></c:set>
 
-<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
-<c:set var="sessionMapID" value="${formBean.sessionMapID}" />
+<c:set var="sessionMap" value="${sessionScope[authoringForm.sessionMapID]}" />
+<c:set var="sessionMapID" value="${authoringForm.sessionMapID}" />
 
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/kaltura.min.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/swfobject.js"></script>
@@ -148,9 +147,8 @@
 
 		if (deletionConfirmed) {
 			$(itemListTargetDiv).load(
-				"<c:url value="/authoring.do"/>",
+				"<c:url value="/authoring/removeItem.do"/>",
 				{
-					dispatch: "removeItem",
 					itemIndex: idx, 
 					sessionMapID: "${sessionMapID}"
 				},
@@ -162,9 +160,8 @@
 	}
 	function addItem(entryId, title, duration){
 		$(itemListTargetDiv).load(
-			"<c:url value="/authoring.do"/>",
+			"<c:url value="/authoring/addItem.do"/>",
 			{
-				dispatch: "addItem",
 				sessionMapID: "${sessionMapID}",
 				itemEntryId: entryId,
 				itemTitle: title,
@@ -177,9 +174,8 @@
 	}
 	function upItem(idx){
 		$(itemListTargetDiv).load(
-			"<c:url value="/authoring.do"/>",
+			"<c:url value="/authoring/upItem.do"/>",
 			{
-				dispatch: "upItem",
 				itemIndex: idx, 
 				sessionMapID: "${sessionMapID}"
 			},
@@ -190,9 +186,8 @@
 	}
 	function downItem(idx){
 		$(itemListTargetDiv).load(
-			"<c:url value="/authoring.do"/>",
+			"<c:url value="/authoring/downItem.do"/>",
 			{
-				dispatch: "downItem",
 				itemIndex: idx, 
 				sessionMapID: "${sessionMapID}"
 			},
@@ -209,14 +204,14 @@
     <label for="title">
     	<fmt:message key="label.authoring.basic.title"/>
     </label>
-    <html:text property="title" styleClass="form-control"/>
+    <form:input path="title" cssClass="form-control"/>
 </div>
 
 <div class="form-group">
     <label for="instructions">
     	<fmt:message key="label.authoring.basic.instructions"/>
     </label>
-	<lams:CKEditor id="instructions" value="${formBean.instructions}"
+	<lams:CKEditor id="instructions" value="${authoringForm.instructions}"
 			contentFolderID="${sessionMap.contentFolderID}"/>
 </div>
 
Index: lams_tool_kaltura/web/pages/authoring/itemlist.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/pages/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/pages/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -22,7 +22,7 @@
 				
 					<td width="100px">
 						<c:set var="previewUrl" >
-							<c:url value='/authoring.do'/>?dispatch=preview&sessionMapID=${sessionMapID}&itemIndex=${status.index}&KeepThis=true&TB_iframe=true
+							<c:url value='/authoring/preview.do'/>?sessionMapID=${sessionMapID}&itemIndex=${status.index}&KeepThis=true&TB_iframe=true
 						</c:set>
 					
 						<a href="${previewUrl}" class="thickbox" title="<fmt:message key="label.item.preview" />">
Index: lams_tool_kaltura/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -21,20 +21,19 @@
 		<fmt:message key="label.authoring.basic.instructions" />
 	</h4>
 	
-	<html:form action="/pedagogicalPlanner.do?dispatch=saveOrUpdatePedagogicalPlannerForm" styleId="pedagogicalPlannerForm" method="post">
-		<html:hidden property="toolContentID" styleId="toolContentID" />
-		<html:hidden property="valid" styleId="valid" />
-		<html:hidden property="callID" styleId="callID" />
-		<html:hidden property="activityOrderNumber" styleId="activityOrderNumber" />
+	<form:form action="saveOrUpdatePedagogicalPlannerForm.do" modelAttribute="pedagogicalPlannerForm" id="pedagogicalPlannerForm" method="post">
+		<form:hidden path="toolContentID" id="toolContentID" />
+		<form:hidden path="valid" id="valid" />
+		<form:hidden path="callID" id="callID" />
+		<form:hidden path="activityOrderNumber" id="activityOrderNumber" />
 		<br />
 		
-		<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 		<lams:CKEditor id="instructions"
-			value="${formBean.instructions}"
-			contentFolderID="${formBean.contentFolderID}"
+			value="${pedagogicalPlannerForm.instructions}"
+			contentFolderID="${pedagogicalPlannerForm.contentFolderID}"
 			toolbarSet="CustomPedplanner" height="190px"
 			width="${param.plannerCKEditorLongWidth}" displayExpanded="false">
 		</lams:CKEditor>
-	</html:form>
+	</form:form>
 </body>
 </lams:html>
Index: lams_tool_kaltura/web/pages/learning/commentlist.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/pages/learning/commentlist.jsp	(.../commentlist.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/pages/learning/commentlist.jsp	(.../commentlist.jsp)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -70,9 +70,9 @@
 		<lams:STRUTS-textarea property="comment" rows="3" value="" styleClass="form-control"/>		
 		
 		<div class="pull-right">
-			<html:button property="commentButton" onclick="javascript:addNewComment(document.getElementById('comment__lamshidden').value);" styleClass="btn btn-default" style="vertical-align:bottom;">
+			<button name="commentButton" type="button" onclick="javascript:addNewComment(document.getElementById('comment__lamshidden').value);" class="btn btn-default" style="vertical-align:bottom;">
 				<fmt:message key="label.learning.post.comment" />
-			</html:button>
+			</button>
 		</div>
 	</div>
 </c:if>
Index: lams_tool_kaltura/web/pages/learning/defineLater.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -1,11 +1,35 @@
+<!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set scope="request" var="title">
-	<fmt:message key="activity.title" />
-</c:set>
-<lams:Page type="learner" title="${title}">
-	<lams:DefineLater defineLaterMessageKey="message.defineLaterSet" />
-</lams:Page>
+<lams:html>
+	<c:set var="lams">
+		<lams:LAMSURL />
+	</c:set>
+	<c:set var="tool">
+		<lams:WebAppURL />
+	</c:set>
+	
+	<lams:head>  
+		<title>
+			<fmt:message key="activity.title" />
+		</title>
+		<lams:css/>
+		
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+	</lams:head>
+	<body class="stripes">
+		<c:set scope="request" var="title">
+			<fmt:message key="activity.title" />
+		</c:set>
+		<lams:Page type="learner" title="${title}">
+			<lams:DefineLater defineLaterMessageKey="message.defineLaterSet" />
+		</lams:Page>		
+	</body>
+</lams:html>
 
 
 
+
+
Index: lams_tool_kaltura/web/pages/learning/finish.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/pages/learning/finish.jsp	(.../finish.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/pages/learning/finish.jsp	(.../finish.jsp)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -1,3 +1,28 @@
-<script type="text/javascript">
-	document.location.href = "${nextActivityUrl}";
-</script>
+<!DOCTYPE html>
+<%@ include file="/common/taglibs.jsp"%>
+
+<lams:html>
+	<c:set var="lams">
+		<lams:LAMSURL />
+	</c:set>
+	<c:set var="tool">
+		<lams:WebAppURL />
+	</c:set>
+	
+	<lams:head>  
+		<title>
+			<fmt:message key="activity.title" />
+		</title>
+		<lams:css/>
+		
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+	</lams:head>
+	<body class="stripes">
+		<script type="text/javascript">
+			document.location.href = "${nextActivityUrl}";
+		</script>		
+	</body>
+</lams:html>
+
Index: lams_tool_kaltura/web/pages/learning/learning.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -1,433 +1,455 @@
+<!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
-
 <%@ page import="org.lamsfoundation.lams.util.Configuration" %>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
-<c:set var="KALTURA_SERVER"><%=Configuration.get(ConfigurationKeys.KALTURA_SERVER)%></c:set>
-<c:set var="PARTNER_ID"><%=Configuration.get(ConfigurationKeys.KALTURA_PARTNER_ID)%></c:set>
-<c:set var="SUB_PARTNER_ID"><%=Configuration.get(ConfigurationKeys.KALTURA_SUB_PARTNER_ID)%></c:set>
-<c:set var="USER_SECRET"><%=Configuration.get(ConfigurationKeys.KALTURA_USER_SECRET)%></c:set>
-<c:set var="KCW_UI_CONF_ID"><%=Configuration.get(ConfigurationKeys.KALTURA_KCW_UI_CONF_ID)%></c:set>
-<c:set var="KDP_UI_CONF_ID"><%=Configuration.get(ConfigurationKeys.KALTURA_KDP_UI_CONF_ID)%></c:set>
 
-<c:if test="${not empty param.sessionMapID}">
-	<c:set var="sessionMapID" value="${param.sessionMapID}" />
-</c:if>
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-<c:set var="mode" value="${sessionMap.mode}" />
-<c:set var="toolSessionID" value="${sessionMap.toolSessionID}" />
-<c:set var="kaltura" value="${sessionMap.kaltura}" />
-<c:set var="item" value="${sessionMap.item}" />
-<c:set var="finishedLock" value="${sessionMap.finishedLock}" />
-
-<link href="<lams:LAMSURL/>css/jquery.jRating.css" rel="stylesheet" type="text/css" media="screen"/>
-<link href="<lams:LAMSURL/>css/thickbox.css" rel="stylesheet" type="text/css" media="screen">
-
-<style media="screen,projection" type="text/css">
+<lams:html>
+	<c:set var="lams">
+		<lams:LAMSURL />
+	</c:set>
+	<c:set var="tool">
+		<lams:WebAppURL />
+	</c:set>
 	
-	#container{width: 100%; position: relative; display: inline-block; margin-top: 25px;}
-	#player-block {  clear: both; position: absolute; top: 0; bottom: 0; left: 0; right: 0;}
-	#dummy {padding-top: 82%; /* aspect ratio */}
-	#player-wrap {width: 60%; height: 100%; clear: both; margin-bottom: 20px; background: black;}
-	#player-bottombar {height:50px; margin-top: 15px; margin-bottom: 10px;}
-	
-	#comment-textarea textarea {
-		margin-bottom: 4px;
-	}
-	.rating-stars-div {min-height: 50px; padding-right: 0;}
-	.rating-stars-caption { text-align: left; padding-left: 30px; }
-	.rating-stars-disabled-small {padding: 2px 5px;}
-	#add-new-item {float: left; margin-top: 2px; margin-bottom: 20px;}
-	.comment-by {font-size: .9166em; color: #8E8E8E; margin-top: 3px;}
-	.comment-by-text {color: #8E8E8E;}
-	.item-hidden {background: #FFB3B3!important;}
-
-	#player-sidebar { height: 100%; margin-top: 25px;}
-	#player-sidebar ul {overflow: auto; clear: both; position: relative; list-style: none outside none; margin-left: 15px; margin-right: 0; min-width: 242px; height: 100%;}
-	#player-sidebar ul li:hover {background-color:#D0D0D0;cursor:pointer}
-	#player-sidebar ul li:hover .jRatingColor, #player-sidebar ul li:hover .jStar, .item-hidden .jRatingColor, .item-hidden .jStar {opacity: 0.3;}
-	#player-sidebar ul li { overflow: hidden; padding: 5px 0 5px 5px; clear: both; margin-bottom: 10px; list-style: none outside none;}
-	#player-sidebar ul li a .review-item-link { background: transparent; border-bottom: none; -moz-border-radius: 2px; -webkit-border-radius: 2px; border-radius: 2px; -webkit-transition: background .15s ease-in-out; position: relative; overflow: hidden; color: #333; zoom: 1;}
-	.thumb-wrap {float: left; margin: 0 8px 0 0; position: relative; display: inline-block;	background: transparent; }
-	.duration {padding: 0 4px; font-weight: bold; font-size: 11px; moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; background-color: black; color: white!important; height: 14px; line-height: 14px; opacity: 0.75; display: inline-block; vertical-align: top; zoom: 1; right: 2px; bottom: 2px; position: absolute;}
-	.thumb-title {width: auto; font-size: 12px; font-weight: bold; line-height: 15px; max-height: 30px; color: #333; display: block; margin-bottom: 4px; overflow: hidden; cursor: pointer;}
-	.thumb-stat {display: block; font-size: .9166em; color: #666; line-height: 1.4em; max-height: 1.4em; height: 1.4em; white-space: nowrap; overflow: hidden;}
-	.thumb-text {color: #666;}
-</style>	
-
-<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
-<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/instantedit.js"></script>
-<script type="text/javascript">
-	//var for jquery.jRating.js
-	var pathToImageFolder = "<lams:LAMSURL/>images/css/";
-	//var for instantedit.js
-	var urlBase = '<c:url value="/monitoring.do"/>';
-</script>
-<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/thickbox.js"></script>
-<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.jRating.js"></script>
-<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/swfobject.js"></script>
-<script type="text/javascript" src="http://cdnbakmi.kaltura.com/html5/html5lib/v1.6.10.4/mwEmbedLoader.php"></script>
-
-<script type="text/javascript">
-	//Kaltura settings
-	//kaltura server 
-	var KALTURA_SERVER = "${KALTURA_SERVER}";
-	//your actual parner id
-	var PARTNER_ID = "${PARTNER_ID}";
-	//your actual subparner id
-	var SUB_PARTNER_ID = "${SUB_PARTNER_ID}";
-	//your actual user secret
-	var USER_SECRET = "${USER_SECRET}";
-	//ui_conf_id of Kaltura Contribution Wizard(KCW)
-	var KCW_UI_CONF_ID = "${KCW_UI_CONF_ID}";
-	//ui_conf_id of Kaltura Dynamic Player(KDP)
-	var KDP_UI_CONF_ID = "${KDP_UI_CONF_ID}";
-
-	var params = {
-		allowscriptaccess: "always",
-		allownetworking: "all",
-		allowfullscreen: "true",
-		wmode: "opaque"
-	};	
-	var flashVars = {
-		entryId:  "${item.entryId}"
-	};	
-	swfobject.embedSWF(KALTURA_SERVER + '/kwidget/wid/_' + PARTNER_ID + '/uiconf_id/' + KDP_UI_CONF_ID, "kplayer", "100%", "100%", "9.0.0", "includes/expressInstall.swf", flashVars, params);
-	
-	function finishActivity(){
-		$('#finishButton').prop('disabled', true);
-		document.location.href ='<c:url value="/learning.do"/>?dispatch=finishActivity&sessionMapID=${sessionMapID}';
-		return false;
-	}
-
-	function continueReflect(){
-		document.location.href='<c:url value="/learning.do"/>?dispatch=newReflection&sessionMapID=${sessionMapID}';
-	}
-	
-	function addNewComment(comment){
-		$("#comments-area").load(
-			"<c:url value="/learning.do"/>",
-			{
-				dispatch: "commentItem",
-				itemUid: ${item.uid}, 
-				comment: comment,
-				sessionMapID: "${sessionMapID}"
+	<lams:head>  
+		<title>
+			<fmt:message key="activity.title" />
+		</title>
+		<lams:css/>
+		
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+	</lams:head>
+	<body class="stripes">
+		<c:set var="KALTURA_SERVER"><%=Configuration.get(ConfigurationKeys.KALTURA_SERVER)%></c:set>
+		<c:set var="PARTNER_ID"><%=Configuration.get(ConfigurationKeys.KALTURA_PARTNER_ID)%></c:set>
+		<c:set var="SUB_PARTNER_ID"><%=Configuration.get(ConfigurationKeys.KALTURA_SUB_PARTNER_ID)%></c:set>
+		<c:set var="USER_SECRET"><%=Configuration.get(ConfigurationKeys.KALTURA_USER_SECRET)%></c:set>
+		<c:set var="KCW_UI_CONF_ID"><%=Configuration.get(ConfigurationKeys.KALTURA_KCW_UI_CONF_ID)%></c:set>
+		<c:set var="KDP_UI_CONF_ID"><%=Configuration.get(ConfigurationKeys.KALTURA_KDP_UI_CONF_ID)%></c:set>
+		
+		<c:if test="${not empty param.sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}" />
+		</c:if>
+		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+		<c:set var="mode" value="${sessionMap.mode}" />
+		<c:set var="toolSessionID" value="${sessionMap.toolSessionID}" />
+		<c:set var="kaltura" value="${sessionMap.kaltura}" />
+		<c:set var="item" value="${sessionMap.item}" />
+		<c:set var="finishedLock" value="${sessionMap.finishedLock}" />
+		
+		<link href="<lams:LAMSURL/>css/jquery.jRating.css" rel="stylesheet" type="text/css" media="screen"/>
+		<link href="<lams:LAMSURL/>css/thickbox.css" rel="stylesheet" type="text/css" media="screen">
+		
+		<style media="screen,projection" type="text/css">
+			
+			#container{width: 100%; position: relative; display: inline-block; margin-top: 25px;}
+			#player-block {  clear: both; position: absolute; top: 0; bottom: 0; left: 0; right: 0;}
+			#dummy {padding-top: 82%; /* aspect ratio */}
+			#player-wrap {width: 60%; height: 100%; clear: both; margin-bottom: 20px; background: black;}
+			#player-bottombar {height:50px; margin-top: 15px; margin-bottom: 10px;}
+			
+			#comment-textarea textarea {
+				margin-bottom: 4px;
 			}
-		);
-	}
-	
-	function hideItem(itemUid, toHide){
-		$.post(
-			"<c:url value="/monitoring.do"/>",
-			{
-				dispatch: "setItemVisibility",
-				itemUid: itemUid, 
-				isHiding: toHide
-			},
-			function(data) {
-				
-				//replace item-hide span
-				var itemHideText = '<span class="pull-right text-right item-hide-management">';
-				if (toHide) {
-					$("#previewItem" + itemUid).addClass("item-hidden");
-					itemHideText += '<div class="thumb-text"><fmt:message key="label.video.is.hidden" /></div>' +
-										'<a href="#nogo" onclick="return hideItem(' + itemUid + ', false);">' +
-											'<fmt:message key="label.unhide" />' +
-										'</a>';
-				} else {
-					$("#previewItem" + itemUid).removeClass("item-hidden");
-					itemHideText += '<a href="#nogo" onclick="return hideItem(' + itemUid + ', true);"><fmt:message key="label.hide" /></a>';
-				}
-				itemHideText += '</span>';
-				$("#previewItem" + itemUid + " .item-hide-management").replaceWith(itemHideText);
-			}
-		);
+			.rating-stars-div {min-height: 50px; padding-right: 0;}
+			.rating-stars-caption { text-align: left; padding-left: 30px; }
+			.rating-stars-disabled-small {padding: 2px 5px;}
+			#add-new-item {float: left; margin-top: 2px; margin-bottom: 20px;}
+			.comment-by {font-size: .9166em; color: #8E8E8E; margin-top: 3px;}
+			.comment-by-text {color: #8E8E8E;}
+			.item-hidden {background: #FFB3B3!important;}
 		
-		return false;
-	}
-	
-	function hideComment(commentUid, toHide){
-		$.post(
-			"<c:url value="/monitoring.do"/>",
-			{
-				dispatch: "setCommentVisibility",
-				commentUid: commentUid, 
-				isHiding: toHide
-			},
-			function(data) {
-				
-				//replace comment-hide span
-				var commentHideText = '<div class="float-right comment-hide-management">';
-				if (toHide) {
-					$("#comment" + commentUid).addClass("item-hidden");
-					commentHideText += '<span class="comment-by-text"><fmt:message key="label.comment.is.hidden" /></span>' +
-										'<a href="#nogo" onclick="return hideComment(' + commentUid + ', false);">' +
-											'<fmt:message key="label.unhide" />' +
-										'</a>';
-				} else {
-					$("#comment" + commentUid).removeClass("item-hidden");
-					commentHideText += '<a href="#nogo" onclick="return hideComment(' + commentUid + ', true);"><fmt:message key="label.hide" /></a>';
-				}
-				commentHideText += '</div>';
-				$("#comment" + commentUid + " .comment-hide-management").replaceWith(commentHideText);
+			#player-sidebar { height: 100%; margin-top: 25px;}
+			#player-sidebar ul {overflow: auto; clear: both; position: relative; list-style: none outside none; margin-left: 15px; margin-right: 0; min-width: 242px; height: 100%;}
+			#player-sidebar ul li:hover {background-color:#D0D0D0;cursor:pointer}
+			#player-sidebar ul li:hover .jRatingColor, #player-sidebar ul li:hover .jStar, .item-hidden .jRatingColor, .item-hidden .jStar {opacity: 0.3;}
+			#player-sidebar ul li { overflow: hidden; padding: 5px 0 5px 5px; clear: both; margin-bottom: 10px; list-style: none outside none;}
+			#player-sidebar ul li a .review-item-link { background: transparent; border-bottom: none; -moz-border-radius: 2px; -webkit-border-radius: 2px; border-radius: 2px; -webkit-transition: background .15s ease-in-out; position: relative; overflow: hidden; color: #333; zoom: 1;}
+			.thumb-wrap {float: left; margin: 0 8px 0 0; position: relative; display: inline-block;	background: transparent; }
+			.duration {padding: 0 4px; font-weight: bold; font-size: 11px; moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; background-color: black; color: white!important; height: 14px; line-height: 14px; opacity: 0.75; display: inline-block; vertical-align: top; zoom: 1; right: 2px; bottom: 2px; position: absolute;}
+			.thumb-title {width: auto; font-size: 12px; font-weight: bold; line-height: 15px; max-height: 30px; color: #333; display: block; margin-bottom: 4px; overflow: hidden; cursor: pointer;}
+			.thumb-stat {display: block; font-size: .9166em; color: #666; line-height: 1.4em; max-height: 1.4em; height: 1.4em; white-space: nowrap; overflow: hidden;}
+			.thumb-text {color: #666;}
+		</style>	
+		
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/instantedit.js"></script>
+		<script type="text/javascript">
+			//var for jquery.jRating.js
+			var pathToImageFolder = "<lams:LAMSURL/>images/css/";
+			//var for instantedit.js
+			var urlBase = '<c:url value="/monitoring.do"/>';
+		</script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/thickbox.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.jRating.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/swfobject.js"></script>
+		<script type="text/javascript" src="http://cdnbakmi.kaltura.com/html5/html5lib/v1.6.10.4/mwEmbedLoader.php"></script>
+		
+		<script type="text/javascript">
+			//Kaltura settings
+			//kaltura server 
+			var KALTURA_SERVER = "${KALTURA_SERVER}";
+			//your actual parner id
+			var PARTNER_ID = "${PARTNER_ID}";
+			//your actual subparner id
+			var SUB_PARTNER_ID = "${SUB_PARTNER_ID}";
+			//your actual user secret
+			var USER_SECRET = "${USER_SECRET}";
+			//ui_conf_id of Kaltura Contribution Wizard(KCW)
+			var KCW_UI_CONF_ID = "${KCW_UI_CONF_ID}";
+			//ui_conf_id of Kaltura Dynamic Player(KDP)
+			var KDP_UI_CONF_ID = "${KDP_UI_CONF_ID}";
+		
+			var params = {
+				allowscriptaccess: "always",
+				allownetworking: "all",
+				allowfullscreen: "true",
+				wmode: "opaque"
+			};	
+			var flashVars = {
+				entryId:  "${item.entryId}"
+			};	
+			swfobject.embedSWF(KALTURA_SERVER + '/kwidget/wid/_' + PARTNER_ID + '/uiconf_id/' + KDP_UI_CONF_ID, "kplayer", "100%", "100%", "9.0.0", "includes/expressInstall.swf", flashVars, params);
+			
+			function finishActivity(){
+				$('#finishButton').prop('disabled', true);
+				document.location.href ='<c:url value="/learning/finishActivity.do"/>?sessionMapID=${sessionMapID}';
+				return false;
 			}
-		);
 		
-		return false;
-	}
-
-	$(document).ready(function(){
-		$(".rating-stars").jRating({
-		    phpPath : "<c:url value='/learning.do'/>?dispatch=rateItem&sessionMapID=${sessionMapID}",
-		    rateMax : 5,
-		    decimalLength : 1,
-			onSuccess : function(data, itemUid){
-			    $("#averageRating" + itemUid).html(data.averageRating);
-			    $("#numberOfVotes" + itemUid).html(data.numberOfVotes);
-			},
-			onError : function(){
-			    jError('Error submitting rating, please retry');
+			function continueReflect(){
+				document.location.href='<c:url value="/learning/newReflection.do"/>?sessionMapID=${sessionMapID}';
 			}
-		});
-	    $(".rating-stars-disabled").jRating({
-	    	rateMax : 5,
-	    	isDisabled : true
-		});
-	    $(".rating-stars-disabled-small").jRating({
-	    	rateMax : 5,
-	    	type: 'small',
-	    	isDisabled : true
-		});
-	    
-	    //edit mark 
-		setVarsForm("dispatch=markItem&itemUid=${item.uid}");
-		$('#editItemMark').click(function() {
-			editBox(document.getElementById( "itemMark" ));
-		});
-
-	});
-
-</script>
-
-<lams:Page type="learner" title="${kaltura.title}">
-
-	<div class="panel">
-		<c:out value="${kaltura.instructions}" escapeXml="false"/>
-	</div>
-
-	<c:if test="${not empty sessionMap.submissionDeadline}">
-		<lams:Alert id="submission-deadline" type="info" close="true">
-		 	<fmt:message key="authoring.info.teacher.set.restriction" >
-		 		<fmt:param><lams:Date value="${sessionMap.submissionDeadline}" /></fmt:param>
-		 	</fmt:message>
-		</lams:Alert>
-	</c:if>
-
-	<c:if test="${kaltura.lockOnFinished and mode == 'learner'}">
-		<lams:Alert type="danger" id="lock-on-finish" close="false">
-			<c:choose>
-				<c:when test="${sessionMap.userFinished}">
-					<fmt:message key="message.activityLocked" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="message.warnLockOnFinish" />
-				</c:otherwise>
-			</c:choose>
-		</lams:Alert>
-	</c:if>
-	
-	<div class="col-xs-12 col-sm-7">
 			
-		<div id="container">	
-			<div id="dummy"></div>
-	
-			<div id="player-block" >
-			    
-				<div id="kplayer">
-					<object height="100%" width="100%">
-						<embed height="100%" type="application/x-shockwave-flash" width="100%" src="#"></embed>
-					</object>
-				</div>
-					
-			</div>
-		</div>
+			function addNewComment(comment){
+				$("#comments-area").load(
+					"<c:url value="/learning/commentItem.do"/>",
+					{
+						itemUid: ${item.uid}, 
+						comment: comment,
+						sessionMapID: "${sessionMapID}"
+					}
+				);
+			}
 			
-		<div id="player-bottombar">
+			function hideItem(itemUid, toHide){
+				$.post(
+					"<c:url value="/monitoring/setItemVisibility.do"/>",
+					{
+						itemUid: itemUid, 
+						isHiding: toHide
+					},
+					function(data) {
+						
+						//replace item-hide span
+						var itemHideText = '<span class="pull-right text-right item-hide-management">';
+						if (toHide) {
+							$("#previewItem" + itemUid).addClass("item-hidden");
+							itemHideText += '<div class="thumb-text"><fmt:message key="label.video.is.hidden" /></div>' +
+												'<a href="#nogo" onclick="return hideItem(' + itemUid + ', false);">' +
+													'<fmt:message key="label.unhide" />' +
+												'</a>';
+						} else {
+							$("#previewItem" + itemUid).removeClass("item-hidden");
+							itemHideText += '<a href="#nogo" onclick="return hideItem(' + itemUid + ', true);"><fmt:message key="label.hide" /></a>';
+						}
+						itemHideText += '</span>';
+						$("#previewItem" + itemUid + " .item-hide-management").replaceWith(itemHideText);
+					}
+				);
+				
+				return false;
+			}
 			
-			<%--"Check for new" and "Add new image" buttons---------------%>
-		
-			<div id="add-new-item">
-				<c:if test="${sessionMap.isAllowUpload && (not finishedLock)}">
-					<a href="<c:url value='/pages/learning/uploaditem.jsp'/>?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true&modal=true" class="btn btn-sm btn-default thickbox">  
-						<fmt:message key="label.learning.add.new.image" />
-					</a>
-				</c:if>
+			function hideComment(commentUid, toHide){
+				$.post(
+					"<c:url value="/monitoring/setCommentVisibility.do"/>",
+					{
+						commentUid: commentUid, 
+						isHiding: toHide
+					},
+					function(data) {
+						
+						//replace comment-hide span
+						var commentHideText = '<div class="float-right comment-hide-management">';
+						if (toHide) {
+							$("#comment" + commentUid).addClass("item-hidden");
+							commentHideText += '<span class="comment-by-text"><fmt:message key="label.comment.is.hidden" /></span>' +
+												'<a href="#nogo" onclick="return hideComment(' + commentUid + ', false);">' +
+													'<fmt:message key="label.unhide" />' +
+												'</a>';
+						} else {
+							$("#comment" + commentUid).removeClass("item-hidden");
+							commentHideText += '<a href="#nogo" onclick="return hideComment(' + commentUid + ', true);"><fmt:message key="label.hide" /></a>';
+						}
+						commentHideText += '</div>';
+						$("#comment" + commentUid + " .comment-hide-management").replaceWith(commentHideText);
+					}
+				);
 				
-				<c:if test="${sessionMap.isGroupMonitoring}">
-					<fmt:message key="label.mark" />
-					 
+				return false;
+			}
+		
+			$(document).ready(function(){
+				$(".rating-stars").jRating({
+				    phpPath : "<c:url value='/learning/rateItem.do'/>?sessionMapID=${sessionMapID}",
+				    rateMax : 5,
+				    decimalLength : 1,
+					onSuccess : function(data, itemUid){
+					    $("#averageRating" + itemUid).html(data.averageRating);
+					    $("#numberOfVotes" + itemUid).html(data.numberOfVotes);
+					},
+					onError : function(){
+					    jError('Error submitting rating, please retry');
+					}
+				});
+			    $(".rating-stars-disabled").jRating({
+			    	rateMax : 5,
+			    	isDisabled : true
+				});
+			    $(".rating-stars-disabled-small").jRating({
+			    	rateMax : 5,
+			    	type: 'small',
+			    	isDisabled : true
+				});
+			    
+			    //edit mark 
+				setVarsForm("dispatch=markItem&itemUid=${item.uid}");
+				$('#editItemMark').click(function() {
+					editBox(document.getElementById( "itemMark" ));
+				});
+		
+			});
+		
+		</script>
+		
+		<lams:Page type="learner" title="${kaltura.title}">
+		
+			<div class="panel">
+				<c:out value="${kaltura.instructions}" escapeXml="false"/>
+			</div>
+		
+			<c:if test="${not empty sessionMap.submissionDeadline}">
+				<lams:Alert id="submission-deadline" type="info" close="true">
+				 	<fmt:message key="authoring.info.teacher.set.restriction" >
+				 		<fmt:param><lams:Date value="${sessionMap.submissionDeadline}" /></fmt:param>
+				 	</fmt:message>
+				</lams:Alert>
+			</c:if>
+		
+			<c:if test="${kaltura.lockOnFinished and mode == 'learner'}">
+				<lams:Alert type="danger" id="lock-on-finish" close="false">
 					<c:choose>
-						<c:when test="${item.mark == null}">
-							<c:set var="itemMark" value="0"/>	
+						<c:when test="${sessionMap.userFinished}">
+							<fmt:message key="message.activityLocked" />
 						</c:when>
 						<c:otherwise>
-							<c:set var="itemMark" value="${item.mark}"/>			
+							<fmt:message key="message.warnLockOnFinish" />
 						</c:otherwise>
 					</c:choose>
-					<span id="itemMark">${itemMark}</span>
-					
-					<sup><a href="javascript:;" id="editItemMark"><fmt:message key="label.mark.edit" /></a></sup>
-				</c:if>
-			</div>
-		
-			<!--  Rating stars -->
-		
-			<c:if test="${kaltura.allowRatings && (item.uid != -1)}">
-				<%@ include file="/pages/learning/ratingStars.jsp"%>
+				</lams:Alert>
 			</c:if>
-		</div>
-	    	
-	    <%--Comments area----------------------------------------------%>	
-	    	
-	    <c:if test="${kaltura.allowComments && (item.uid != -1)}">
-		    <div id="comments-area" class="clearfix">
-		    	<%@ include file="/pages/learning/commentlist.jsp"%>
-		    </div>
-	    </c:if>
-			    
-	</div>
-		
-	<div id="player-sidebar" class="col-xs-12 col-sm-5">
-		<ul>
-			<c:forEach var="previewItem" items="${sessionMap.items}" varStatus="status">
-				<li id="previewItem${previewItem.uid}" <c:if test="${previewItem.hidden}"> class="item-hidden" </c:if>>
-					<a href="<c:url value='/learning.do'/>?dispatch=viewItem&sessionMapID=${sessionMapID}&itemUid=${previewItem.uid}" class="review-item-link">
-						<span class="thumb-wrap">
-							<img src="http://cdnbakmi.kaltura.com/p/${PARTNER_ID}/sp/${SUB_PARTNER_ID}/thumbnail/entry_id/${previewItem.entryId}/width/100!/height/68!" height="68" width="100" alt="Video">
-							<em></em>
-							<span class="duration">
-								<fmt:formatDate value="${previewItem.durationDate}" pattern="m:ss" />
-							</span>
-						</span>
-						<span class="thumb-title"><c:out value="${previewItem.title}" escapeXml="true"/></span>
-							    
-						<span class="thumb-stat">
-						   	<c:choose>
-								<c:when test="${empty previewItem.createdBy}">
-									<c:set var="videoAuthor" >
-										<fmt:message key="label.uploaded.by.instructor" />
-									</c:set>
+			
+			<div class="col-xs-12 col-sm-7">
+					
+				<div id="container">	
+					<div id="dummy"></div>
+			
+					<div id="player-block" >
+					    
+						<div id="kplayer">
+							<object height="100%" width="100%">
+								<embed height="100%" type="application/x-shockwave-flash" width="100%" src="#"></embed>
+							</object>
+						</div>
+							
+					</div>
+				</div>
+					
+				<div id="player-bottombar">
+					
+					<%--"Check for new" and "Add new image" buttons---------------%>
+				
+					<div id="add-new-item">
+						<c:if test="${sessionMap.isAllowUpload && (not finishedLock)}">
+							<a href="<c:url value='/pages/learning/uploaditem.jsp'/>?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true&modal=true" class="btn btn-sm btn-default thickbox">  
+								<fmt:message key="label.learning.add.new.image" />
+							</a>
+						</c:if>
+						
+						<c:if test="${sessionMap.isGroupMonitoring}">
+							<fmt:message key="label.mark" />
+							 
+							<c:choose>
+								<c:when test="${item.mark == null}">
+									<c:set var="itemMark" value="0"/>	
 								</c:when>
 								<c:otherwise>
-									<c:set var="videoAuthor" >
-										<c:out value="${previewItem.createdBy.firstName} ${previewItem.createdBy.lastName}" escapeXml="true"/>
-									</c:set>
+									<c:set var="itemMark" value="${item.mark}"/>			
 								</c:otherwise>
 							</c:choose>
-									
-							<fmt:message key="label.uploaded.by" >
-						    	<fmt:param><c:out value="${videoAuthor}" escapeXml="true"/></fmt:param>
-						    </fmt:message>
-						</span>
-							    
-						<c:if test="${kaltura.allowRatings}">
-						    <span class="thumb-stat">
-						    	<span class="pull-left"><fmt:message key="label.rating" /></span>
-						        <div class="rating-stars-disabled-small" data-average="${previewItem.averageRatingDto.rating}" data-id="${previewItem.uid}"></div>
-							</span>
-						</c:if>
-							    
-						<c:if test="${kaltura.allowComments && (not empty previewItem.groupComments)}">
-							<span class="thumb-stat">
-								<fmt:message key="label.number.of.comments" >
-									<fmt:param>${fn:length(previewItem.groupComments)}</fmt:param>
-								</fmt:message>
-							</span>
-						</c:if>
-					</a>
+							<span id="itemMark">${itemMark}</span>
 							
-					<c:if test="${sessionMap.isGroupMonitoring}">
-					    <span class="pull-right text-right item-hide-management">
-						   	<c:choose>
-								<c:when test="${previewItem.hidden}">
-									<div class="thumb-text">
-										<fmt:message key="label.video.is.hidden" />
-									</div>
+							<sup><a href="javascript:;" id="editItemMark"><fmt:message key="label.mark.edit" /></a></sup>
+						</c:if>
+					</div>
+				
+					<!--  Rating stars -->
+				
+					<c:if test="${kaltura.allowRatings && (item.uid != -1)}">
+						<%@ include file="/pages/learning/ratingStars.jsp"%>
+					</c:if>
+				</div>
+			    	
+			    <%--Comments area----------------------------------------------%>	
+			    	
+			    <c:if test="${kaltura.allowComments && (item.uid != -1)}">
+				    <div id="comments-area" class="clearfix">
+				    	<%@ include file="/pages/learning/commentlist.jsp"%>
+				    </div>
+			    </c:if>
+					    
+			</div>
+				
+			<div id="player-sidebar" class="col-xs-12 col-sm-5">
+				<ul>
+					<c:forEach var="previewItem" items="${sessionMap.items}" varStatus="status">
+						<li id="previewItem${previewItem.uid}" <c:if test="${previewItem.hidden}"> class="item-hidden" </c:if>>
+							<a href="<c:url value='/learning/viewItem.do'/>?sessionMapID=${sessionMapID}&itemUid=${previewItem.uid}" class="review-item-link">
+								<span class="thumb-wrap">
+									<img src="http://cdnbakmi.kaltura.com/p/${PARTNER_ID}/sp/${SUB_PARTNER_ID}/thumbnail/entry_id/${previewItem.entryId}/width/100!/height/68!" height="68" width="100" alt="Video">
+									<em></em>
+									<span class="duration">
+										<fmt:formatDate value="${previewItem.durationDate}" pattern="m:ss" />
+									</span>
+								</span>
+								<span class="thumb-title"><c:out value="${previewItem.title}" escapeXml="true"/></span>
+									    
+								<span class="thumb-stat">
+								   	<c:choose>
+										<c:when test="${empty previewItem.createdBy}">
+											<c:set var="videoAuthor" >
+												<fmt:message key="label.uploaded.by.instructor" />
+											</c:set>
+										</c:when>
+										<c:otherwise>
+											<c:set var="videoAuthor" >
+												<c:out value="${previewItem.createdBy.firstName} ${previewItem.createdBy.lastName}" escapeXml="true"/>
+											</c:set>
+										</c:otherwise>
+									</c:choose>
 											
-									<a href="#nogo" onclick="return hideItem(${previewItem.uid}, false);">
-						       			<fmt:message key="label.unhide" />
-					    			</a>
+									<fmt:message key="label.uploaded.by" >
+								    	<fmt:param><c:out value="${videoAuthor}" escapeXml="true"/></fmt:param>
+								    </fmt:message>
+								</span>
+									    
+								<c:if test="${kaltura.allowRatings}">
+								    <span class="thumb-stat">
+								    	<span class="pull-left"><fmt:message key="label.rating" /></span>
+								        <div class="rating-stars-disabled-small" data-average="${previewItem.averageRatingDto.rating}" data-id="${previewItem.uid}"></div>
+									</span>
+								</c:if>
+									    
+								<c:if test="${kaltura.allowComments && (not empty previewItem.groupComments)}">
+									<span class="thumb-stat">
+										<fmt:message key="label.number.of.comments" >
+											<fmt:param>${fn:length(previewItem.groupComments)}</fmt:param>
+										</fmt:message>
+									</span>
+								</c:if>
+							</a>
+									
+							<c:if test="${sessionMap.isGroupMonitoring}">
+							    <span class="pull-right text-right item-hide-management">
+								   	<c:choose>
+										<c:when test="${previewItem.hidden}">
+											<div class="thumb-text">
+												<fmt:message key="label.video.is.hidden" />
+											</div>
+													
+											<a href="#nogo" onclick="return hideItem(${previewItem.uid}, false);">
+								       			<fmt:message key="label.unhide" />
+							    			</a>
+										</c:when>
+										<c:otherwise>
+											<a href="#nogo" onclick="return hideItem(${previewItem.uid}, true);">
+								       			<fmt:message key="label.hide" />
+								   			</a>
+										</c:otherwise>
+									</c:choose>
+								</span>							
+							</c:if>
+									
+					   	</li>
+				 	</c:forEach>
+				</ul>
+			</div>	
+		
+			<%--Reflection--------------------------------------------------%>
+		
+			<c:if test="${sessionMap.userFinished && sessionMap.reflectOn && !sessionMap.isGroupMonitoring}">
+				<div class="col-xs-12 col-sm-12 ">
+					<div class="panel panel-default voffset10">
+						<div class="panel-heading panel-title">
+							<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
+						</div>
+			
+						<div class="panel-body">
+							<c:choose>
+								<c:when test="${empty sessionMap.reflectEntry}">
+									<em> 
+										<fmt:message key="message.no.reflection.available" />
+									</em>
 								</c:when>
 								<c:otherwise>
-									<a href="#nogo" onclick="return hideItem(${previewItem.uid}, true);">
-						       			<fmt:message key="label.hide" />
-						   			</a>
+									<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
 								</c:otherwise>
 							</c:choose>
-						</span>							
-					</c:if>
-							
-			   	</li>
-		 	</c:forEach>
-		</ul>
-	</div>	
-
-	<%--Reflection--------------------------------------------------%>
-
-	<c:if test="${sessionMap.userFinished && sessionMap.reflectOn && !sessionMap.isGroupMonitoring}">
-		<div class="col-xs-12 col-sm-12 ">
-			<div class="panel panel-default voffset10">
-				<div class="panel-heading panel-title">
-					<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
+						</div>
+			
+						<c:if test="${mode != 'teacher'}">
+							<button name="FinishButton" onclick="return continueReflect()" class="btn btn-default pull-left">
+								<fmt:message key="label.edit" />
+							</button>
+						</c:if>
+					</div>
 				</div>
-	
-				<div class="panel-body">
+			</c:if>
+			
+			<%--Bottom buttons-------------------------------------------%>
+		
+			<c:if test="${mode != 'teacher'}">
+				<div class="voffset10 pull-right" style="clear:both;">
 					<c:choose>
-						<c:when test="${empty sessionMap.reflectEntry}">
-							<em> 
-								<fmt:message key="message.no.reflection.available" />
-							</em>
+						<c:when	test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
+							<button name="FinishButton" onclick="return continueReflect()" class="btn btn-primary" >
+								<fmt:message key="label.continue" />
+							</button>
 						</c:when>
 						<c:otherwise>
-							<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
+							<a href="#nogo" name="FinishButton" id="finishButton"	onclick="return finishActivity()" class="btn btn-primary pull-right" >
+								<span class="na">
+									<c:choose>
+					 					<c:when test="${sessionMap.activityPosition.last}">
+					 						<fmt:message key="button.submit" />
+					 					</c:when>
+					 					<c:otherwise>
+					 		 				<fmt:message key="button.finish" />
+					 					</c:otherwise>
+					 				</c:choose>
+					 			</span>
+							</a>
 						</c:otherwise>
 					</c:choose>
 				</div>
-	
-				<c:if test="${mode != 'teacher'}">
-					<html:button property="FinishButton" onclick="return continueReflect()" styleClass="btn btn-default pull-left">
-						<fmt:message key="label.edit" />
-					</html:button>
-				</c:if>
-			</div>
-		</div>
-	</c:if>
-	
-	<%--Bottom buttons-------------------------------------------%>
+			</c:if>
+			
+		</lams:Page>		
+	</body>
+</lams:html>
 
-	<c:if test="${mode != 'teacher'}">
-		<div class="voffset10 pull-right" style="clear:both;">
-			<c:choose>
-				<c:when	test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
-					<html:button property="FinishButton" onclick="return continueReflect()" styleClass="btn btn-primary" >
-						<fmt:message key="label.continue" />
-					</html:button>
-				</c:when>
-				<c:otherwise>
-					<html:link href="#nogo" property="FinishButton" styleId="finishButton"	onclick="return finishActivity()" styleClass="btn btn-primary pull-right" >
-						<span class="na">
-							<c:choose>
-			 					<c:when test="${sessionMap.activityPosition.last}">
-			 						<fmt:message key="button.submit" />
-			 					</c:when>
-			 					<c:otherwise>
-			 		 				<fmt:message key="button.finish" />
-			 					</c:otherwise>
-			 				</c:choose>
-			 			</span>
-					</html:link>
-				</c:otherwise>
-			</c:choose>
-		</div>
-	</c:if>
-	
-</lams:Page>
+
+
Index: lams_tool_kaltura/web/pages/learning/notebook.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -1,49 +1,73 @@
+<!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="sessionMapID" value="${param.sessionMapID}" />
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-<c:set var="kaltura" value="${sessionMap.kaltura}" />
-
-<script type="text/javascript">
-	function disableFinishButton() {
-		document.getElementById("finishButton").disabled = true;
-	}
-	function submitForm(methodName) {
-		var f = document.getElementById('messageForm');
-		f.submit();
-	}
-	$(document).ready(function() {
-		document.getElementById("focused").focus();
-	});
-</script>
+<lams:html>
+	<c:set var="lams">
+		<lams:LAMSURL />
+	</c:set>
+	<c:set var="tool">
+		<lams:WebAppURL />
+	</c:set>
 	
-<html:form action="/learning.do?dispatch=submitReflection" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
-	<html:hidden property="userID" />
-	<html:hidden property="sessionMapID" />
+	<lams:head>  
+		<title>
+			<fmt:message key="activity.title" />
+		</title>
+		<lams:css/>
+		
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+	</lams:head>
+	<body class="stripes">
+		<c:set var="sessionMapID" value="${param.sessionMapID}" />
+		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+		<c:set var="kaltura" value="${sessionMap.kaltura}" />
+		
+		<script type="text/javascript">
+			function disableFinishButton() {
+				document.getElementById("finishButton").disabled = true;
+			}
+			function submitForm(methodName) {
+				var f = document.getElementById('messageForm');
+				f.submit();
+			}
+			$(document).ready(function() {
+				document.getElementById("focused").focus();
+			});
+		</script>
+			
+		<form:form action="submitReflection.do" modelAttribute="messageForm" method="post" onsubmit="disableFinishButton();" id="messageForm">
+			<form:hidden path="userID" />
+			<form:hidden path="sessionMapID" />
+		
+			<lams:Page type="learner" title="${kaltura.title}">
+		
+				<%@ include file="/common/messages.jsp"%>
+		
+				<div class="panel">
+					<lams:out value="${kaltura.reflectInstructions}" escapeHtml="true"/>
+				</div>
+		
+				<form:textarea id="focused" rows="5" path="entryText" cssClass="form-control" />
+		
+				<a href="#nogo" cssClass="btn btn-primary voffset10 pull-right" id="finishButton" onclick="submitForm('finish')">
+					<span class="na">
+						<c:choose>
+			 				<c:when test="${sessionMap.activityPosition.last}">
+			 					<fmt:message key="button.submit" />
+			 				</c:when>
+			 				<c:otherwise>
+			 	 				<fmt:message key="button.finish" />
+			 				</c:otherwise>
+			 			</c:choose>
+			 		</span>
+				</a>
+				
+			</lams:Page>
+		</form:form>		
+	</body>
+</lams:html>
 
-	<lams:Page type="learner" title="${kaltura.title}">
 
-		<%@ include file="/common/messages.jsp"%>
-
-		<div class="panel">
-			<lams:out value="${kaltura.reflectInstructions}" escapeHtml="true"/>
-		</div>
-
-		<html:textarea styleId="focused" rows="5" property="entryText" styleClass="form-control" />
-
-		<html:link href="#nogo" styleClass="btn btn-primary voffset10 pull-right" styleId="finishButton" onclick="submitForm('finish')">
-			<span class="na">
-				<c:choose>
-	 				<c:when test="${sessionMap.activityPosition.last}">
-	 					<fmt:message key="button.submit" />
-	 				</c:when>
-	 				<c:otherwise>
-	 	 				<fmt:message key="button.finish" />
-	 				</c:otherwise>
-	 			</c:choose>
-	 		</span>
-		</html:link>
-		
-	</lams:Page>
-</html:form>
 	
Index: lams_tool_kaltura/web/pages/learning/submissionDeadline.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -1,49 +1,70 @@
+<!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:if test="${not empty param.sessionMapID}">
-	<c:set var="sessionMapID" value="${param.sessionMapID}" />
-</c:if>
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-<c:set var="mode" value="${sessionMap.mode}" />
-<c:set var="toolSessionID" value="${sessionMap.toolSessionID}" />
-<c:set var="kaltura" value="${sessionMap.kaltura}" />
-
-<script type="text/javascript">
-	function disableFinishButton() {
-		document.getElementById("finishButton").disabled = true;
-	}
-    function submitForm(methodName) {
-    	var f = document.getElementById('messageForm');
-    	f.submit();
-    }
-</script>
-
-<lams:Page type="learner" title="${kaltura.title}">
-
-	<lams:Alert id="submission-deadline" type="danger" close="false">
-		<fmt:message key="authoring.info.teacher.set.restriction" >
-			<fmt:param><lams:Date value="${sessionMap.submissionDeadline}" /></fmt:param>
-		</fmt:message>	
-	</lams:Alert>
+<lams:html>
+	<c:set var="lams">
+		<lams:LAMSURL />
+	</c:set>
+	<c:set var="tool">
+		<lams:WebAppURL />
+	</c:set>
 	
-	<c:if test="${mode == 'learner' || mode == 'author'}">
-		<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
-			<html:hidden property="dispatch" value="finishActivity" />
-			<html:hidden property="sessionMapID" value="${sessionMapID}"/>
+	<lams:head>  
+		<title>
+			<fmt:message key="activity.title" />
+		</title>
+		<lams:css/>
+		
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+	</lams:head>
+	<body class="stripes">
+		<c:if test="${not empty param.sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}" />
+		</c:if>
+		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+		<c:set var="mode" value="${sessionMap.mode}" />
+		<c:set var="toolSessionID" value="${sessionMap.toolSessionID}" />
+		<c:set var="kaltura" value="${sessionMap.kaltura}" />
+		
+		<script type="text/javascript">
+			function disableFinishButton() {
+				document.getElementById("finishButton").disabled = true;
+			}
+		    function submitForm(methodName) {
+		    	var f = document.getElementById('messageForm');
+		    	f.submit();
+		    }
+		</script>
+		
+		<lams:Page type="learner" title="${kaltura.title}">
+		
+			<lams:Alert id="submission-deadline" type="danger" close="false">
+				<fmt:message key="authoring.info.teacher.set.restriction" >
+					<fmt:param><lams:Date value="${sessionMap.submissionDeadline}" /></fmt:param>
+				</fmt:message>	
+			</lams:Alert>
+			
+			<c:if test="${mode == 'learner' || mode == 'author'}">
+				<form:form action="finishActivity.do" modelAttribute="messageForm" method="post" onsubmit="disableFinishButton();" id="messageForm">
+					<form:hidden path="sessionMapID" value="${sessionMapID}"/>
+		
+					<a href="#nogo" class="btn btn-primary voffset10 pull-right" id="finishButton" onclick="submitForm('finish')">
+						<span class="na">
+							<c:choose>
+				 				<c:when test="${sessionMap.activityPosition.last}">
+				 					<fmt:message key="button.submit" />
+				 				</c:when>
+				 				<c:otherwise>
+				 	 				<fmt:message key="button.finish" />
+				 				</c:otherwise>
+				 			</c:choose>
+				 		</span>
+					</a>
+				</form:form>
+			</c:if>
+		</lams:Page>
+	</body>
+</lams:html>
 
-			<html:link href="#nogo" styleClass="btn btn-primary voffset10 pull-right" styleId="finishButton" onclick="submitForm('finish')">
-				<span class="na">
-					<c:choose>
-		 				<c:when test="${sessionMap.activityPosition.last}">
-		 					<fmt:message key="button.submit" />
-		 				</c:when>
-		 				<c:otherwise>
-		 	 				<fmt:message key="button.finish" />
-		 				</c:otherwise>
-		 			</c:choose>
-		 		</span>
-			</html:link>
-		</html:form>
-	</c:if>
-</lams:Page>
-
Index: lams_tool_kaltura/web/pages/learning/uploaditem.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/pages/learning/uploaditem.jsp	(.../uploaditem.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/pages/learning/uploaditem.jsp	(.../uploaditem.jsp)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -135,9 +135,8 @@
 			
 			function addItem(entryId, title, duration){
 				$.post(
-					"<c:url value="/learning.do"/>", 
+					"<c:url value="/learning/saveNewItem.do"/>", 
 					{
-						dispatch: "saveNewItem",
 						sessionMapID: "${param.sessionMapID}",
 						itemEntryId: entryId,
 						itemTitle: title,
@@ -151,7 +150,7 @@
 			
 			function closeThickbox(){
 				if (lastUploadedItemUid != null) {
-					self.parent.location.href = '<c:url value="/learning.do"/>?dispatch=viewItem&sessionMapID=${param.sessionMapID}&itemUid=' + lastUploadedItemUid;
+					self.parent.location.href = '<c:url value="/learning/viewItem.do"/>?sessionMapID=${param.sessionMapID}&itemUid=' + lastUploadedItemUid;
 				} else {
 					self.parent.tb_remove();
 				}
Index: lams_tool_kaltura/web/pages/monitoring/daterestriction.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/pages/monitoring/daterestriction.jsp	(.../daterestriction.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/pages/monitoring/daterestriction.jsp	(.../daterestriction.jsp)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -14,9 +14,9 @@
 				<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline"/>
 			</label>
 									
-			<html:link	href="javascript:setSubmissionDeadline();" styleClass="btn btn-sm btn-default loffset5">
+			<a	href="javascript:setSubmissionDeadline();" class="btn btn-sm btn-default loffset5">
 				<fmt:message key="monitor.summary.set.restriction" />
-			</html:link>
+			</a>
 		</div>
 	</div>
 
Index: lams_tool_kaltura/web/pages/monitoring/editActivity.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -32,8 +32,8 @@
 	<c:param name="mode" value="teacher" />
 	<c:param name="contentFolderID" value="${contentFolderID}" />
 </c:url>
-<html:link href="#nogo" onclick="javascript:launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
+<a href="#nogo" onclick="javascript:launchPopup('${authoringUrl}','definelater')" class="btn btn-default pull-right">
 	<fmt:message key="button.editActivity" />
-</html:link>
+</a>
 
 
Index: lams_tool_kaltura/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -1,19 +1,48 @@
+<!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.kaltura.util.KalturaConstants"%>
 
-<c:set var="title"><fmt:message key="activity.title" /></c:set>
-<lams:Tabs control="true" title="${title}" helpToolSignature="<%= KalturaConstants.TOOL_SIGNATURE %>" helpModule="monitoring" refreshOnClickAction="javascript:location.reload();">
-	<lams:Tab id="1" key="button.summary"/>
-	<lams:Tab id="2" key="button.editActivity"/>
-	<lams:Tab id="3" key="button.statistics"/>
-</lams:Tabs>
+<lams:html>
+	<c:set var="lams">
+		<lams:LAMSURL />
+	</c:set>
+	<c:set var="tool">
+		<lams:WebAppURL />
+	</c:set>
 	
-<lams:TabBodyArea>
-	<lams:TabBodys>
-		<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
-		<lams:TabBody id="2" titleKey="button.editActivity" page="editActivity.jsp" />			
-		<lams:TabBody id="3" titleKey="button.statistics" page="statistics.jsp" />
-	</lams:TabBodys> 
-</lams:TabBodyArea>
+	<lams:head>
+		<title>
+			<fmt:message key="activity.title" />
+		</title>
+		<lams:headItems />
+		<c:set var="tool">
+			<lams:WebAppURL />
+		</c:set>
 
-<div id="footer"></div>
+		<script type="text/javascript" src="${tool}includes/javascript/monitoring.js"> </script>
+	</lams:head>
+	<body class="stripes" onload="init();">
+		<lams:Page title='<fmt:message key="pageTitle.monitoring"/>' type="navbar">
+			<c:set var="title"><fmt:message key="activity.title" /></c:set>
+			<lams:Tabs control="true" title="${title}" helpToolSignature="<%= KalturaConstants.TOOL_SIGNATURE %>" helpModule="monitoring" refreshOnClickAction="javascript:location.reload();">
+				<lams:Tab id="1" key="button.summary"/>
+				<lams:Tab id="2" key="button.editActivity"/>
+				<lams:Tab id="3" key="button.statistics"/>
+			</lams:Tabs>
+				
+			<lams:TabBodyArea>
+				<lams:TabBodys>
+					<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
+					<lams:TabBody id="2" titleKey="button.editActivity" page="editActivity.jsp" />			
+					<lams:TabBody id="3" titleKey="button.statistics" page="statistics.jsp" />
+				</lams:TabBodys> 
+			</lams:TabBodyArea>
+			
+			<div id="footer"></div>
+		</lams:Page>
+		
+	</body>
+</lams:html>
+
+
+
Index: lams_tool_kaltura/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rff911101cbe92d6813691c20c292fa04519820b4
--- lams_tool_kaltura/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_kaltura/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
@@ -12,7 +12,7 @@
 		lams: '${lams}',
 		submissionDeadline: '${submissionDeadline}',
 		submissionDateString: '${submissionDateString}',
-		setSubmissionDeadlineUrl: '<c:url value="/monitoring.do?dispatch=setSubmissionDeadline"/>',
+		setSubmissionDeadlineUrl: '<c:url value="/monitoring/setSubmissionDeadline.do"/>',
 		toolContentID: '${param.toolContentID}',
 		messageNotification: '<fmt:message key="monitor.summary.notification" />',
 		messageRestrictionSet: '<fmt:message key="monitor.summary.date.restriction.set" />',
@@ -60,7 +60,7 @@
 		<c:forEach var="session" items="${sessionDTOs}">
 			<tr>
 				<td>
-					<a href="<c:url value="/monitoring.do"/>?dispatch=showGroupLearning&toolSessionID=${session.sessionID}&TB_iframe=true" class="btn btn-default btn-sm thickbox" title="${session.sessionName}">
+					<a href="<c:url value="/monitoring/showGroupLearning.do"/>?toolSessionID=${session.sessionID}&TB_iframe=true" class="btn btn-default btn-sm thickbox" title="${session.sessionName}">
 						${session.sessionName}
 					</a>
 				</td>