Index: lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
===================================================================
diff -u -r7ea9b852e5fe8dc5688f983f162064d862f147de -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
+++ lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -1,6 +1,7 @@
 <%@ 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" %> 
 
 <!--question content goes here-->
 <c:forEach var="questionEntry" items="${generalLearnerFlowDTO.mapQuestionContentLearner}">
@@ -53,7 +54,7 @@
 							</c:choose>
 						</div>
 
-						<form:hidden path="currentQuestionIndex"><c:out value="${questionEntry.key}" /></form:hidden>
+						<form:hidden path="currentQuestionIndex" value="${questionEntry.key}" />
 	</c:if>
 </c:forEach>
 
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/AuthoringController.java
===================================================================
diff -u -r46e01bf046d755f571ba59957ac869c086bad58c -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 46e01bf046d755f571ba59957ac869c086bad58c)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -217,39 +217,39 @@
     /**
      * Updates Pixlr content using AuthoringForm inputs.
      *
-     * @param authForm
+     * @param authoringForm
      * @param mode
      * @return
      */
-    private void updatePixlr(Pixlr pixlr, AuthoringForm authForm) {
-	pixlr.setTitle(authForm.getTitle());
-	pixlr.setInstructions(authForm.getInstructions());
-	pixlr.setLockOnFinished(authForm.isLockOnFinished());
-	pixlr.setReflectOnActivity(authForm.isReflectOnActivity());
-	pixlr.setReflectInstructions(authForm.getReflectInstructions());
-	pixlr.setAllowViewOthersImages(authForm.isAllowViewOthersImages());
+    private void updatePixlr(Pixlr pixlr, @ModelAttribute("authoringForm") AuthoringForm authoringForm) {
+	pixlr.setTitle(authoringForm.getTitle());
+	pixlr.setInstructions(authoringForm.getInstructions());
+	pixlr.setLockOnFinished(authoringForm.isLockOnFinished());
+	pixlr.setReflectOnActivity(authoringForm.isReflectOnActivity());
+	pixlr.setReflectInstructions(authoringForm.getReflectInstructions());
+	pixlr.setAllowViewOthersImages(authoringForm.isAllowViewOthersImages());
     }
 
     /**
      * Updates AuthoringForm using Pixlr content.
      *
      * @param pixlr
-     * @param authForm
+     * @param authoringForm
      * @return
      */
-    private void updateAuthForm(AuthoringForm authForm, Pixlr pixlr) {
-	authForm.setTitle(pixlr.getTitle());
-	authForm.setInstructions(pixlr.getInstructions());
-	authForm.setLockOnFinished(pixlr.isLockOnFinished());
-	authForm.setReflectOnActivity(pixlr.isReflectOnActivity());
-	authForm.setExistingImageFileName(pixlr.getImageFileName());
-	authForm.setReflectInstructions(pixlr.getReflectInstructions());
-	authForm.setAllowViewOthersImages(pixlr.isAllowViewOthersImages());
+    private void updateAuthForm(@ModelAttribute("authoringForm") AuthoringForm authoringForm, Pixlr pixlr) {
+	authoringForm.setTitle(pixlr.getTitle());
+	authoringForm.setInstructions(pixlr.getInstructions());
+	authoringForm.setLockOnFinished(pixlr.isLockOnFinished());
+	authoringForm.setReflectOnActivity(pixlr.isReflectOnActivity());
+	authoringForm.setExistingImageFileName(pixlr.getImageFileName());
+	authoringForm.setReflectInstructions(pixlr.getReflectInstructions());
+	authoringForm.setAllowViewOthersImages(pixlr.isAllowViewOthersImages());
 
 	if (pixlr.getImageFileName() == null || pixlr.getImageFileName().trim().equals("")) {
-	    authForm.setFileName(PixlrConstants.DEFAULT_IMAGE_FILE_NAME);
+	    authoringForm.setFileName(PixlrConstants.DEFAULT_IMAGE_FILE_NAME);
 	} else {
-	    authForm.setFileName(pixlr.getImageFileName());
+	    authoringForm.setFileName(pixlr.getImageFileName());
 	}
     }
 
@@ -317,24 +317,25 @@
      * Upload the image to the open www/images/pixlr folder
      *
      * @param request
-     * @param imageForm
+     * @param authoringForm
      * @throws ImageGalleryException
      */
-    private void uploadFormImage(AuthoringForm imageForm, Pixlr pixlr) throws Exception {
+    private void uploadFormImage(@ModelAttribute("authoringForm") AuthoringForm authoringForm, Pixlr pixlr)
+	    throws Exception {
 
 	String filename = PixlrConstants.DEFAULT_IMAGE_FILE_NAME;
 
 	// set up pixlrService
 
-	if (imageForm.getFile() != null) {
+	if (authoringForm.getFile() != null) {
 
 	    // check the directory exists, then create it if it doesnt
 	    File pixlrDir = new File(PixlrConstants.LAMS_PIXLR_BASE_DIR);
 	    if (!pixlrDir.exists()) {
 		pixlrDir.mkdirs();
 	    }
 
-	    MultipartFile formFile = imageForm.getFile();
+	    MultipartFile formFile = authoringForm.getFile();
 
 	    filename = FileUtil.generateUniqueContentFolderID()
 		    + pixlrService.getFileExtension(formFile.getOriginalFilename());
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/LearningController.java
===================================================================
diff -u -r46e01bf046d755f571ba59957ac869c086bad58c -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/LearningController.java	(.../LearningController.java)	(revision 46e01bf046d755f571ba59957ac869c086bad58c)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/LearningController.java	(.../LearningController.java)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -345,11 +345,11 @@
     }
 
     @RequestMapping("/openNotebook")
-    public String openNotebook(@ModelAttribute("reflectEditForm") LearningForm reflectEditForm,
+    public String openNotebook(@ModelAttribute("learningForm") LearningForm learningForm,
 	    HttpServletRequest request, HttpServletResponse response) {
 
 	// set the finished flag
-	PixlrUser pixlrUser = this.getCurrentUser(reflectEditForm.getToolSessionID());
+	PixlrUser pixlrUser = this.getCurrentUser(learningForm.getToolSessionID());
 	PixlrDTO pixlrDTO = new PixlrDTO(pixlrUser.getPixlrSession().getPixlr());
 
 	request.setAttribute("pixlrDTO", pixlrDTO);
@@ -358,23 +358,22 @@
 		CoreNotebookConstants.NOTEBOOK_TOOL, PixlrConstants.TOOL_SIGNATURE, pixlrUser.getUserId().intValue());
 
 	if (notebookEntry != null) {
-	    reflectEditForm.setEntryText(notebookEntry.getEntry());
+	    learningForm.setEntryText(notebookEntry.getEntry());
 	}
 
 	LearningWebUtil.putActivityPositionInRequestByToolSessionId(pixlrUser.getPixlrSession().getSessionId(), request,
 		applicationContext.getServletContext());
 
-	request.setAttribute("messageForm", reflectEditForm);
 	return "pages/learning/notebook";
     }
 
     @RequestMapping("/submitReflection")
-    public String submitReflection(@ModelAttribute("messageForm") LearningForm messageForm, HttpServletRequest request,
+    public String submitReflection(@ModelAttribute("learningForm") LearningForm learningForm, HttpServletRequest request,
 	    HttpServletResponse response) {
 
 	// save the reflection entry and call the notebook.
 
-	PixlrUser pixlrUser = this.getCurrentUser(messageForm.getToolSessionID());
+	PixlrUser pixlrUser = this.getCurrentUser(learningForm.getToolSessionID());
 	Long toolSessionID = pixlrUser.getPixlrSession().getSessionId();
 	Integer userID = pixlrUser.getUserId().intValue();
 
@@ -385,10 +384,10 @@
 	if (entry == null) {
 	    // create new entry
 	    pixlrService.createNotebookEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL,
-		    PixlrConstants.TOOL_SIGNATURE, userID, messageForm.getEntryText());
+		    PixlrConstants.TOOL_SIGNATURE, userID, learningForm.getEntryText());
 	} else {
 	    // update existing entry
-	    entry.setEntry(messageForm.getEntryText());
+	    entry.setEntry(learningForm.getEntryText());
 	    entry.setLastModified(new Date());
 	    pixlrService.updateEntry(entry);
 	}
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/MonitoringController.java
===================================================================
diff -u -r46e01bf046d755f571ba59957ac869c086bad58c -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 46e01bf046d755f571ba59957ac869c086bad58c)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -40,6 +40,7 @@
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
@@ -159,10 +160,10 @@
      * @return
      */
     @RequestMapping("/toggleHideImage")
-    public String toggleHideImage(MonitoringForm monitorForm, HttpServletRequest request,
+    public String toggleHideImage(@ModelAttribute("monitoringForm")MonitoringForm monitoringForm, HttpServletRequest request,
 	    HttpServletResponse response) {
 
-	PixlrUser pixlrUser = pixlrService.getUserByUID(monitorForm.getHideUserImageUid());
+	PixlrUser pixlrUser = pixlrService.getUserByUID(monitoringForm.getHideUserImageUid());
 
 	if (pixlrUser.isImageHidden()) {
 	    pixlrUser.setImageHidden(false);
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/forms/AuthoringForm.java
===================================================================
diff -u -r46e01bf046d755f571ba59957ac869c086bad58c -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision 46e01bf046d755f571ba59957ac869c086bad58c)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -23,21 +23,14 @@
 
 package org.lamsfoundation.lams.tool.pixlr.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;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
  *
  */
 @SuppressWarnings("unchecked")
-public class AuthoringForm{
+public class AuthoringForm {
 
     private static final long serialVersionUID = 3950453134542135495L;
 
@@ -59,9 +52,9 @@
 
     String reflectInstructions;
 
-    MultipartFile onlineFile;
+    String onlineFile;
 
-    MultipartFile offlineFile;
+    String offlineFile;
 
     String currentTab;
 
@@ -128,11 +121,11 @@
 	this.lockOnFinished = lockOnFinished;
     }
 
-    public MultipartFile getOfflineFile() {
+    public String getOfflineFile() {
 	return offlineFile;
     }
 
-    public void setOfflineFile(MultipartFile offlineFile) {
+    public void setOfflineFile(String offlineFile) {
 	this.offlineFile = offlineFile;
     }
 
@@ -144,11 +137,11 @@
 	this.offlineInstruction = offlineInstruction;
     }
 
-    public MultipartFile getOnlineFile() {
+    public String getOnlineFile() {
 	return onlineFile;
     }
 
-    public void setOnlineFile(MultipartFile onlineFile) {
+    public void setOnlineFile(String onlineFile) {
 	this.onlineFile = onlineFile;
     }
 
Index: lams_tool_pixlr/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r14949f3bb9736ad6386b56eca018dc1257cb36a1 -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_pixlr/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 14949f3bb9736ad6386b56eca018dc1257cb36a1)
+++ lams_tool_pixlr/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -8,12 +8,6 @@
 <c:set var="UPLOAD_FILE_MAX_SIZE_AS_USER_STRING" scope="request"><%=FileValidatorSpringUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%></c:set>
 
 <lams:html>
-	<c:set var="lams">
-		<lams:LAMSURL />
-	</c:set>
-	<c:set var="tool">
-		<lams:WebAppURL />
-	</c:set>
 
 	<lams:head>
 		<title>
@@ -61,7 +55,7 @@
 				}
 			</script>	
 		
-			<form:form action="updateContent.do" modelAttribute="authoringForm" id="authoringForm" method="post" onsubmit="return validate();">
+			<form:form action="authoring/updateContent.do" modelAttribute="authoringForm" id="authoringForm" method="post" onsubmit="return validate();">
 				<c:set var="sessionMap" value="${sessionScope[authoringForm.sessionMapID]}" />
 				
 				<form:hidden path="currentTab" id="currentTab" />
Index: lams_tool_pixlr/web/pages/learning/notebook.jsp
===================================================================
diff -u -r46e01bf046d755f571ba59957ac869c086bad58c -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_pixlr/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 46e01bf046d755f571ba59957ac869c086bad58c)
+++ lams_tool_pixlr/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -21,7 +21,7 @@
 			}
 			
 			function submitForm(methodName){
-				var f = document.getElementById('messageForm');
+				var f = document.getElementById('learningForm');
 				f.submit();
 			}
 
@@ -34,7 +34,7 @@
 	<body class="stripes">
 		<lams:Page type="learner" title="${pixlrDTO.title}">
 		
-			<form:form action="submitReflection.do" modelAttribute="messageForm" method="post" onsubmit="disableFinishButton();" id="messageForm">
+			<form:form action="submitReflection.do" modelAttribute="learningForm" method="post" onsubmit="disableFinishButton();" id="learningForm">
 				<form:hidden path="toolSessionID" id="toolSessionID"/>
 				<form:hidden path="mode" value="${mode}" />
 				
Index: lams_tool_pixlr/web/pages/learning/pixlr.jsp
===================================================================
diff -u -r46e01bf046d755f571ba59957ac869c086bad58c -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_pixlr/web/pages/learning/pixlr.jsp	(.../pixlr.jsp)	(revision 46e01bf046d755f571ba59957ac869c086bad58c)
+++ lams_tool_pixlr/web/pages/learning/pixlr.jsp	(.../pixlr.jsp)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -94,7 +94,7 @@
 				<%--Reflection--------------------------------------------------%>
 		
 				<c:if test="${pixlrUserDTO.finishedActivity and pixlrDTO.reflectOnActivity and pixlrUserDTO.finishedReflection}">
-					<form:form action="openNotebook.do" method="post" id="reflectEditForm" modelAttribute="reflectEditForm">
+					<form:form action="openNotebook.do" method="post" id="learningForm" modelAttribute="learningForm">
 						<form:hidden path="mode" value="${mode}" />	
 						<form:hidden path="toolSessionID" id="toolSessionID"/>
 						
Index: lams_tool_pixlr/web/pages/learning/viewAll.jsp
===================================================================
diff -u -r46e01bf046d755f571ba59957ac869c086bad58c -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_pixlr/web/pages/learning/viewAll.jsp	(.../viewAll.jsp)	(revision 46e01bf046d755f571ba59957ac869c086bad58c)
+++ lams_tool_pixlr/web/pages/learning/viewAll.jsp	(.../viewAll.jsp)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -26,15 +26,15 @@
 			}
 
 		    function submitForm(methodName) {
-				var f = document.getElementById('messageForm');
+				var f = document.getElementById('learningForm');
 				f.submit();
 			}
 		</script>
 	</lams:head>
 	
 	<body class="stripes">
 		<lams:Page type="learner" title="${pixlrDTO.title}">
-			<form:form action="finishActivity.do" modelAttribute="messageForm" method="post" id="messageForm">
+			<form:form action="finishActivity.do" modelAttribute="learningForm" method="post" id="learningForm">
 				<form:hidden path="toolSessionID" id="toolSessionID"/>
 				<form:hidden path="mode" value="${mode}" />
 				<form:hidden path="redoQuestion" value="true" />
Index: lams_tool_scribe/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u
--- lams_tool_scribe/web/WEB-INF/spring-servlet.xml	(revision 0)
+++ lams_tool_scribe/web/WEB-INF/spring-servlet.xml	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -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.survey.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_scribe/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -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_scribe/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_scribe/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scribe/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -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_scribe/web/WEB-INF/web.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_scribe/web/WEB-INF/web.xml	(.../web.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scribe/web/WEB-INF/web.xml	(.../web.xml)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -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>
 
@@ -116,7 +102,7 @@
 
 
 	<servlet-mapping>
-		<servlet-name>action</servlet-name>
+		<servlet-name>spring</servlet-name>
 		<url-pattern>*.do</url-pattern>
 	</servlet-mapping>
 
Index: lams_tool_scribe/web/common/message.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_scribe/web/common/message.jsp	(.../message.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scribe/web/common/message.jsp	(.../message.jsp)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -1,5 +1,30 @@
+<!DOCTYPE html>
+            
+
 <%@ include file="/common/taglibs.jsp"%>
 
-<p>
-	${requestScope.message};
-</p>
+<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:headItems />
+	</lams:head>
+	<body class="stripes">
+		<lams:Page title=<fmt:message key="pageTitle.authoring" /> type="monitor">
+			<p>
+				${requestScope.message};
+			</p>
+			<div id="footer"></div>
+		</lams:Page>
+	</body>
+</lams:html>
+
+
Index: lams_tool_scribe/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_scribe/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scribe/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -1,52 +1,82 @@
+<!DOCTYPE html>
+            
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.scribe.util.ScribeConstants"%>
 
-<html:form action="/authoring" styleId="authoringForm" method="post" enctype="multipart/form-data">
+<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:headItems />
+		<c:set var="tool">
+			<lams:WebAppURL />
+		</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="title"><fmt:message key="activity.title" /></c:set>
-	<lams:Page title="${title}" type="navbar">
-
-		<lams:Tabs control="true" title="${title}" helpToolSignature="<%= ScribeConstants.TOOL_SIGNATURE %>" helpModule="authoring">
-			<lams:Tab id="1" key="button.basic" />
-			<lams:Tab id="2" key="button.advanced" />
-		</lams:Tabs>
-
-		<html:hidden property="currentTab" styleId="currentTab" />
-		<html:hidden property="dispatch" value="updateContent" />
-		<html:hidden property="sessionMapID" />
-
+		<script type="text/javascript"
+			src="${tool}includes/javascript/authoring.js">
+		</script>
+	</lams:head>
+	<body class="stripes" onload="init();">
+		<html:form action="/authoring" styleId="authoringForm" method="post" enctype="multipart/form-data">
 		
-        <lams:TabBodyArea>
-			<div id="message" style="text-align: center;">
-				<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>			
-			</div>
-	
-			<%-- Page 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>
+			<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="title"><fmt:message key="activity.title" /></c:set>
+			<lams:Page title="${title}" type="navbar">
+		
+				<lams:Tabs control="true" title="${title}" helpToolSignature="<%= ScribeConstants.TOOL_SIGNATURE %>" helpModule="authoring">
+					<lams:Tab id="1" key="button.basic" />
+					<lams:Tab id="2" key="button.advanced" />
+				</lams:Tabs>
+		
+				<html:hidden property="currentTab" styleId="currentTab" />
+				<html:hidden property="dispatch" value="updateContent" />
+				<html:hidden property="sessionMapID" />
+		
+				
+		        <lams:TabBodyArea>
+					<div id="message" style="text-align: center;">
+						<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>			
+					</div>
+			
+					<%-- Page 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:AuthoringButton formID="authoringForm"
+						clearSessionActionUrl="/clearsession.do" toolSignature="lascrb11"
+						cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
+						toolContentID="${sessionMap.toolContentID}"
+						accessMode="${sessionMap.mode}" defineLater="${sessionMap.mode == 'teacher'}"
+						customiseSessionID="${sessionMap.sessionID}"
+						contentFolderID="${sessionMap.contentFolderID}" />
+				</lams:TabBodyArea>
+		
+				<div id="footer"></div>
+		
+			</lams:Page>
+		
+		</html:form>
 
-			<lams:AuthoringButton formID="authoringForm"
-				clearSessionActionUrl="/clearsession.do" toolSignature="lascrb11"
-				cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
-				toolContentID="${sessionMap.toolContentID}"
-				accessMode="${sessionMap.mode}" defineLater="${sessionMap.mode == 'teacher'}"
-				customiseSessionID="${sessionMap.sessionID}"
-				contentFolderID="${sessionMap.contentFolderID}" />
-		</lams:TabBodyArea>
+	</body>
+</lams:html>
+<%@ include file="/common/taglibs.jsp"%>
 
-		<div id="footer"></div>
 
-	</lams:Page>
-
-</html:form>
Index: lams_tool_scribe/web/pages/authoring/headingForm.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_scribe/web/pages/authoring/headingForm.jsp	(.../headingForm.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scribe/web/pages/authoring/headingForm.jsp	(.../headingForm.jsp)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -1,63 +1,84 @@
+<!DOCTYPE html>
+            
 <%@ include file="/common/taglibs.jsp"%>
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
 
-<script type="text/javascript"> 
-	function submitHeading(){
-		for (var i in CKEDITOR.instances) {
-       		CKEDITOR.instances[i].updateElement();
-   		}
-			
-		// after submit, it direct to itemlist.jsp, 
-		// then refresh "basic tab" resource list and close this window.
-	    $.ajax({ // create an AJAX call...
-			data: $("#headingForm").serialize(), 
-	       	type: $("#headingForm").attr('method'),
-			url: $("#headingForm").attr('action'),
-			success: function(data) {
-			   $.ajaxSetup({ cache: true });
-	           $('#itemListArea').html(data);
-			}
-	    });
-	    
-	}
-</script>
+<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:headItems />
+	</lams:head>
+	<body>
+		<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
 
-<html:form action="/authoring" styleId="headingForm" method="post">
-
-	<html:hidden property="dispatch" value="addOrUpdateHeading" />
-	<html:hidden property="sessionMapID" />
-	<html:hidden property="headingIndex" />
-
-	<c:set var="formBean"
-		value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-	<c:set var="sessionMap"
-		value="${sessionScope[formBean.sessionMapID]}" />
-
-	<div class="panel panel-default add-file">
-		<div class="panel-heading panel-title">
-			<fmt:message key="label.authoring.basic.heading.add" />
-		</div>
+		<script type="text/javascript"> 
+			function submitHeading(){
+				for (var i in CKEDITOR.instances) {
+		       		CKEDITOR.instances[i].updateElement();
+		   		}
+					
+				// after submit, it direct to itemlist.jsp, 
+				// then refresh "basic tab" resource list and close this window.
+			    $.ajax({ // create an AJAX call...
+					data: $("#headingForm").serialize(), 
+			       	type: $("#headingForm").attr('method'),
+					url: $("#headingForm").attr('action'),
+					success: function(data) {
+					   $.ajaxSetup({ cache: true });
+			           $('#itemListArea').html(data);
+					}
+			    });
+			    
+			}
+		</script>
 		
-		<div class="panel-body">
-
-			<c:set var="headingText" value="" />
-			<c:if test="${not empty formBean.headingIndex}">
-				<c:set var="headingText">${sessionMap.headings[formBean.headingIndex].headingText}</c:set>
-			</c:if>
+		<html:form action="/authoring" styleId="headingForm" method="post">
 		
-			<lams:CKEditor id="heading" value="${headingText}" contentFolderID="${sessionMap.contentFolderID}"/>
+			<html:hidden property="dispatch" value="addOrUpdateHeading" />
+			<html:hidden property="sessionMapID" />
+			<html:hidden property="headingIndex" />
 		
-			<div class="voffset5 pull-right">
-			    <a href="#" onclick="javascript:hideMessage()" class="btn btn-default btn-sm">
-					<fmt:message key="button.cancel" /> </a>
-				<a href="#" onclick="submitHeading()" class="btn btn-default btn-sm">
-					<i class="fa fa-plus"></i>&nbsp;<fmt:message key="button.submit" /> </a>
-
+			<c:set var="formBean"
+				value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+			<c:set var="sessionMap"
+				value="${sessionScope[formBean.sessionMapID]}" />
+		
+			<div class="panel panel-default add-file">
+				<div class="panel-heading panel-title">
+					<fmt:message key="label.authoring.basic.heading.add" />
+				</div>
 				
+				<div class="panel-body">
+		
+					<c:set var="headingText" value="" />
+					<c:if test="${not empty formBean.headingIndex}">
+						<c:set var="headingText">${sessionMap.headings[formBean.headingIndex].headingText}</c:set>
+					</c:if>
+				
+					<lams:CKEditor id="heading" value="${headingText}" contentFolderID="${sessionMap.contentFolderID}"/>
+				
+					<div class="voffset5 pull-right">
+					    <a href="#" onclick="javascript:hideMessage()" class="btn btn-default btn-sm">
+							<fmt:message key="button.cancel" /> </a>
+						<a href="#" onclick="submitHeading()" class="btn btn-default btn-sm">
+							<i class="fa fa-plus"></i>&nbsp;<fmt:message key="button.submit" /> </a>
+		
+						
+					</div>
+				</div>
 			</div>
-		</div>
-	</div>
-	
-</html:form>
+			
+		</html:form>
+	</body>
+</lams:html>
 
 
+
Index: lams_tool_scribe/web/pages/authoring/headingResponse.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_scribe/web/pages/authoring/headingResponse.jsp	(.../headingResponse.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scribe/web/pages/authoring/headingResponse.jsp	(.../headingResponse.jsp)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -1,17 +1,39 @@
+<!DOCTYPE html>
+            
+
 <%@ include file="/common/taglibs.jsp"%>
 
-<div style="display: none;">
+<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:headItems />
+	</lams:head>
+	<body>
+		<div style="display: none;">
+	
+			<div id="itemList">
+				<%@ include file="parts/headingList.jsp"%>
+			</div>
+		
+			<script lang="javascript">
+				hideMessage();
+				var obj = document.getElementById('itemListArea');
+				obj.innerHTML= document.getElementById("itemList").innerHTML;
+			</script>
+		
+		</div>
+	</body>
+</lams:html>
 
-	<div id="itemList">
-		<%@ include file="parts/headingList.jsp"%>
-	</div>
 
-	<script lang="javascript">
-		hideMessage();
-		var obj = document.getElementById('itemListArea');
-		obj.innerHTML= document.getElementById("itemList").innerHTML;
-	</script>
 
-</div>
 
-
Index: lams_tool_scribe/web/pages/learning/defineLater.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_scribe/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scribe/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -1,11 +1,39 @@
+<!DOCTYPE html>
+	
+
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="title" scope="request">
-	<fmt:message key="activity.title" />
-</c:set>
+<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/common.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	
+	</lams:head>
+	<body class="stripes">
+	<c:set var="title" scope="request">
+		<fmt:message key="activity.title" />
+	</c:set>
+	
+	<lams:Page type="learner" title="${title}">
+		<lams:DefineLater defineLaterMessageKey="message.defineLaterSet" />
+	</lams:Page>
+	</body>
+</lams:html>
 
-<lams:Page type="learner" title="${title}">
-	<lams:DefineLater defineLaterMessageKey="message.defineLaterSet" />
-</lams:Page>
 
 
+
Index: lams_tool_scribe/web/pages/learning/instructions.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_scribe/web/pages/learning/instructions.jsp	(.../instructions.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scribe/web/pages/learning/instructions.jsp	(.../instructions.jsp)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -1,64 +1,91 @@
+<!DOCTYPE html>
+	
+
 <%@ include file="/common/taglibs.jsp"%>
 
-<lams:Page type="learner" title="${scribeDTO.title}">
-
-	<c:set var="appointedScribe">
-		<c:out value="${scribeSessionDTO.appointedScribe}" escapeXml="true" />
+<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/common.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	
+	</lams:head>
+	<body class="stripes">
+		<lams:Page type="learner" title="${scribeDTO.title}">
+		
+			<c:set var="appointedScribe">
+				<c:out value="${scribeSessionDTO.appointedScribe}" escapeXml="true" />
+			</c:set>
+		
+			<c:if test="${role == 'scribe'}">
+				<div class="panel">
+					<p>
+						<fmt:message key="message.scribeInstructions">
+							<fmt:param value="<strong><mark>${appointedScribe}</mark></strong>"></fmt:param>
+						</fmt:message>
+					</p>
+		
+					<p>
+						<fmt:message key="message.scribeInstructions2" />
+					</p>
+		
+					<p>
+						<fmt:message key="message.scribeInstructions3" />
+					</p>
+		
+					<p>
+						<fmt:message key="message.scribeInstructions4" />
+					</p>
+				</div>
+			</c:if>
+		
+			<c:if test="${role == 'learner'}">
+				<div class="panel">
+					<p>
+						<fmt:message key="message.learnerInstructions"/>
+					</p>
+					<p>
+						<fmt:message key="message.learnerInstructions2">
+							<fmt:param value="<strong><mark>${appointedScribe}</mark></strong>"></fmt:param>
+						</fmt:message>
+					</p>
+					<p>
+						<fmt:message key="message.learnerInstructions3" />
+					</p>
+					<p>
+						<fmt:message key="message.learnerInstructions4" />
+					</p>
+				</div>
+		
+		
+		
+			</c:if>
+		
+			<html:form action="/learning.do">
+				<html:hidden property="dispatch" value="startActivity" />
+				<html:hidden property="toolSessionID" />
+				<html:hidden property="mode" value="${MODE}" />
+				<html:submit styleClass="btn btn-primary voffset10 pull-right">
+					<fmt:message key="button.continue" />
+				</html:submit>
+			</html:form>
+		
+		</lams:Page>
+	</body>
+</lams:html>
 
-	<c:if test="${role == 'scribe'}">
-		<div class="panel">
-			<p>
-				<fmt:message key="message.scribeInstructions">
-					<fmt:param value="<strong><mark>${appointedScribe}</mark></strong>"></fmt:param>
-				</fmt:message>
-			</p>
 
-			<p>
-				<fmt:message key="message.scribeInstructions2" />
-			</p>
 
-			<p>
-				<fmt:message key="message.scribeInstructions3" />
-			</p>
-
-			<p>
-				<fmt:message key="message.scribeInstructions4" />
-			</p>
-		</div>
-	</c:if>
-
-	<c:if test="${role == 'learner'}">
-		<div class="panel">
-			<p>
-				<fmt:message key="message.learnerInstructions"/>
-			</p>
-			<p>
-				<fmt:message key="message.learnerInstructions2">
-					<fmt:param value="<strong><mark>${appointedScribe}</mark></strong>"></fmt:param>
-				</fmt:message>
-			</p>
-			<p>
-				<fmt:message key="message.learnerInstructions3" />
-			</p>
-			<p>
-				<fmt:message key="message.learnerInstructions4" />
-			</p>
-		</div>
-
-
-
-	</c:if>
-
-	<html:form action="/learning.do">
-		<html:hidden property="dispatch" value="startActivity" />
-		<html:hidden property="toolSessionID" />
-		<html:hidden property="mode" value="${MODE}" />
-		<html:submit styleClass="btn btn-primary voffset10 pull-right">
-			<fmt:message key="button.continue" />
-		</html:submit>
-	</html:form>
-
-</lams:Page>
-
-
Index: lams_tool_scribe/web/pages/learning/learning.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_scribe/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scribe/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -1,150 +1,182 @@
+<!DOCTYPE html>
+	
+
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="tool">
-	<lams:WebAppURL />
-</c:set>
-
-<c:set var="appointedScribe">
-	<c:out value="${scribeSessionDTO.appointedScribe}" escapeXml="true" />
-</c:set>
-
-<script type="text/javascript" src='<lams:LAMSURL/>includes/javascript/jquery.js'></script>
-<script type="text/javascript">
-	//init the connection with server using server URL but with different protocol
-	var scribeWebsocketInitTime = Date.now(), 
-		scribeWebsocket = new WebSocket('${tool}'.replace('http', 'ws')
-					+ 'learningWebsocket?toolSessionID=' + ${scribeSessionDTO.sessionID}),
-		scribeWebsocketPingTimeout = null,
-		scribeWebsocketPingFunc = null,
-		agreementPercentageLabel = '<fmt:message key="message.voteStatistics" />',
-		reportSubmitted = ${scribeSessionDTO.reportSubmitted};
+<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/>
 		
-	scribeWebsocket.onclose = function(e){
-		if (e.code === 1006 &&
-			Date.now() - scribeWebsocketInitTime > 1000) {
-			location.reload();
-		}
-	};
+		<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
+		<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">
+	
+		</script>
+	</lams:head>
+	
+	<body class="stripes">
+		<c:set var="tool">
+			<lams:WebAppURL />
+		</c:set>
 		
-	scribeWebsocketPingFunc = function(skipPing){
-		if (scribeWebsocket.readyState == scribeWebsocket.CLOSING 
-				|| scribeWebsocket.readyState == scribeWebsocket.CLOSED){
-			if (Date.now() - scribeWebsocketInitTime < 1000) {
-				return;
+		<c:set var="appointedScribe">
+			<c:out value="${scribeSessionDTO.appointedScribe}" escapeXml="true" />
+		</c:set>
+		
+		<script type="text/javascript" src='<lams:LAMSURL/>includes/javascript/jquery.js'></script>
+		<script type="text/javascript">
+			//init the connection with server using server URL but with different protocol
+			var scribeWebsocketInitTime = Date.now(), 
+				scribeWebsocket = new WebSocket('${tool}'.replace('http', 'ws')
+							+ 'learningWebsocket?toolSessionID=' + ${scribeSessionDTO.sessionID}),
+				scribeWebsocketPingTimeout = null,
+				scribeWebsocketPingFunc = null,
+				agreementPercentageLabel = '<fmt:message key="message.voteStatistics" />',
+				reportSubmitted = ${scribeSessionDTO.reportSubmitted};
+				
+			scribeWebsocket.onclose = function(e){
+				if (e.code === 1006 &&
+					Date.now() - scribeWebsocketInitTime > 1000) {
+					location.reload();
+				}
+			};
+				
+			scribeWebsocketPingFunc = function(skipPing){
+				if (scribeWebsocket.readyState == scribeWebsocket.CLOSING 
+						|| scribeWebsocket.readyState == scribeWebsocket.CLOSED){
+					if (Date.now() - scribeWebsocketInitTime < 1000) {
+						return;
+					}
+					location.reload();
+				}
+				
+				// check and ping every 3 minutes
+				scribeWebsocketPingTimeout = setTimeout(scribeWebsocketPingFunc, 3*60*1000);
+				// initial set up does not send ping
+				if (!skipPing) {
+					scribeWebsocket.send("ping");
+				}
+			};
+			
+			// set up timer for the first time
+			scribeWebsocketPingFunc(true);
+			
+			// run when the server pushes new reports and vote statistics
+			scribeWebsocket.onmessage = function(e) {
+				// create JSON object
+				var input = JSON.parse(e.data),
+					agreeButton = $('#agreeButton').parent();
+				
+				// if the scribe or monitor force completes the activity, reload to display report page
+				if (input.close) {
+					window.location.href = '${tool}learning.do?toolSessionID=${scribeSessionDTO.sessionID}&mode=${MODE}';
+					return;
+				}
+		
+				// reset ping timer
+				clearTimeout(scribeWebsocketPingTimeout);
+				scribeWebsocketPingFunc(true);
+				
+				// only changed reports will be sent
+				if (input.reports) {
+					reportSubmitted = true;
+					$.each(input.reports, function() {
+						$('#reportText-' + this.uid).html(this.text);
+					});
+				}
+				
+				// can the user vote
+				if (!reportSubmitted || input.approved) {
+					agreeButton.hide();
+				} else {
+					agreeButton.show();
+				}
+				
+				// update vote statistics
+				var label = agreementPercentageLabel.replace('{0}', input.numberOfVotes)
+													.replace('{1}', input.numberOfLearners);
+				$('#agreementPercentageLabel').text(label);
+				$('#agreementPercentage').text('(' + input.votePercentage + '%)');
+				$('#agreementPercentageBar').attr('aria-valuenow', input.votePercentage)
+											.css('width',input.votePercentage + '%');
+			};
+			
+			function submitApproval() {
+				var agreeButton = $('#agreeButton').parent(),
+					data = {
+						type : 'vote'	
+					};
+				scribeWebsocket.send(JSON.stringify(data));
+				
+				agreeButton.hide();
 			}
-			location.reload();
-		}
+		</script>
 		
-		// check and ping every 3 minutes
-		scribeWebsocketPingTimeout = setTimeout(scribeWebsocketPingFunc, 3*60*1000);
-		// initial set up does not send ping
-		if (!skipPing) {
-			scribeWebsocket.send("ping");
-		}
-	};
-	
-	// set up timer for the first time
-	scribeWebsocketPingFunc(true);
-	
-	// run when the server pushes new reports and vote statistics
-	scribeWebsocket.onmessage = function(e) {
-		// create JSON object
-		var input = JSON.parse(e.data),
-			agreeButton = $('#agreeButton').parent();
+		<lams:Page type="learner" title="${scribeDTO.title}">
 		
-		// if the scribe or monitor force completes the activity, reload to display report page
-		if (input.close) {
-			window.location.href = '${tool}learning.do?toolSessionID=${scribeSessionDTO.sessionID}&mode=${MODE}';
-			return;
-		}
-
-		// reset ping timer
-		clearTimeout(scribeWebsocketPingTimeout);
-		scribeWebsocketPingFunc(true);
+			<div class="panel">
+				<c:out value="${scribeDTO.instructions}" escapeXml="false" />
+			</div>
 		
-		// only changed reports will be sent
-		if (input.reports) {
-			reportSubmitted = true;
-			$.each(input.reports, function() {
-				$('#reportText-' + this.uid).html(this.text);
-			});
-		}
+			<%@include file="/pages/parts/voteDisplay.jsp"%>
 		
-		// can the user vote
-		if (!reportSubmitted || input.approved) {
-			agreeButton.hide();
-		} else {
-			agreeButton.show();
-		}
+			<h4>
+				<abbr class="pull-right hidden-xs"
+					title="<fmt:message key="message.learnerInstructions2" ><fmt:param value="${appointedScribe}"/></fmt:message>&nbsp;<fmt:message key="message.learnerInstructions3" />"><i
+					class="fa fa-question-circle text-info"></i></abbr>
+				<fmt:message key="heading.report" />
+			</h4>
+			<p class="help-block" style="font-size: 12px"><fmt:message key="activity.title"/>: ${appointedScribe}</p>
 		
-		// update vote statistics
-		var label = agreementPercentageLabel.replace('{0}', input.numberOfVotes)
-											.replace('{1}', input.numberOfLearners);
-		$('#agreementPercentageLabel').text(label);
-		$('#agreementPercentage').text('(' + input.votePercentage + '%)');
-		$('#agreementPercentageBar').attr('aria-valuenow', input.votePercentage)
-									.css('width',input.votePercentage + '%');
-	};
-	
-	function submitApproval() {
-		var agreeButton = $('#agreeButton').parent(),
-			data = {
-				type : 'vote'	
-			};
-		scribeWebsocket.send(JSON.stringify(data));
+				<c:forEach var="reportDTO" items="${scribeSessionDTO.reportDTOs}">
 		
-		agreeButton.hide();
-	}
-</script>
-
-<lams:Page type="learner" title="${scribeDTO.title}">
-
-	<div class="panel">
-		<c:out value="${scribeDTO.instructions}" escapeXml="false" />
-	</div>
-
-	<%@include file="/pages/parts/voteDisplay.jsp"%>
-
-	<h4>
-		<abbr class="pull-right hidden-xs"
-			title="<fmt:message key="message.learnerInstructions2" ><fmt:param value="${appointedScribe}"/></fmt:message>&nbsp;<fmt:message key="message.learnerInstructions3" />"><i
-			class="fa fa-question-circle text-info"></i></abbr>
-		<fmt:message key="heading.report" />
-	</h4>
-	<p class="help-block" style="font-size: 12px"><fmt:message key="activity.title"/>: ${appointedScribe}</p>
-
-		<c:forEach var="reportDTO" items="${scribeSessionDTO.reportDTOs}">
-
-			<div class="row">
-				<div class="col-xs-12">
-					<div class="panel panel-default">
-						<div class="panel-heading panel-title">
-							<c:out value="${reportDTO.headingDTO.headingText}" escapeXml="false" />
+					<div class="row">
+						<div class="col-xs-12">
+							<div class="panel panel-default">
+								<div class="panel-heading panel-title">
+									<c:out value="${reportDTO.headingDTO.headingText}" escapeXml="false" />
+								</div>
+								<div class="panel-body">
+									<abbr class="pull-right hidden-xs" title="<fmt:message key="label.scribe.posted" />"><i
+										class="fa fa-xs fa-question-circle text-info"></i></abbr>
+		
+									<c:set var="entry">
+										<lams:out value="${reportDTO.entryText}" escapeHtml="true" />
+									</c:set>
+									<span id="reportText-${reportDTO.uid}"><c:out value="${entry}" escapeXml="false" /></span>
+								</div>
+							</div>
 						</div>
-						<div class="panel-body">
-							<abbr class="pull-right hidden-xs" title="<fmt:message key="label.scribe.posted" />"><i
-								class="fa fa-xs fa-question-circle text-info"></i></abbr>
-
-							<c:set var="entry">
-								<lams:out value="${reportDTO.entryText}" escapeHtml="true" />
-							</c:set>
-							<span id="reportText-${reportDTO.uid}"><c:out value="${entry}" escapeXml="false" /></span>
-						</div>
 					</div>
+		
+				</c:forEach>
+		
+				<div class="row">
+					<div class="col-xs-12" id="agreeButton">
+						<button class="btn btn-success pull-left" onClick="javascript:submitApproval()">
+							<fmt:message key="button.agree" />
+						</button>
+					</div>
 				</div>
-			</div>
+		
+		
+			<div id="footer"></div>
+		
+		</lams:Page>
+			
+	</body>
+</lams:html>
 
-		</c:forEach>
-
-		<div class="row">
-			<div class="col-xs-12" id="agreeButton">
-				<button class="btn btn-success pull-left" onClick="javascript:submitApproval()">
-					<fmt:message key="button.agree" />
-				</button>
-			</div>
-		</div>
-
-
-	<div id="footer"></div>
-
-</lams:Page>
\ No newline at end of file
Index: lams_tool_scribe/web/pages/learning/notebook.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_scribe/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scribe/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -1,49 +1,76 @@
+<!DOCTYPE html>
+	
+
 <%@ include file="/common/taglibs.jsp"%>
 
-<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="${scribeDTO.title}">
-
-	<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
-		<html:hidden property="dispatch" value="submitReflection" />
-		<html:hidden property="scribeUserUID" />
-
-		<div class="panel">
-			<lams:out value="${scribeDTO.reflectInstructions}" escapeHtml="true"/>
-		</div>
-
-		<html:textarea rows="5" styleId="focused" property="entryText"
-			styleClass="form-control"></html:textarea>
-
+<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/>
 		
-			<html:link href="#nogo" styleClass="btn btn-primary voffset10 pull-right na" styleId="finishButton" onclick="submitForm('finish')">
-				<span class="nextActivity">
-					<c:choose>
-	 					<c:when test="${activityPosition.last}">
-	 						<fmt:message key="button.submitActivity" />
-	 					</c:when>
-	 					<c:otherwise>
-	 		 				<fmt:message key="button.finish" />
-	 					</c:otherwise>
-	 				</c:choose>
-	 			</span>
-			</html:link>
+		<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	
+	</lams:head>
+	<body class="stripes">
+		<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="${scribeDTO.title}">
+		
+			<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
+				<html:hidden property="dispatch" value="submitReflection" />
+				<html:hidden property="scribeUserUID" />
+		
+				<div class="panel">
+					<lams:out value="${scribeDTO.reflectInstructions}" escapeHtml="true"/>
+				</div>
+		
+				<html:textarea rows="5" styleId="focused" property="entryText"
+					styleClass="form-control"></html:textarea>
+		
+				
+					<html:link href="#nogo" styleClass="btn btn-primary voffset10 pull-right na" styleId="finishButton" onclick="submitForm('finish')">
+						<span class="nextActivity">
+							<c:choose>
+			 					<c:when test="${activityPosition.last}">
+			 						<fmt:message key="button.submitActivity" />
+			 					</c:when>
+			 					<c:otherwise>
+			 		 				<fmt:message key="button.finish" />
+			 					</c:otherwise>
+			 				</c:choose>
+			 			</span>
+					</html:link>
+		
+			</html:form>
+		</lams:Page>
+		
+		
+		<script type="text/javascript">
+			window.onload = function() {
+				document.getElementById("focused").focus();
+			}
+		</script>
+	</body>
+</lams:html>
 
-	</html:form>
-</lams:Page>
 
-
-<script type="text/javascript">
-	window.onload = function() {
-		document.getElementById("focused").focus();
-	}
-</script>
-
Index: lams_tool_scribe/web/pages/learning/report.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_scribe/web/pages/learning/report.jsp	(.../report.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scribe/web/pages/learning/report.jsp	(.../report.jsp)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -1,15 +1,42 @@
+<!DOCTYPE html>
+	
+
 <%@ include file="/common/taglibs.jsp"%>
 
-<lams:Page type="learner" title="${scribeDTO.title}">
-
-	<%@ include file="parts/reportBody.jsp"%>
-
+<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'}">
-		<%@ include file="parts/finishButton.jsp"%>
-	</c:if>
-</div>
+	<lams:head>
+		<title>
+			<fmt:message key="activity.title" />
+		</title>
+		<lams:css/>
+		
+		<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	
+	</lams:head>
+	<body class="stripes">
+		<lams:Page type="learner" title="${scribeDTO.title}">
+		
+			<%@ include file="parts/reportBody.jsp"%>
+		
+			
+			<c:if test="${MODE == 'learner' || MODE == 'author'}">
+				<%@ include file="parts/finishButton.jsp"%>
+			</c:if>
+		</div>
+		
+		<div id="footer"></div>
+		
+		</lams:Page>
+	</body>
+</lams:html>
 
-<div id="footer"></div>
-
-</lams:Page>
\ No newline at end of file
Index: lams_tool_scribe/web/pages/learning/scribe.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_scribe/web/pages/learning/scribe.jsp	(.../scribe.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scribe/web/pages/learning/scribe.jsp	(.../scribe.jsp)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -1,197 +1,225 @@
+<!DOCTYPE html>
+	
+
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
-<c:set var="tool">
-	<lams:WebAppURL />
-</c:set>
-
-<script type="text/javascript" src='${lams}includes/javascript/jquery.js'></script>
-<script type="text/javascript">
-	$(document).ready(function(){
-		// focus on the first report input
-		$('textarea[id^="report-"]').first().focus();
-	});
-
-	//init the connection with server using server URL but with different protocol
-	var scribeWebsocket = new WebSocket('${tool}'.replace('http', 'ws')
-					+ 'learningWebsocket?toolSessionID=' + ${scribeSessionDTO.sessionID}),
-		scribeWebsocketPingTimeout = null,
-		scribeWebsocketPingFunc = null,
-		agreementPercentageLabel = '<fmt:message key="message.voteStatistics" />',
-		reportSubmitted = ${scribeSessionDTO.reportSubmitted};
+<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/>
 		
-	scribeWebsocketPingFunc = function(skipPing){
-		if (scribeWebsocket.readyState == scribeWebsocket.CLOSING 
-				|| scribeWebsocket.readyState == scribeWebsocket.CLOSED){
-			location.reload();
-		}
+		<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	
+	</lams:head>
+	<body class="stripes">
+		<c:set var="lams">
+			<lams:LAMSURL />
+		</c:set>
+		<c:set var="tool">
+			<lams:WebAppURL />
+		</c:set>
 		
-		// check and ping every 3 minutes
-		scribeWebsocketPingTimeout = setTimeout(scribeWebsocketPingFunc, 3*60*1000);
-		// initial set up does not send ping
-		if (!skipPing) {
-			scribeWebsocket.send("ping");
-		}
-	};
-	// set up timer for the first time
-	scribeWebsocketPingFunc(true);
- 	
- 	scribeWebsocket.onclose = function(e){
- 		// react only on abnormal close
- 		if (e.code === 1006) {
- 	 		location.reload();
- 		}
- 	};
- 	
-	// run when the server pushes new reports and vote statistics
-	scribeWebsocket.onmessage = function(e) {
-		// create JSON object
-		var input = JSON.parse(e.data),
-			agreeButton = $('#agreeButton');
+		<script type="text/javascript" src='${lams}includes/javascript/jquery.js'></script>
+		<script type="text/javascript">
+			$(document).ready(function(){
+				// focus on the first report input
+				$('textarea[id^="report-"]').first().focus();
+			});
 		
-		// if the scribe or monitor force completes the activity, reload to display report page
-		if (input.close) {
-			window.location.href = '${tool}learning.do?toolSessionID=${scribeSessionDTO.sessionID}&mode=${MODE}';
-			return;
-		}
+			//init the connection with server using server URL but with different protocol
+			var scribeWebsocket = new WebSocket('${tool}'.replace('http', 'ws')
+							+ 'learningWebsocket?toolSessionID=' + ${scribeSessionDTO.sessionID}),
+				scribeWebsocketPingTimeout = null,
+				scribeWebsocketPingFunc = null,
+				agreementPercentageLabel = '<fmt:message key="message.voteStatistics" />',
+				reportSubmitted = ${scribeSessionDTO.reportSubmitted};
+				
+			scribeWebsocketPingFunc = function(skipPing){
+				if (scribeWebsocket.readyState == scribeWebsocket.CLOSING 
+						|| scribeWebsocket.readyState == scribeWebsocket.CLOSED){
+					location.reload();
+				}
+				
+				// check and ping every 3 minutes
+				scribeWebsocketPingTimeout = setTimeout(scribeWebsocketPingFunc, 3*60*1000);
+				// initial set up does not send ping
+				if (!skipPing) {
+					scribeWebsocket.send("ping");
+				}
+			};
+			// set up timer for the first time
+			scribeWebsocketPingFunc(true);
+		 	
+		 	scribeWebsocket.onclose = function(e){
+		 		// react only on abnormal close
+		 		if (e.code === 1006) {
+		 	 		location.reload();
+		 		}
+		 	};
+		 	
+			// run when the server pushes new reports and vote statistics
+			scribeWebsocket.onmessage = function(e) {
+				// create JSON object
+				var input = JSON.parse(e.data),
+					agreeButton = $('#agreeButton');
+				
+				// if the scribe or monitor force completes the activity, reload to display report page
+				if (input.close) {
+					window.location.href = '${tool}learning.do?toolSessionID=${scribeSessionDTO.sessionID}&mode=${MODE}';
+					return;
+				}
+				
+				// reset ping timer
+				clearTimeout(scribeWebsocketPingTimeout);
+				scribeWebsocketPingFunc(true);
+				
+				// only changed reports will be sent
+				if (input.reports) {
+					$.each(input.reports, function() {
+						$('#reportText-' + this.uid).html(this.text);
+					});
+				}
+				
+				// can the user vote
+				if (!reportSubmitted || input.approved) {
+					agreeButton.hide();
+				} else {
+					agreeButton.show();
+				}
+				
+				// update vote statistics 
+				var label = agreementPercentageLabel.replace('{0}', input.numberOfVotes)
+													.replace('{1}', input.numberOfLearners);
+				$('#agreementPercentageLabel').text(label);
+				$('#agreementPercentage').text('(' + input.votePercentage + '%)');
+				$('#agreementPercentageBar').attr('aria-valuenow', input.votePercentage)
+											.css('width',input.votePercentage + '%');
+			}
+			
+			function submitApproval() {
+				var data = {
+						type : 'vote'	
+					};
+				scribeWebsocket.send(JSON.stringify(data));
+				
+				$('#agreeButton').hide();
+			}
+			
+			function submitReport() {
+				var reports = [],
+					data = {
+						type : 'submitReport'	
+					};
+				// get each report part (heading) text
+				$('textarea[id^="report-"]').each(function(){
+					reports.push({
+						'uid'  : $(this).attr('id').split('-')[1],
+						'text' : $(this).val() 
+					});
+				});
+				data.reports = reports;
+				scribeWebsocket.send(JSON.stringify(data));
+				
+				reportSubmitted = true;
+			}
 		
-		// reset ping timer
-		clearTimeout(scribeWebsocketPingTimeout);
-		scribeWebsocketPingFunc(true);
+			function confirmForceComplete() {
+				return confirm("<fmt:message key='message.confirmForceComplete'/>");
+			}
+		</script>
 		
-		// only changed reports will be sent
-		if (input.reports) {
-			$.each(input.reports, function() {
-				$('#reportText-' + this.uid).html(this.text);
-			});
-		}
+		<lams:Page type="learner" title="${scribeDTO.title}">
 		
-		// can the user vote
-		if (!reportSubmitted || input.approved) {
-			agreeButton.hide();
-		} else {
-			agreeButton.show();
-		}
+			<div class="panel">
+				<c:out value="${scribeDTO.instructions}" escapeXml="false" />		
+			</div>
 		
-		// update vote statistics 
-		var label = agreementPercentageLabel.replace('{0}', input.numberOfVotes)
-											.replace('{1}', input.numberOfLearners);
-		$('#agreementPercentageLabel').text(label);
-		$('#agreementPercentage').text('(' + input.votePercentage + '%)');
-		$('#agreementPercentageBar').attr('aria-valuenow', input.votePercentage)
-									.css('width',input.votePercentage + '%');
-	}
-	
-	function submitApproval() {
-		var data = {
-				type : 'vote'	
-			};
-		scribeWebsocket.send(JSON.stringify(data));
+			<div id="voteDisplay">
+				<%@include file="/pages/parts/voteDisplay.jsp"%>
+			</div>
 		
-		$('#agreeButton').hide();
-	}
-	
-	function submitReport() {
-		var reports = [],
-			data = {
-				type : 'submitReport'	
-			};
-		// get each report part (heading) text
-		$('textarea[id^="report-"]').each(function(){
-			reports.push({
-				'uid'  : $(this).attr('id').split('-')[1],
-				'text' : $(this).val() 
-			});
-		});
-		data.reports = reports;
-		scribeWebsocket.send(JSON.stringify(data));
+			<h4>
+				<abbr class="pull-right hidden-xs" title="<fmt:message key="message.scribeInstructions2" />&nbsp;<fmt:message key="message.scribeInstructions3" />"><i
+											class="fa fa-question-circle text-info"></i></abbr>
+				<fmt:message key="heading.report" />
+			</h4>
+			<c:forEach var="reportDTO" items="${scribeSessionDTO.reportDTOs}">
+				<div class="row">
+					<div class="col-xs-12">
+						<div class="panel panel-default">
+							<div class="panel-heading panel-title">
+								<c:out value="${reportDTO.headingDTO.headingText}" escapeXml="false" />
+							</div>
+							<div class="panel-body">
 		
-		reportSubmitted = true;
-	}
-
-	function confirmForceComplete() {
-		return confirm("<fmt:message key='message.confirmForceComplete'/>");
-	}
-</script>
-
-<lams:Page type="learner" title="${scribeDTO.title}">
-
-	<div class="panel">
-		<c:out value="${scribeDTO.instructions}" escapeXml="false" />		
-	</div>
-
-	<div id="voteDisplay">
-		<%@include file="/pages/parts/voteDisplay.jsp"%>
-	</div>
-
-	<h4>
-		<abbr class="pull-right hidden-xs" title="<fmt:message key="message.scribeInstructions2" />&nbsp;<fmt:message key="message.scribeInstructions3" />"><i
-									class="fa fa-question-circle text-info"></i></abbr>
-		<fmt:message key="heading.report" />
-	</h4>
-	<c:forEach var="reportDTO" items="${scribeSessionDTO.reportDTOs}">
-		<div class="row">
-			<div class="col-xs-12">
-				<div class="panel panel-default">
-					<div class="panel-heading panel-title">
-						<c:out value="${reportDTO.headingDTO.headingText}" escapeXml="false" />
-					</div>
-					<div class="panel-body">
-
-						<div class="panel-warning panel-body bg-warning">
-							<abbr class="pull-right hidden-xs" title="<fmt:message key="label.what.others.see" />"><i
-								class="fa fa-xs fa-question-circle text-info"></i></abbr>
-
-							<c:set var="entry">
-								<lams:out value="${reportDTO.entryText}" escapeHtml="true" />
-							</c:set>
-							<span id="reportText-${reportDTO.uid}"><c:out value="${entry}" escapeXml="false" /></span>
+								<div class="panel-warning panel-body bg-warning">
+									<abbr class="pull-right hidden-xs" title="<fmt:message key="label.what.others.see" />"><i
+										class="fa fa-xs fa-question-circle text-info"></i></abbr>
+		
+									<c:set var="entry">
+										<lams:out value="${reportDTO.entryText}" escapeHtml="true" />
+									</c:set>
+									<span id="reportText-${reportDTO.uid}"><c:out value="${entry}" escapeXml="false" /></span>
+								</div>
+		
+								<c:if test="${not scribeUserDTO.finishedActivity}">
+									<textarea id="report-${reportDTO.uid}" rows="6"
+										class="form-control voffset5">${reportDTO.entryText}</textarea>
+								</c:if>
+							</div>
 						</div>
-
-						<c:if test="${not scribeUserDTO.finishedActivity}">
-							<textarea id="report-${reportDTO.uid}" rows="6"
-								class="form-control voffset5">${reportDTO.entryText}</textarea>
-						</c:if>
 					</div>
 				</div>
+			</c:forEach>
+		
+			<c:if test="${not scribeUserDTO.finishedActivity}">
+				<div class="row">
+					<div class="col-xs-12" id="submitReportBtn">
+						<button class="btn btn-sm btn-default pull-right" onClick="javascript:submitReport()">
+							<fmt:message key="button.submitReport" />
+						</button>
+					</div>
+				</div>
+			</c:if>
+		
+		
+			<hr>
+		
+		
+			<html:form action="learning" onsubmit="return confirmForceComplete();">
+				<html:hidden property="dispatch" value="forceCompleteActivity" />
+				<html:hidden property="scribeUserUID" value="${scribeUserDTO.uid}" />
+				<html:hidden property="mode" />
+		
+				<div id="forceCompleteBtn">
+					<html:submit styleClass="btn btn-primary pull-right">
+						<fmt:message key="button.forceComplete" />
+					</html:submit>
+				</div>
+			</html:form>
+		
+			<div id="agreeButton">
+				<a id="agreeButton" class="btn btn-success pull-left" onclick="javascript:submitApproval();"> <fmt:message
+						key="button.agree" />
+				</a>
 			</div>
-		</div>
-	</c:forEach>
+		
+			<div id="footer"></div>
+		
+		</lams:Page>
+			
+	</body>
+</lams:html>
 
-	<c:if test="${not scribeUserDTO.finishedActivity}">
-		<div class="row">
-			<div class="col-xs-12" id="submitReportBtn">
-				<button class="btn btn-sm btn-default pull-right" onClick="javascript:submitReport()">
-					<fmt:message key="button.submitReport" />
-				</button>
-			</div>
-		</div>
-	</c:if>
-
-
-	<hr>
-
-
-	<html:form action="learning" onsubmit="return confirmForceComplete();">
-		<html:hidden property="dispatch" value="forceCompleteActivity" />
-		<html:hidden property="scribeUserUID" value="${scribeUserDTO.uid}" />
-		<html:hidden property="mode" />
-
-		<div id="forceCompleteBtn">
-			<html:submit styleClass="btn btn-primary pull-right">
-				<fmt:message key="button.forceComplete" />
-			</html:submit>
-		</div>
-	</html:form>
-
-	<div id="agreeButton">
-		<a id="agreeButton" class="btn btn-success pull-left" onclick="javascript:submitApproval();"> <fmt:message
-				key="button.agree" />
-		</a>
-	</div>
-
-	<div id="footer"></div>
-
-</lams:Page>
\ No newline at end of file
Index: lams_tool_scribe/web/pages/learning/waitForScribe.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_scribe/web/pages/learning/waitForScribe.jsp	(.../waitForScribe.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scribe/web/pages/learning/waitForScribe.jsp	(.../waitForScribe.jsp)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -1,19 +1,47 @@
+<!DOCTYPE html>
+	
+
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="title" scope="request">
-	<fmt:message key="activity.title" />
-</c:set>
-<c:set var="msg" scope="request">
-	<fmt:message key="message.waitForScribe" />
-</c:set>
+<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/common.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	
+	</lams:head>
+	<body class="stripes">
+		<c:set var="title" scope="request">
+			<fmt:message key="activity.title" />
+		</c:set>
+		<c:set var="msg" scope="request">
+			<fmt:message key="message.waitForScribe" />
+		</c:set>
+		
+		<lams:Page type="learner" title="${title}">
+			<p>
+				<c:out value="${msg}"/>
+			</p>
+		
+		
+				<a href="javascript:location.reload(true);" class="btn btn-primary voffset10 pull-right"><fmt:message
+			key="button.try.again" /> </a>
+		</lams:Page>
+	</body>
+</lams:html>
 
-<lams:Page type="learner" title="${title}">
-	<p>
-		<c:out value="${msg}"/>
-	</p>
 
 
-		<a href="javascript:location.reload(true);" class="btn btn-primary voffset10 pull-right"><fmt:message
-	key="button.try.again" /> </a>
-</lams:Page>
-
Index: lams_tool_scribe/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_scribe/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scribe/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -1,21 +1,49 @@
+<!DOCTYPE html>
+            
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.scribe.util.ScribeConstants"%>
 
-<c:set var="title"><fmt:message key="activity.title" /></c:set>
-<lams:Page title="${title}" type="navbar">
-	<lams:Tabs title="${title}" control="true" helpToolSignature="<%= ScribeConstants.TOOL_SIGNATURE %>" helpModule="monitoring">
-		<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:head>
+		<title>
+			<fmt:message key="activity.title" />
+		</title>
+		<lams:headItems />
+		<c:set var="tool">
+			<lams:WebAppURL />
+		</c:set>
+		
+		<script type="text/javascript"
+			src="${tool}includes/javascript/monitoring.js">
+		</script>
+	</lams:head>
+	<body class="stripes" onload="init();">
+		<c:set var="title"><fmt:message key="activity.title" /></c:set>
+		<lams:Page title="${title}" type="navbar">
+			<lams:Tabs title="${title}" control="true" helpToolSignature="<%= ScribeConstants.TOOL_SIGNATURE %>" helpModule="monitoring">
+				<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>
 
-	<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>
\ No newline at end of file
Index: lams_tool_scribe/web/pages/monitoring/notebook.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_scribe/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scribe/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -1,7 +1,35 @@
+<!DOCTYPE html>
+            
+
 <%@ include file="/common/taglibs.jsp"%>
 
-<h4>
-	<c:out value="${scribeUserDTO.firstName} ${scribeUserDTO.lastName}" escapeXml="true"/>
-</h4>
-<p><lams:out value="${scribeUserDTO.notebookEntry}" escapeHtml="true"/></p>
+<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:headItems />
+	</lams:head>
+	<body class="stripes">
+		<tiles:useAttribute name="pageTitleKey" ignore="true"/>
+		<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
+		<c:set var="title"><fmt:message key="${pTitleKey}" /></c:set>
+		<lams:Page title="${title}" type="monitor">
+			<h4>
+				<c:out value="${scribeUserDTO.firstName} ${scribeUserDTO.lastName}" escapeXml="true"/>
+			</h4>
+			<p><lams:out value="${scribeUserDTO.notebookEntry}" escapeHtml="true"/></p>
+			<div id="footer"></div>
+		</lams:Page>
+	</body>
+</lams:html>
 
+
+
Index: lams_tool_videorecorder/.classpath
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_videorecorder/.classpath	(.../.classpath)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_videorecorder/.classpath	(.../.classpath)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -3,10 +3,9 @@
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/hibernate/main/hibernate-core-5.0.10.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/hibernate-core">
 		<attributes>
-			<attribute name="javadoc_location" value="http://docs.jboss.org/hibernate/orm/4.3/javadocs/" />
+			<attribute name="javadoc_location" value="http://docs.jboss.org/hibernate/orm/4.3/javadocs/"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_3.1_spec-1.0.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/servlet-api">
@@ -19,11 +18,12 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_learning"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_monitoring"/>
-	<classpathentry kind="output" path="bin"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.2.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/lang/main/commons-lang-2.6.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-lang">
 		<attributes>
 			<attribute name="javadoc_location" value="http://commons.apache.org/proper/commons-lang/javadocs/api-2.6/"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/noStruts"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
Fisheye: Tag 2d2c869032858b474398c651f8c45371410ba0d2 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/AuthoringAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2d2c869032858b474398c651f8c45371410ba0d2 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2d2c869032858b474398c651f8c45371410ba0d2 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/MonitoringAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/controller/AuthoringController.java
===================================================================
diff -u
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/controller/AuthoringController.java	(revision 0)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/controller/AuthoringController.java	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -0,0 +1,37 @@
+/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+/* $$Id$$ */
+
+package org.lamsfoundation.lams.tool.videoRecorder.web.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+@RequestMapping("/authoring")
+public class AuthoringController {
+    @RequestMapping("")
+    protected String unspecified() {
+	return "index";
+    }
+}
\ No newline at end of file
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/controller/LearningController.java
===================================================================
diff -u
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/controller/LearningController.java	(revision 0)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/controller/LearningController.java	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -0,0 +1,57 @@
+/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+/* $$Id$$ */
+
+package org.lamsfoundation.lams.tool.videoRecorder.web.controller;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.lamsfoundation.lams.learning.service.ILearnerService;
+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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.context.WebApplicationContext;
+
+@Controller
+@RequestMapping("/learning")
+public class LearningController {
+
+    @Autowired
+    private WebApplicationContext applicationContext;
+
+    @RequestMapping("")
+    public String unspecified(HttpServletRequest request) throws Exception {
+	HttpSession ss = SessionManager.getSession();
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
+
+	ILearnerService learnerService = (ILearnerService) applicationContext.getBean("learnerService");
+	String finishURL = learnerService.completeToolSession(toolSessionId, user.getUserID().longValue());
+	return "index";
+    }
+}
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/controller/MonitoringController.java
===================================================================
diff -u
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/controller/MonitoringController.java	(revision 0)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/controller/MonitoringController.java	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -0,0 +1,37 @@
+/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+/* $$Id$$ */
+
+package org.lamsfoundation.lams.tool.videoRecorder.web.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+@RequestMapping("/monitoring")
+public class MonitoringController {
+    @RequestMapping("")
+    public String unspecified() {
+	return "index";
+    }
+}
\ No newline at end of file
Index: lams_tool_videorecorder/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u
--- lams_tool_videorecorder/web/WEB-INF/spring-servlet.xml	(revision 0)
+++ lams_tool_videorecorder/web/WEB-INF/spring-servlet.xml	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -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.videoRecorder.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
Fisheye: Tag 2d2c869032858b474398c651f8c45371410ba0d2 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/struts-config.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_videorecorder/web/WEB-INF/web.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2d2c869032858b474398c651f8c45371410ba0d2
--- lams_tool_videorecorder/web/WEB-INF/web.xml	(.../web.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_videorecorder/web/WEB-INF/web.xml	(.../web.xml)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -37,24 +37,15 @@
 	</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>1</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>
-
+	
 	<servlet-mapping>
-		<servlet-name>action</servlet-name>
+		<servlet-name>spring</servlet-name>
 		<url-pattern>*.do</url-pattern>
 	</servlet-mapping>
 
Fisheye: Tag 2d2c869032858b474398c651f8c45371410ba0d2 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/index.html'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_videorecorder/web/index.jsp
===================================================================
diff -u
--- lams_tool_videorecorder/web/index.jsp	(revision 0)
+++ lams_tool_videorecorder/web/index.jsp	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
@@ -0,0 +1,5 @@
+<html>
+	<body>
+		This tool is not supported anymore.
+	</body>
+</html>
\ No newline at end of file