Fisheye: Tag 6c3d39685a1c47ef53b41a1eb29818b6f23f85cc refers to a dead (removed) revision in file `lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6c3d39685a1c47ef53b41a1eb29818b6f23f85cc refers to a dead (removed) revision in file `lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/ClearSessionAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6c3d39685a1c47ef53b41a1eb29818b6f23f85cc refers to a dead (removed) revision in file `lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6c3d39685a1c47ef53b41a1eb29818b6f23f85cc refers to a dead (removed) revision in file `lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6c3d39685a1c47ef53b41a1eb29818b6f23f85cc refers to a dead (removed) revision in file `lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/PedagogicalPlannerAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6c3d39685a1c47ef53b41a1eb29818b6f23f85cc refers to a dead (removed) revision in file `lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/ClearSessionController.java
===================================================================
diff -u
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/ClearSessionController.java	(revision 0)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/ClearSessionController.java	(revision 6c3d39685a1c47ef53b41a1eb29818b6f23f85cc)
@@ -0,0 +1,68 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.tool.wiki.web.controller;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
+import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishController;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.context.WebApplicationContext;
+
+/**
+ * This class give a chance to clear HttpSession when user save/close authoring page.
+ *
+ * @author Steve.Ni
+ *
+ * @version $Revision$
+ */
+@Controller
+public class ClearSessionController extends LamsAuthoringFinishController {
+    private static Logger logger = Logger.getLogger(ClearSessionController.class.getName());
+
+    @Autowired
+    private WebApplicationContext applicationContext;
+
+    @RequestMapping("/clearsession")
+    public void execute(HttpServletRequest request, HttpServletResponse response) throws IOException {
+	super.execute(request, response, applicationContext);
+    }
+
+    @Override
+    public void clearSession(String customiseSessionID, HttpSession session, ToolAccessMode mode) {
+	session.removeAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG);
+	if (mode.isAuthor()) {
+	    ClearSessionController.logger.debug("In Author mode");
+	    session.removeAttribute(customiseSessionID);
+	}
+    }
+}
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/spring-servlet.xml	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/spring-servlet.xml	(revision 6c3d39685a1c47ef53b41a1eb29818b6f23f85cc)
@@ -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.wiki.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 6c3d39685a1c47ef53b41a1eb29818b6f23f85cc refers to a dead (removed) revision in file `lams_tool_wiki/web/WEB-INF/validation.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6c3d39685a1c47ef53b41a1eb29818b6f23f85cc refers to a dead (removed) revision in file `lams_tool_wiki/web/WEB-INF/validator-rules.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wiki/web/WEB-INF/web.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r6c3d39685a1c47ef53b41a1eb29818b6f23f85cc
--- lams_tool_wiki/web/WEB-INF/web.xml	(.../web.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_wiki/web/WEB-INF/web.xml	(.../web.xml)	(revision 6c3d39685a1c47ef53b41a1eb29818b6f23f85cc)
@@ -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>
 
@@ -145,43 +131,7 @@
 	</error-page>
 
 	<jsp-config>
-
 		<!-- ======================================================== -->
-		<!-- Struts Tag Library Descriptors -->
-		<!-- ======================================================== -->
-		<taglib>
-			<taglib-uri>tags-bean</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-bean.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-html</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-html.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-logic</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-logic.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-tiles</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-tiles.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-bean-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-bean-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-html-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-html-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-logic-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-logic-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-tiles-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-tiles-el.tld</taglib-location>
-		</taglib>
-		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
 		<taglib>
Index: lams_tool_wiki/web/common/taglibs.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r6c3d39685a1c47ef53b41a1eb29818b6f23f85cc
--- lams_tool_wiki/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_wiki/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 6c3d39685a1c47ef53b41a1eb29818b6f23f85cc)
@@ -1,11 +1,8 @@
 <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%>
 
-<%@ taglib uri="tags-bean" prefix="bean"%>
-<%@ taglib uri="tags-logic" prefix="logic"%>
-<%@ taglib uri="tags-tiles" prefix="tiles"%>
-<%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+  <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
  
Index: lams_tool_wiki/web/layouts/learningLayout.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r6c3d39685a1c47ef53b41a1eb29818b6f23f85cc
--- lams_tool_wiki/web/layouts/learningLayout.jsp	(.../learningLayout.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_wiki/web/layouts/learningLayout.jsp	(.../learningLayout.jsp)	(revision 6c3d39685a1c47ef53b41a1eb29818b6f23f85cc)
@@ -4,7 +4,25 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <lams:html>
-	<tiles:insert attribute="header" />
+		<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="${tool}includes/javascript/wikiCommon.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">
 		<tiles:insert attribute="body" />
 		<div class="footer">
Index: lams_tool_wiki/web/pages/authoring/advanced.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r6c3d39685a1c47ef53b41a1eb29818b6f23f85cc
--- lams_tool_wiki/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_wiki/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 6c3d39685a1c47ef53b41a1eb29818b6f23f85cc)
@@ -6,63 +6,59 @@
 
 	<div class="checkbox">
 		<label for="allowLearnerCreatePages"> 
-		<html:checkbox	property="allowLearnerCreatePages" value="1" styleId="allowLearnerCreatePages"></html:checkbox> 
+		<form:checkbox	path="allowLearnerCreatePages" value="1" id="allowLearnerCreatePages"/>
 		<fmt:message key="advanced.allowLearnerCreatePages" /></label>
 	</div>
 	
 	<div class="checkbox">
 		<label	for="allowLearnerInsertLinks">
-		<html:checkbox property="allowLearnerInsertLinks" value="1" styleId="allowLearnerInsertLinks"></html:checkbox>  
+		<form:checkbox path="allowLearnerInsertLinks" value="1" id="allowLearnerInsertLinks"/>
 		<fmt:message key="advanced.allowLearnerInsertLinks" /></label>
 	</div>
 	
 	<div class="checkbox">
 		<label for="allowLearnerAttachImages"> 
-		<html:checkbox	property="allowLearnerAttachImages" value="1" styleId="allowLearnerAttachImages"></html:checkbox> 
+		<form:checkbox	path="allowLearnerAttachImages" value="1" id="allowLearnerAttachImages"/>
 		<fmt:message key="advanced.allowLearnerAttachImages" /> </label>
 	</div>
 		
 	<div><fmt:message key="advanced.editingLimits.prompt" /></div>
 	
-	<div><fmt:message key="advanced.editingLimits.minimum" />&nbsp;<html:select
-		property="minimumEdits" styleId="minimumEdits" styleClass="form-control form-control-inline input-sm" onchange="validateEditCount(true);">
-		<html:option value="0">
-			<fmt:message key="advanced.editingLimits.nominimum" />
-		</html:option>
-		<html:option value="1">1</html:option>
-		<html:option value="2">2</html:option>
-		<html:option value="3">3</html:option>
-		<html:option value="4">4</html:option>
-		<html:option value="5">5</html:option>
-		<html:option value="6">6</html:option>
-		<html:option value="7">7</html:option>
-		<html:option value="8">8</html:option>
-		<html:option value="9">9</html:option>
-		<html:option value="10">10</html:option>
-	</html:select>&nbsp;<fmt:message key="advanced.editingLimits.maximum" />&nbsp;<html:select
-		property="maximumEdits" styleId="maximumEdits" styleClass="form-control form-control-inline input-sm" onchange="validateEditCount(true);">
-		<html:option value="0">
-			<fmt:message key="advanced.editingLimits.nomaximum" />
-		</html:option>
-		<html:option value="1">1</html:option>
-		<html:option value="2">2</html:option>
-		<html:option value="3">3</html:option>
-		<html:option value="4">4</html:option>
-		<html:option value="5">5</html:option>
-		<html:option value="6">6</html:option>
-		<html:option value="7">7</html:option>
-		<html:option value="8">8</html:option>
-		<html:option value="9">9</html:option>
-		<html:option value="10">10</html:option>
-	</html:select></div>
+	<div><fmt:message key="advanced.editingLimits.minimum" />&nbsp;
+	<form:select path="minimumEdits" id="minimumEdits" cssClass="form-control form-control-inline input-sm" multiple="multiple" onchange="validateEditCount(true);">
+		<form:option value="0"> <fmt:message key="advanced.editingLimits.nominimum" /> </html:option>
+		<form:option value="1" label="1"/>
+		<form:option value="2" label="2"/>
+		<form:option value="3" label="3"/>
+		<form:option value="4" label="4"/>
+		<form:option value="5" label="5"/>
+		<form:option value="6" label="6"/>
+		<form:option value="7" label="7"/>
+		<form:option value="8" label="8"/>
+		<form:option value="9" label="9"/>
+		<form:option value="10" label="10"/>
+	</form:select>&nbsp;<fmt:message key="advanced.editingLimits.maximum" />&nbsp;
+	<form:select path="maximumEdits" id="maximumEdits" cssClass="form-control form-control-inline input-sm" multiple="multiple" onchange="validateEditCount(true);">
+		<form:option value="0"> <fmt:message key="advanced.editingLimits.nomaximum" /> </html:option>
+		<form:option value="1" label="1"/>
+		<form:option value="2" label="2"/>
+		<form:option value="3" label="3"/>
+		<form:option value="4" label="4"/>
+		<form:option value="5" label="5"/>
+		<form:option value="6" label="6"/>
+		<form:option value="7" label="7"/>
+		<form:option value="8" label="8"/>
+		<form:option value="9" label="9"/>
+		<form:option value="10" label="10"/>
+	</form:select></div>
 
 </lams:SimplePanel>
 
 <lams:SimplePanel titleKey="label.notifications">
 
 	<div class="checkbox">
 		<label	for="notifyUpdates">
-		<html:checkbox property="notifyUpdates" value="1" styleId="notifyUpdates"></html:checkbox>
+		<form:checkbox path="notifyUpdates" value="1" id="notifyUpdates"/>
 		<fmt:message key="advanced.notifyChange" /> </label>
 	</div>
 	
@@ -72,18 +68,18 @@
 
 	<div class="checkbox">
 		<label for="lockOnFinished">
-		<html:checkbox property="lockOnFinished" value="1" styleId="lockOnFinished"></html:checkbox>
+		<form:checkbox path="lockOnFinished" value="1" id="lockOnFinished"/>
 		<fmt:message key="advanced.lockOnFinished" /></label>
 	</div>
 	
 	<div class="checkbox">
 		<label for="reflectOnActivity">
-		<html:checkbox property="reflectOnActivity" value="1"
-		styleId="reflectOnActivity"></html:checkbox>
+		<form:checkbox path="reflectOnActivity" value="1"
+		id="reflectOnActivity"/>
 		<fmt:message key="advanced.reflectOnActivity" /> </label>
 	</div>
 	<div class="form-group">
-		<html:textarea property="reflectInstructions" rows="3" styleClass="form-control" styleId="reflectInstructions" />
+		<textarea name="reflectInstructions" rows="3" class="form-control" id="reflectInstructions" >${authoringForm.reflectInstructions}</textarea>
 	</div>
 	
 </lams:SimplePanel>	
Index: lams_tool_wiki/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r6c3d39685a1c47ef53b41a1eb29818b6f23f85cc
--- lams_tool_wiki/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_wiki/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 6c3d39685a1c47ef53b41a1eb29818b6f23f85cc)
@@ -1,65 +1,95 @@
+<!DOCTYPE html>
+<%@ page import="org.lamsfoundation.lams.tool.wiki.util.WikiConstants"%>    
+
 <%@ include file="/common/taglibs.jsp"%>
 
-<%@ page import="org.lamsfoundation.lams.tool.wiki.util.WikiConstants"%>
+<lams:html>
+			<c:set var="lams">
+				<lams:LAMSURL />
+			</c:set>
+			
+			<c:set var="tool">
+				<lams:WebAppURL />
+			</c:set>
+			<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+			
+			<script type="text/javascript" src="${tool}includes/javascript/authoring.js"></script>
+			<script type="text/javascript" src="${tool}includes/javascript/wikiCommon.js"></script>
+			<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+			<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+			<script type="text/javascript" src="${lams}includes/javascript/jquery.timeago.js"></script>
+			<script type="text/javascript" src="${lams}includes/javascript/timeagoi18n/jquery.timeago.${fn:toLowerCase(localeLanguage)}.js"></script>
+			<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+			
+			<script type="text/javascript">
+				$(document).ready(function() {$("time.timeago").timeago();});
+			</script>
+
 	
-<html:form action="/authoring" styleId="authoringForm" method="post" enctype="multipart/form-data">
+	<body class="stripes" onload="init();">
+		<form:form action="updateContent.do" id="authoringForm" modelAttribute="authoringForm" method="post" enctype="multipart/form-data">
 
-	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-	<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
-
-	<html:hidden property="currentTab" styleId="currentTab" />
-	<html:hidden property="dispatch" styleId="dispatch" value="updateContent" />
-	<html:hidden property="sessionMapID" />
-	<html:hidden property="contentFolderID"/>
-	<html:hidden property="toolContentID"/>
-	<html:hidden property="mode" value="${sessionMap.mode}"/>
-	<html:hidden property="currentWikiPage" value="${currentWikiPage.uid}" styleId="currentWikiPage" />
-	<html:hidden property="newPageName" styleId="newPageName"/>
-	<html:hidden property="historyPageContentId" styleId="historyPageContentId"/>
+			<c:set var="sessionMap" value="${sessionScope[authoringForm.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="<%= WikiConstants.TOOL_SIGNATURE %>" helpModule="authoring">
-			<lams:Tab id="1" key="button.basic" />
-			<lams:Tab id="2" key="button.advanced" />
-		</lams:Tabs>
-
-		<c:if test="${currentWikiPage.deleted}">
-			<lams:Alert type="danger" id="wikiRemoved" close="false">	
-				<fmt:message key="label.wiki.removed" />
-			</lams:Alert>
-		</c:if>
-	
-	   <lams:TabBodyArea>
-			<logic:messagesPresent>
-				<lams:Alert type="danger" id="authorErrors" close="false">	
-			        <html:messages id="error">
-			            <c:out value="${error}" escapeXml="false"/><br/>
-			        </html:messages>
-				</lams:Alert>
-			</logic:messagesPresent>			
+			<form:hidden path="currentTab" id="currentTab" />
+			<form:hidden path="sessionMapID" />
+			<form:hidden path="contentFolderID"/>
+			<form:hidden path="toolContentID"/>
+			<form:hidden path="mode" value="${sessionMap.mode}"/>
+			<form:hidden path="currentWikiPage" value="${currentWikiPage.uid}" id="currentWikiPage" />
+			<form:hidden path="newPageName" id="newPageName"/>
+			<form:hidden path="historyPageContentId" id="historyPageContentId"/>
+				
+			<c:set var="title"><fmt:message key="activity.title" /></c:set>
+			<lams:Page title="${title}" type="navbar" formID="authoringForm">
 		
-			<%-- 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:Tabs control="true" title="${title}" helpToolSignature="<%= WikiConstants.TOOL_SIGNATURE %>" helpModule="authoring">
+					<lams:Tab id="1" key="button.basic" />
+					<lams:Tab id="2" key="button.advanced" />
+				</lams:Tabs>
+		
+				<c:if test="${currentWikiPage.deleted}">
+					<lams:Alert type="danger" id="wikiRemoved" close="false">	
+						<fmt:message key="label.wiki.removed" />
+					</lams:Alert>
+				</c:if>
+			
+			   <lams:TabBodyArea>
+					<logic:messagesPresent>
+						<lams:Alert type="danger" id="authorErrors" close="false">	
+					        <html:messages id="error">
+					            <c:out value="${error}" escapeXml="false"/><br/>
+					        </html:messages>
+						</lams:Alert>
+					</logic:messagesPresent>			
 				
-			<div id="finishButtonDiv">
-				<lams:AuthoringButton formID="authoringForm"
-					clearSessionActionUrl="/clearsession.do" toolSignature="lawiki10"
-					cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
-					toolContentID="${sessionMap.toolContentID}"
-					accessMode="${sessionMap.mode}" defineLater="${sessionMap.mode == 'teacher'}"
-					customiseSessionID="${sessionMap.sessionID}" 
-					contentFolderID="${sessionMap.contentFolderID}" />
-			</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>
+						
+					<div id="finishButtonDiv">
+						<lams:AuthoringButton formID="authoringForm"
+							clearSessionActionUrl="/clearsession.do" toolSignature="lawiki10"
+							cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
+							toolContentID="${sessionMap.toolContentID}"
+							accessMode="${sessionMap.mode}" defineLater="${sessionMap.mode == 'teacher'}"
+							customiseSessionID="${sessionMap.sessionID}" 
+							contentFolderID="${sessionMap.contentFolderID}" />
+					</div>
+		
+				</lams:TabBodyArea>
+					
+			<div id="footer"></div>
+		
+			</lams:Page>
+		</form:form>
 
-		</lams:TabBodyArea>
-			
-	<div id="footer"></div>
 
-	</lams:Page>
-</html:form>
+	</body>
+</lams:html>
 
+
+
+
Index: lams_tool_wiki/web/pages/authoring/basic.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r6c3d39685a1c47ef53b41a1eb29818b6f23f85cc
--- lams_tool_wiki/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_wiki/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 6c3d39685a1c47ef53b41a1eb29818b6f23f85cc)
@@ -2,8 +2,6 @@
 
 <script language="JavaScript" type="text/javascript" src="includes/javascript/validation.js"></script>
 
-<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-
 <!-- ========== Basic Tab ========== -->
 
 <div id="wikimenu" class="panel panel-default">
Index: lams_tool_wiki/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r6c3d39685a1c47ef53b41a1eb29818b6f23f85cc
--- lams_tool_wiki/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_wiki/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 6c3d39685a1c47ef53b41a1eb29818b6f23f85cc)
@@ -32,22 +32,21 @@
 		</p>
 	</logic:messagesPresent>	
 	
-	<html:form action="/pedagogicalPlanner.do?dispatch=saveOrUpdatePedagogicalPlannerForm" styleId="pedagogicalPlannerForm" method="post">
-		<html:hidden property="toolContentID" styleId="toolContentID" />
-		<html:hidden property="valid" styleId="valid" />
-		<html:hidden property="callID" styleId="callID" />
-		<html:hidden property="activityOrderNumber" styleId="activityOrderNumber" />
+	<form:form action="saveOrUpdatePedagogicalPlannerForm.do" modelAttribute="plannerForm" id="plannerForm" method="post">
+		<form:hidden path="toolContentID" id="toolContentID" />
+		<form:hidden path="valid" id="valid" />
+		<form:hidden path="callID" id="callID" />
+		<form:hidden path="activityOrderNumber" id="activityOrderNumber" />
 		<h4 class="space-left"><fmt:message key="label.authoring.basic.title" /></h4>
-		<html:text property="title" size="80" styleClass="item" />
+		<input type="text" name="title" size="80" class="item" />
 		<h4 class="space-left"><fmt:message key="label.wiki.body" /></h4>
 		
-		<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 		<lams:CKEditor id="wikiBody"
-			value="${formBean.wikiBody}"
-			contentFolderID="${formBean.contentFolderID}"
+			value="${plannerForm.wikiBody}"
+			contentFolderID="${plannerForm.contentFolderID}"
 			toolbarSet="CustomPedplanner" height="150px"
 			width="${param.plannerCKEditorLongWidth}" displayExpanded="false">
 		</lams:CKEditor>
-	</html:form>
+	</form:form>
 </body>
 </lams:html>
\ No newline at end of file
Index: lams_tool_wiki/web/pages/learning/defineLater.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r6c3d39685a1c47ef53b41a1eb29818b6f23f85cc
--- lams_tool_wiki/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_wiki/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 6c3d39685a1c47ef53b41a1eb29818b6f23f85cc)
@@ -1,9 +1,40 @@
+<!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="${tool}includes/javascript/wikiCommon.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>
 
-<lams:Page type="learner" title="${title}">
-				<lams:DefineLater defineLaterMessageKey="message.defineLaterSet" />
-</lams:Page>
\ No newline at end of file
+	<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>
+		<div class="footer">
+		</div>					
+	</body>
+</lams:html>
+
+
+
Index: lams_tool_wiki/web/pages/learning/notebook.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r6c3d39685a1c47ef53b41a1eb29818b6f23f85cc
--- lams_tool_wiki/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_wiki/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 6c3d39685a1c47ef53b41a1eb29818b6f23f85cc)
@@ -1,48 +1,79 @@
+<!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: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="${tool}includes/javascript/wikiCommon.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>
 
-<lams:Page type="learner" title="${wikiDTO.title}">
-	<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
-		<html:hidden property="toolSessionID" styleId="toolSessionID" />
-		<html:hidden property="mode" value="${mode}" />
+	<body class="stripes">
+		
+		<script type="text/javascript">
+			function disableFinishButton() {
+				document.getElementById("finishButton").disabled = true;
+			}
+			function submitForm(methodName) {
+				var f = document.getElementById('learningForm');
+				f.submit();
+			}
+		</script>
+		
+		<lams:Page type="learner" title="${wikiDTO.title}">
+			<form:form action="submitReflection.do" method="post" onsubmit="disableFinishButton();" id="learningForm" modelAttribute="learningForm">
+				<form:hidden path="toolSessionID" id="toolSessionID" />
+				<form:hidden path="mode" value="${mode}" />
+		
+				<div class="panel">
+					<lams:out value="${wikiDTO.reflectInstructions}" escapeHtml="true" />
+				</div>
+				<div class="form-group">
+					<textarea id="focused" rows="4" name="entryText" class="form-control">${learningForm.entryText}</textarea>
+		
+		
+					<a href="#nogo" class="btn btn-primary voffset5 pull-right na" id="finishButton"
+						onclick="submitForm('finish');return false">
+						<c:choose>
+							<c:when test="${activityPosition.last}">
+								<fmt:message key="button.submit" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.finish" />
+							</c:otherwise>
+						</c:choose>
+					</a>
+				</div>
+			</form:form>
+		
+		</lams:Page>
+		
+			<script type="text/javascript">
+				window.onload = function() {
+					document.getElementById("focused").focus();
+				}
+			</script>
+		
+		
 
-		<div class="panel">
-			<lams:out value="${wikiDTO.reflectInstructions}" escapeHtml="true" />
-		</div>
-		<div class="form-group">
-			<html:textarea styleId="focused" rows="4" property="entryText" styleClass="form-control"></html:textarea>
+		<div class="footer">
+		</div>					
+	</body>
+</lams:html>
 
 
-			<html:hidden property="dispatch" value="submitReflection" />
-			<html:link href="#nogo" styleClass="btn btn-primary voffset5 pull-right na" styleId="finishButton"
-				onclick="submitForm('finish');return false">
-				<c:choose>
-					<c:when test="${activityPosition.last}">
-						<fmt:message key="button.submit" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="button.finish" />
-					</c:otherwise>
-				</c:choose>
-			</html:link>
-		</div>
-	</html:form>
-
-</lams:Page>
-
-	<script type="text/javascript">
-		window.onload = function() {
-			document.getElementById("focused").focus();
-		}
-	</script>
-
-
Index: lams_tool_wiki/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r6c3d39685a1c47ef53b41a1eb29818b6f23f85cc
--- lams_tool_wiki/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_wiki/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 6c3d39685a1c47ef53b41a1eb29818b6f23f85cc)
@@ -8,16 +8,15 @@
     }
 
     function continueOrFinish(dispatch) {
-      document.getElementById("learningButtonForm").action += "?dispatch=" + dispatch;
+      document.getElementById("learningButtonForm").action;
       document.getElementById("learningButtonForm").submit();
     }
   </script>
 
   <c:if test="${userDTO.finishedActivity and wikiDTO.reflectOnActivity}">
-    <html:form action="/learning" method="get" styleId="reflectEditForm">
-      <html:hidden property="dispatch" value="openNotebook" />
-      <html:hidden property="mode" value="${mode}" />	
-      <html:hidden property="toolSessionID" styleId="toolSessionID"/>
+    <form:form action="openNotebook.do" method="get" id="reflectEditForm">
+      <form:hidden path="mode" value="${mode}" />	
+      <form:hidden path="toolSessionID" id="toolSessionID"/>
       <div class="panel panel-default voffset10">
         <div class="panel-heading">
           <h4 class="panel-title">
@@ -35,14 +34,12 @@
             </c:otherwise>
           </c:choose>
           <hr class="mgs-hr"/>
-          <html:submit styleClass="btn btn-primary">
-            <fmt:message key="button.edit" />
-          </html:submit>	
+          <input type="submit" class="btn btn-primary" value="<fmt:message key="button.edit" />"/>
         </div>
 
       </div>
 
-    </html:form>
+    </form:form>
   </c:if>
 
   <html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="learningButtonForm">
Index: lams_tool_wiki/web/pages/learning/submissionDeadline.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r6c3d39685a1c47ef53b41a1eb29818b6f23f85cc
--- lams_tool_wiki/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_wiki/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 6c3d39685a1c47ef53b41a1eb29818b6f23f85cc)
@@ -1,18 +1,49 @@
+<!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="${tool}includes/javascript/wikiCommon.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>
 
-<lams:Page type="learner" title="${title}">
-	<lams:Alert type="danger" close="false" id="submissionDeadline">
-		<fmt:message key="authoring.info.teacher.set.restriction" >
-			<fmt:param><lams:Date value="${submissionDeadline}" /></fmt:param>
-		</fmt:message>							
-	</lams:Alert>
-	 	
-	<c:if test="${mode == 'learner' || mode == 'author'}">
-		<%@ include file="parts/finishButton.jsp"%>
-	</c:if>
-</lams:Page>
+	<body class="stripes">
+			<c:set var="title" scope="request">
+					<fmt:message key="activity.title" />
+			</c:set>		
+			
+			<lams:Page type="learner" title="${title}">
+				<lams:Alert type="danger" close="false" id="submissionDeadline">
+					<fmt:message key="authoring.info.teacher.set.restriction" >
+						<fmt:param><lams:Date value="${submissionDeadline}" /></fmt:param>
+					</fmt:message>							
+				</lams:Alert>
+				 	
+				<c:if test="${mode == 'learner' || mode == 'author'}">
+					<%@ include file="parts/finishButton.jsp"%>
+				</c:if>
+			</lams:Page>
 
+		<div class="footer">
+		</div>					
+	</body>
+</lams:html>
+
+
+
Index: lams_tool_wiki/web/pages/learning/wiki.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r6c3d39685a1c47ef53b41a1eb29818b6f23f85cc
--- lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision 6c3d39685a1c47ef53b41a1eb29818b6f23f85cc)
@@ -1,6 +1,33 @@
+<!DOCTYPE html>
+            
+
 <%@ include file="/common/taglibs.jsp"%>
-  <%@ page import="org.lamsfoundation.lams.tool.wiki.util.WikiConstants"%>
-    <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<%@ page import="org.lamsfoundation.lams.tool.wiki.util.WikiConstants"%>
+
+<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="${tool}includes/javascript/wikiCommon.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 language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
     <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
     <script language="JavaScript" type="text/javascript" src="includes/javascript/validation.js"></script>
     <script type="text/javascript" src="<lams:LAMSURL />/includes/javascript/jquery.timeago.js"></script>
@@ -52,9 +79,9 @@
       -->
     </script>
 
-  <lams:Page type="learner" usePanel="false">
+  <lams:Page type="learner" usePanel="false"formID="learningForm">
      
-    <html:form action="/learning" method="post"styleId="learningForm" enctype="multipart/form-data">
+    <form:form action="learning.do" method="post" id="learningForm" modelAttribute="learningForm" enctype="multipart/form-data">
 
             <div class="panel panel-default">
               <div class="panel-heading panel-learner-title">
@@ -253,13 +280,13 @@
                 </div> <!-- end Wiki main content -->
 
                 <!-- Begin form -->
-                <html:hidden property="toolSessionID" styleId = "toolSessionID"  />
-                <html:hidden property="mode" />
+                <form:hidden path="toolSessionID" id = "toolSessionID"  />
+                <form:hidden path="mode" />
                 <input type="hidden" name="userID" value="${userDTO.userId}"/>
-                <html:hidden property="currentWikiPage" value="${currentWikiPage.uid}" styleId="currentWikiPage" />
+                <form:hidden path="currentWikiPage" value="${currentWikiPage.uid}" id="currentWikiPage" />
                 <input type="hidden" id="wikiLinks" />
-                <html:hidden property="newPageName" styleId="newPageName" />
-                <html:hidden property="historyPageContentId" styleId="historyPageContentId" />
+                <form:hidden path="newPageName" id="newPageName" />
+                <form:hidden path="historyPageContentId" id="historyPageContentId" />
 
 
                 <div class="panel panel-default" id="history" style="display: none">
@@ -349,7 +376,7 @@
                             <fmt:message key="label.authoring.basic.title"></fmt:message>
                           </div>
 
-                          <html:text styleClass="form-control" property="title" styleId="title" style="width: 99%;" value="${currentWikiPage.title}"></html:text><span style="display: none;'" class="title error"><fmt:message key="error.title.invalid.characters"/>
+                          <input type="text" class="form-control" name="title" id="title" style="width: 99%;" value="${currentWikiPage.title}"/><span style="display: none;'" class="title error"><fmt:message key="error.title.invalid.characters"/>
                           </td>
                       </tr>
                       <tr>
@@ -391,7 +418,7 @@
                           <div class="field-name">
                             <fmt:message key="label.authoring.basic.title"/>
                           </div>
-                          <html:text property="newPageTitle" styleId="newPageTitle" styleClass="form-control" value=""></html:text><span style="display: none;'" class="newPageTitle error">
+                          <input type="text" name="newPageTitle" id="newPageTitle" class="form-control" value=""/><span style="display: none;'" class="newPageTitle error">
                           <fmt:message key="error.title.invalid.characters"/>
                           </span>
 
@@ -413,7 +440,7 @@
                     </div>
                   </div>
                 </div>
-                </html:form> 
+                </form:form> 
 
               <!-- Wiki pages folders -->
               <h4>
@@ -543,3 +570,11 @@
         jQuery("time.timeago").timeago();
       });
     </script>
+
+		<div class="footer">
+		</div>					
+	</body>
+</lams:html>
+
+
+    
\ No newline at end of file