Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dto/RootJSON.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1d108307243c1960d04192dde886f305010443cf
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dto/RootJSON.java	(.../RootJSON.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dto/RootJSON.java	(.../RootJSON.java)	(revision 1d108307243c1960d04192dde886f305010443cf)
@@ -84,7 +84,7 @@
      */
     public static NodeModel toNodeModel(String jsonContent) throws JsonProcessingException, IOException {
 	ObjectNode rootModel = JsonUtil.readObject(jsonContent);
-	if (!MAPJS_JSON_ROOT_ID_VALUE.equals(rootModel.get(IdeaJSON.MAPJS_JSON_ID_KEY))) {
+	if (!MAPJS_JSON_ROOT_ID_VALUE.equals(JsonUtil.optString(rootModel, IdeaJSON.MAPJS_JSON_ID_KEY))) {
 	    throw new IOException("Root idea missing. Unable to parse mindmap. " + jsonContent);
 	}
 
Fisheye: Tag 1d108307243c1960d04192dde886f305010443cf refers to a dead (removed) revision in file `lams_tool_mindmap/web/WEB-INF/struts-config.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_mindmap/web/common/mapjs.jsp
===================================================================
diff -u -rebe9a494826fab1aebb345e6801ad512abb52416 -r1d108307243c1960d04192dde886f305010443cf
--- lams_tool_mindmap/web/common/mapjs.jsp	(.../mapjs.jsp)	(revision ebe9a494826fab1aebb345e6801ad512abb52416)
+++ lams_tool_mindmap/web/common/mapjs.jsp	(.../mapjs.jsp)	(revision 1d108307243c1960d04192dde886f305010443cf)
@@ -33,7 +33,7 @@
 		mindMupContent = content;
 		$.ajax({ 
 	        method: "POST", 
-	        url: "setMindmapContentJSON.do", 
+	        url: "${url=='author'?'/authoring/setMindmapContentJSON.do':'/learning/setMindmapContentJSON.do'}", 
 	        data: { mindmapId: "${mindmapId}", userId: "${userId}", 
 				sessionId: "${sessionId}", mode: "${mode}" } , 
 	        dataType: "json", 
Index: lams_tool_mindmap/web/pages/learning/mindmap.jsp
===================================================================
diff -u -rebe9a494826fab1aebb345e6801ad512abb52416 -r1d108307243c1960d04192dde886f305010443cf
--- lams_tool_mindmap/web/pages/learning/mindmap.jsp	(.../mindmap.jsp)	(revision ebe9a494826fab1aebb345e6801ad512abb52416)
+++ lams_tool_mindmap/web/pages/learning/mindmap.jsp	(.../mindmap.jsp)	(revision 1d108307243c1960d04192dde886f305010443cf)
@@ -49,7 +49,7 @@
 			</script>
 		
 		<form:form action="${reflectOnActivity ? 'reflect.do' : 'finishActivity.do'}" method="post" onsubmit="return false;" modelAttribute="learningForm" id="submitForm">
-			<form:hidden path="userId" value="${userIdParam}" />
+			<input type="hidden" name="userId" value="${userIdParam}" />
 			<form:hidden path="toolContentId" value="${toolContentIdParam}" />
 			<form:hidden path="toolSessionID" />
 			<form:hidden path="mindmapContent" id="mindmapContent" />
Index: lams_tool_mindmap/web/pages/learning/reflect.jsp
===================================================================
diff -u -rebe9a494826fab1aebb345e6801ad512abb52416 -r1d108307243c1960d04192dde886f305010443cf
--- lams_tool_mindmap/web/pages/learning/reflect.jsp	(.../reflect.jsp)	(revision ebe9a494826fab1aebb345e6801ad512abb52416)
+++ lams_tool_mindmap/web/pages/learning/reflect.jsp	(.../reflect.jsp)	(revision 1d108307243c1960d04192dde886f305010443cf)
@@ -41,7 +41,7 @@
 			
 			<c:choose>
 				<c:when test="${contentEditable}">
-					<textarea rows="5" name="entryText" value="${reflectEntry}" class="form-control" id="focused"></textarea>
+					<textarea rows="5" name="entryText" class="form-control" id="focused">${reflectEntry}</textarea>
 				</c:when>
 			
 				<c:otherwise>
Index: lams_tool_mindmap/web/pages/monitoring/editActivity.jsp
===================================================================
diff -u -rebe9a494826fab1aebb345e6801ad512abb52416 -r1d108307243c1960d04192dde886f305010443cf
--- lams_tool_mindmap/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision ebe9a494826fab1aebb345e6801ad512abb52416)
+++ lams_tool_mindmap/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 1d108307243c1960d04192dde886f305010443cf)
@@ -29,7 +29,7 @@
 </table>
 
 <p class="align-right">
-	<c:url value="authoring/authoring.do" var="authoringUrl">
+	<c:url value="/authoring/authoring.do" var="authoringUrl">
 		<c:param name="toolContentID" value="${dto.toolContentId}" />
 		<c:param name="mode" value="teacher" />
 		<c:param name="contentFolderID" value="${contentFolderID}" />
Index: lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp
===================================================================
diff -u -rebe9a494826fab1aebb345e6801ad512abb52416 -r1d108307243c1960d04192dde886f305010443cf
--- lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp	(.../mindmapDisplay.jsp)	(revision ebe9a494826fab1aebb345e6801ad512abb52416)
+++ lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp	(.../mindmapDisplay.jsp)	(revision 1d108307243c1960d04192dde886f305010443cf)
@@ -1,24 +1,17 @@
-<%@ include file="/common/taglibs.jsp"%>
-
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
 
 <lams:html>
-	<c:set var="tool"> <lams:WebAppURL /> 	</c:set>
-	
-	<script type="text/javascript">
-		var initialTabId = "${mindmapDTO.currentTab}";
-	</script>
-	<script type="text/javascript" src="${tool}includes/javascript/monitoring.js"></script>
-	
-	<link rel="stylesheet" type="text/css" href="<lams:LAMSURL/>css/jquery.minicolors.css"></link>
-	<link rel="stylesheet" type="text/css" href="${tool}includes/css/mapjs.css"></link>
-	<link rel="stylesheet" type="text/css" href="${tool}includes/css/mindmap.css"></link>
-				
-	<script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-	<script src="<lams:LAMSURL/>includes/javascript/jquery.minicolors.min.js"></script>
-	<script src="${tool}includes/javascript/mapjs/main.js"></script>
-	<script src="${tool}includes/javascript/mapjs/underscore-min.js"></script>
+		<lams:head>
+			<title>
+				<fmt:message key="activity.title" />
+			</title>
+			<lams:headItems />
+			<script type="text/javascript">
+				var initialTabId = "${mindmapDTO.currentTab}";
+			</script>
+			<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/monitoring.js"></script>
+		</lams:head>
 
 	<body class="stripes">	
 	
Index: lams_tool_mindmap/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -rebe9a494826fab1aebb345e6801ad512abb52416 -r1d108307243c1960d04192dde886f305010443cf
--- lams_tool_mindmap/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision ebe9a494826fab1aebb345e6801ad512abb52416)
+++ lams_tool_mindmap/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1d108307243c1960d04192dde886f305010443cf)
@@ -3,20 +3,25 @@
 <%@ page import="org.lamsfoundation.lams.tool.mindmap.util.MindmapConstants"%>
 
 <lams:html>
-	<c:set var="tool">	<lams:WebAppURL /> </c:set>
+		<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 />
+			<script type="text/javascript">
+				var initialTabId = "${mindmapDTO.currentTab}";
+			</script>
+			<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/monitoring.js"></script>
+		</lams:head>
+	<body class="stripes" onload="init();">
 	
-	<script type="text/javascript">
-		var initialTabId = "${mindmapDTO.currentTab}";
-	</script>
-	<script type="text/javascript" src="${tool}includes/javascript/monitoring.js"></script>
-
-	<body class="stripes">	
-	
-		<lams:Page title="${pageTitle.monitoring}" type="learner">
-
-			<div id="content">
+		<c:set var="title"><fmt:message key="${pageTitle.monitoring}" /></c:set>
+		<lams:Page title="${title}" type="navbar">
+		
 			<c:set var="title"><fmt:message key="activity.title" /></c:set>
-			
 			<lams:Tabs control="true" title="${title}" helpToolSignature="<%= MindmapConstants.TOOL_SIGNATURE %>" helpModule="monitoring" refreshOnClickAction="javascript:location.reload();">
 				<lams:Tab id="1" key="button.summary"/>
 				<lams:Tab id="2" key="button.editActivity"/>
@@ -32,9 +37,6 @@
 			</lams:TabBodyArea>
 			
 			<div id="footer"></div>
-
-			</div>
-			<div id="footer"></div>
 		</lams:Page>
 	</body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_mindmap/web/pages/monitoring/reflect.jsp
===================================================================
diff -u -rebe9a494826fab1aebb345e6801ad512abb52416 -r1d108307243c1960d04192dde886f305010443cf
--- lams_tool_mindmap/web/pages/monitoring/reflect.jsp	(.../reflect.jsp)	(revision ebe9a494826fab1aebb345e6801ad512abb52416)
+++ lams_tool_mindmap/web/pages/monitoring/reflect.jsp	(.../reflect.jsp)	(revision 1d108307243c1960d04192dde886f305010443cf)
@@ -2,13 +2,18 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <lams:html>
-	<c:set var="tool"> <lams:WebAppURL /> </c:set>
-	
-	<script type="text/javascript">
-		var initialTabId = "${mindmapDTO.currentTab}";
-	</script>
-	<script type="text/javascript" src="${tool}includes/javascript/monitoring.js"></script>
 
+	<lams:head>
+			<title>
+				<fmt:message key="activity.title" />
+			</title>
+			<lams:headItems />
+			<script type="text/javascript">
+				var initialTabId = "${mindmapDTO.currentTab}";
+			</script>
+			<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/monitoring.js"></script>
+	</lams:head>
+
 	<body class="stripes">	
 	
 		<lams:Page title="${pageTitle.monitoring}" type="learner">
Index: lams_tool_mindmap/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rebe9a494826fab1aebb345e6801ad512abb52416 -r1d108307243c1960d04192dde886f305010443cf
--- lams_tool_mindmap/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision ebe9a494826fab1aebb345e6801ad512abb52416)
+++ lams_tool_mindmap/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 1d108307243c1960d04192dde886f305010443cf)
@@ -2,7 +2,6 @@
 <c:set var="lams"><lams:LAMSURL/></c:set>
 <c:set var="dto" value="${mindmapDTO}" />
 
-<script type="text/javascript" src="${tool}includes/javascript/monitoring.js"></script>
 
 <link type="text/css" href="${lams}/css/jquery-ui-smoothness-theme.css" rel="stylesheet">
 <link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
@@ -13,7 +12,7 @@
 		lams: '${lams}',
 		submissionDeadline: '${submissionDeadline}',
 		submissionDateString: '${submissionDateString}',
-		setSubmissionDeadlineUrl: '<c:url value="/monitoring/setSubmissionDeadline.do"/>',
+		setSubmissionDeadlineUrl: '<c:url value="setSubmissionDeadline.do"/>',
 		toolContentID: '${param.toolContentID}',
 		messageNotification: '<fmt:message key="monitor.summary.notification" />',
 		messageRestrictionSet: '<fmt:message key="monitor.summary.date.restriction.set" />',
@@ -110,13 +109,13 @@
 								</td>
 						
 								<td >
-									<a href="./monitoring/showMindmap.dp?toolContentID=${dto.toolContentId}&toolSessionID=${session.sessionID}">
+									<a href="showMindmap.dp?toolContentID=${dto.toolContentId}&toolSessionID=${session.sessionID}">
 										<fmt:message key="label.view" />
 									</a>		
 								</td>
 						
 								<td width="30%">
-									<a href="./monitoring/reflect.do?userUID=${user.uid}&toolContentID=${dto.toolContentId}">
+									<a href="reflect.do?userUID=${user.uid}&toolContentID=${dto.toolContentId}">
 										<fmt:message key="label.view" />
 									</a>
 								</td>
@@ -131,7 +130,7 @@
 							</td>
 					
 							<td>
-								<a href="./monitoring/showMindmap.do?toolContentID=${dto.toolContentId}&toolSessionID=${session.sessionID}">
+								<a href="showMindmap.do?toolContentID=${dto.toolContentId}&toolSessionID=${session.sessionID}">
 									<fmt:message key="label.view" />
 								</a>		
 							</td>
@@ -155,7 +154,7 @@
 									<fmt:message key="label.notAvailable" />
 								</c:when>
 								<c:otherwise>
-									<a href="./monitoring/showMindmap.do?userUID=${user.uid}&toolContentID=${dto.toolContentId}&toolSessionID=${session.sessionID}">
+									<a href="showMindmap.do?userUID=${user.uid}&toolContentID=${dto.toolContentId}&toolSessionID=${session.sessionID}">
 										<fmt:message key="label.view" />
 									</a>									
 								</c:otherwise>
@@ -164,7 +163,7 @@
 						
 						<c:if test="${dto.reflectOnActivity}">
 						<td>
-							<a href="./monitoring/reflect.do?userUID=${user.uid}&toolContentID=${dto.toolContentId}"><fmt:message key="label.view" />	</a>
+							<a href="reflect.do?userUID=${user.uid}&toolContentID=${dto.toolContentId}"><fmt:message key="label.view" />	</a>
 						</td>
 						</c:if>