Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_mindmap/web/WEB-INF/tags/Alert.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_mindmap/web/WEB-INF/tags/AuthoringRatingCriteria.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_mindmap/web/WEB-INF/tags/DefineLater.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/WEB-INF/tags/DefineLater.tag,v
diff -u -r1.1 -r1.1.8.1
--- lams_tool_mindmap/web/WEB-INF/tags/DefineLater.tag	3 Apr 2009 00:00:29 -0000	1.1
+++ lams_tool_mindmap/web/WEB-INF/tags/DefineLater.tag	11 Mar 2016 18:22:02 -0000	1.1.8.1
@@ -1,6 +1,6 @@
 
 <%
-	 /****************************************************************
+	/****************************************************************
 	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 	 * =============================================================
 	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
@@ -49,10 +49,18 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<p>
-	<fmt:message key="${defineLaterMessageKey}" />
-</p>
-<div align="right" class="space-bottom-top">
-	<a href="javascript:location.reload(true);" class="button"><fmt:message
-			key="${buttonTryAgainKey}" /> </a>
+<div class="row no-gutter">
+	<div
+		class="col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
+		<div class="alert alert-info">
+			<fmt:message key="${defineLaterMessageKey}" />
+		</div>
+	</div>
 </div>
+<div class="row no-gutter">
+	<div class="col-xs-12">
+		<a href="javascript:location.reload(true);"
+			class="btn btn-primary pull-right voffset5"><fmt:message
+				key="${buttonTryAgainKey}" /></a>
+	</div>
+</div>
\ No newline at end of file
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_mindmap/web/WEB-INF/tags/Page.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_mindmap/web/WEB-INF/tags/Rating.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_mindmap/web/WEB-INF/tags/TSTable.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.3.2.2 -r1.3.2.3
--- lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	24 Feb 2016 12:35:33 -0000	1.3.2.2
+++ lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	11 Mar 2016 18:22:02 -0000	1.3.2.3
@@ -418,6 +418,14 @@
    	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>AuthoringRatingCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>   	
    	<tag-file>
        <name>headItems</name>
@@ -432,6 +440,18 @@
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
Index: lams_tool_mindmap/web/common/learnerheader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/common/learnerheader.jsp,v
diff -u -r1.3 -r1.3.2.1
--- lams_tool_mindmap/web/common/learnerheader.jsp	13 Nov 2012 03:31:19 -0000	1.3
+++ lams_tool_mindmap/web/common/learnerheader.jsp	11 Mar 2016 18:22:02 -0000	1.3.2.1
@@ -13,5 +13,7 @@
 	</title>
 	<lams:css/>
 
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 </lams:head>
Index: lams_tool_mindmap/web/common/messages.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/common/messages.jsp,v
diff -u -r1.1 -r1.1.8.1
--- lams_tool_mindmap/web/common/messages.jsp	3 Apr 2009 00:00:33 -0000	1.1
+++ lams_tool_mindmap/web/common/messages.jsp	11 Mar 2016 18:22:02 -0000	1.1.8.1
@@ -1,8 +1,8 @@
 <%-- Error Messages --%>
 <logic:messagesPresent>
-	<p class="warning">
+	<lams:Alert id="error" type="danger" close="false">
         <html:messages id="error">
             <c:out value="${error}" escapeXml="false"/><br/>
         </html:messages>
-	</p>
+	</lams:Alert>
 </logic:messagesPresent>
Index: lams_tool_mindmap/web/pages/learning/defineLater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/pages/learning/defineLater.jsp,v
diff -u -r1.1 -r1.1.8.1
--- lams_tool_mindmap/web/pages/learning/defineLater.jsp	3 Apr 2009 00:00:31 -0000	1.1
+++ lams_tool_mindmap/web/pages/learning/defineLater.jsp	11 Mar 2016 18:22:02 -0000	1.1.8.1
@@ -1,11 +1,11 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div id="content">
-	<h1>
-		<fmt:message key="activity.title" />
-	</h1>
+<c:set scope="request" var="title">
+	<fmt:message key="activity.title" />
+</c:set>
+<lams:Page type="learner" title="${title}">
 	<lams:DefineLater defineLaterMessageKey="message.defineLaterSet" />
-</div>
+</lams:Page>
 
 
 
Fisheye: Tag 1.1.8.1 refers to a dead (removed) revision in file `lams_tool_mindmap/web/pages/learning/headItems.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_mindmap/web/pages/learning/mindmap.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/pages/learning/mindmap.jsp,v
diff -u -r1.17 -r1.17.2.1
--- lams_tool_mindmap/web/pages/learning/mindmap.jsp	5 Apr 2014 13:45:32 -0000	1.17
+++ lams_tool_mindmap/web/pages/learning/mindmap.jsp	11 Mar 2016 18:22:02 -0000	1.17.2.1
@@ -1,12 +1,10 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/swfobject.js"></script>
 <script type="text/javascript" src="includes/javascript/jquery.timer.js"></script>
 <script type="text/javascript" src="includes/javascript/mindmap.resize.js"></script>
 
 <script type="text/javascript">
-<!--
 	var mode = "${mode}";
 
 	function disableFinishButton() {
@@ -43,61 +41,58 @@
 				  pollServer: "${pollServerParam}", notifyServer: "${notifyServerParam}",
 				  dictionary: "${localizationPath}" }
 	
-	function setMindmapContent()
-	{
+	function setMindmapContent() {
 		var mindmapContent = document.getElementById("mindmapContent");
 		mindmapContent.value = document['flashContent'].getMindmap();
 	}
 	
-	function embedFlashObject(x, y)
-	{
+	function embedFlashObject(x, y)	{
 		swfobject.embedSWF("${mindmapType}", "flashContent", x, y, "9.0.0", false, flashvars);
 	}
 
 	$(window).resize(makeNice);
 	
 	embedFlashObject(540, 405);
--->
 </script>
 
-<div id="content">
-	<h1>
-		<c:out value="${mindmapDTO.title}" escapeXml="true"/>
-	</h1>
-
-	<p>
-		<c:out value="${mindmapDTO.instructions}" escapeXml="false"/>
-	</p>
-
-	<c:if test="${mindmapDTO.lockOnFinish and mode == 'learner'}">
-		<div class="info">
-			<c:choose>
-				<c:when test="${finishedActivity}">
-					<fmt:message key="message.activityLocked" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="message.warnLockOnFinish" />
-				</c:otherwise>
-			</c:choose>
+<html:form action="/learning" method="post" onsubmit="return validateForm();" styleId="submitForm">
+	<c:set var="lrnForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+	<html:hidden property="userId" value="${userIdParam}" />
+	<html:hidden property="toolContentId" value="${toolContentIdParam}" />
+	<html:hidden property="toolSessionID" />
+	<html:hidden property="mindmapContent" styleId="mindmapContent" />
+	
+	<lams:Page type="learner" title="${mindmapDTO.title}">
+	
+		<%--Advanced settings and notices-----------------------------------%>
+		
+		<div class="panel">
+			<c:out value="${mindmapDTO.instructions}" escapeXml="false"/>
 		</div>
-	</c:if>
 	
-	 <c:if test="${not empty submissionDeadline && (mode == 'author' || mode == 'learner')}">
-		 <div class="info">
-		  	<fmt:message key="authoring.info.teacher.set.restriction" >
-		  		<fmt:param><lams:Date value="${submissionDeadline}" /></fmt:param>
-		  	</fmt:message>
-		 </div>
-	 </c:if>
-
-	&nbsp;
-
-	<html:form action="/learning" method="post" onsubmit="return validateForm();" styleId="submitForm">
-		<html:hidden property="userId" value="${userIdParam}" />
-		<html:hidden property="toolContentId" value="${toolContentIdParam}" />
-		<html:hidden property="toolSessionID" />
-		<html:hidden property="mindmapContent" styleId="mindmapContent" />
+		<c:if test="${mindmapDTO.lockOnFinish and mode == 'learner'}">
+			<lams:Alert type="danger" id="lock-on-finish" close="false">
+				<c:choose>
+					<c:when test="${finishedActivity}">
+						<fmt:message key="message.activityLocked" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="message.warnLockOnFinish" />
+					</c:otherwise>
+				</c:choose>
+			</lams:Alert>
+		</c:if>
 		
+		 <c:if test="${not empty submissionDeadline && (mode == 'author' || mode == 'learner')}">
+			 <lams:Alert id="submission-deadline" close="true" type="info">
+			  	<fmt:message key="authoring.info.teacher.set.restriction" >
+			  		<fmt:param><lams:Date value="${submissionDeadline}" /></fmt:param>
+			  	</fmt:message>
+			 </lams:Alert>
+		 </c:if>
+	
+		&nbsp;
+		
 		<c:choose>
 			<c:when test="${reflectOnActivity}">
 				<input type="hidden" name="dispatch" value="reflect" />
@@ -107,37 +102,33 @@
 			</c:otherwise>
 		</c:choose>
 		
-		<c:set var="lrnForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+		<%--MindMap Flash-----------------------------------%>
 
 		<center id="center12">
 			<div id="flashContent">
-				<fmt:message>message.enableJavaScript</fmt:message>
+				<fmt:message key="message.enableJavaScript"/>
 			</div>
 		</center>
 		
-		<c:choose>
-			<c:when test="${isMonitor}">
-				<div class="space-bottom-top align-right">
-					<html:button styleClass="button" property="backButton" onclick="history.go(-1)">
-						<fmt:message>button.back</fmt:message>
+		<div class="voffset10 pull-right">
+			<c:choose>
+				<c:when test="${isMonitor}">
+					<html:button styleClass="btn btn-primary" property="backButton" onclick="history.go(-1)">
+						<fmt:message key="button.back"/>
 					</html:button>
-				</div>
-			</c:when>
+				</c:when>
 			
-			<c:otherwise>
-				<c:choose>
-					<c:when test="${reflectOnActivity}">
-						<div class="space-bottom-top align-right">
-							<html:link href="javascript:submitForm();" styleClass="button" styleId="finishButton">
-								   <span class="nextActivity"><fmt:message>button.continue</fmt:message></span>
+				<c:otherwise>
+					<c:choose>
+						<c:when test="${reflectOnActivity}">
+							<html:link href="javascript:submitForm();" styleClass="btn btn-primary" styleId="finishButton">
+								   <span class="nextActivity"><fmt:message key="button.continue"/></span>
 							</html:link>
-						</div>
-					</c:when>
+						</c:when>
 		
-					<c:otherwise>
-						<div class="space-bottom-top align-right">
-							<html:link href="javascript:submitForm();" styleClass="button" styleId="finishButton">
-								<span class="nextActivity">
+						<c:otherwise>
+							<html:link href="javascript:submitForm();" styleClass="btn btn-primary" styleId="finishButton">
+								<span class="na">
 									<c:choose>
 					 					<c:when test="${activityPosition.last}">
 					 						<fmt:message key="button.submit" />
@@ -148,12 +139,11 @@
 					 				</c:choose>
 							 	</span>
 							</html:link>
-						</div>
-					</c:otherwise>
-				</c:choose>
-			</c:otherwise>
-			
-		</c:choose>
+						</c:otherwise>
+					</c:choose>
+				</c:otherwise>
+			</c:choose>
+		</div>
 
-	</html:form>
-</div>
+	</lams:Page>
+</html:form>
Index: lams_tool_mindmap/web/pages/learning/reflect.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/pages/learning/reflect.jsp,v
diff -u -r1.4 -r1.4.2.1
--- lams_tool_mindmap/web/pages/learning/reflect.jsp	29 Mar 2014 20:51:29 -0000	1.4
+++ lams_tool_mindmap/web/pages/learning/reflect.jsp	11 Mar 2016 18:22:02 -0000	1.4.2.1
@@ -8,21 +8,26 @@
  		var f = document.getElementById('messageForm');
 		f.submit();
  	}
+
+	$(document).ready(function() {
+		document.getElementById("focused").focus();
+	});
 </script>
 
-<div id="content">
-	<h1>
-		<c:out value="${reflectTitle}" escapeXml="true" />
-	</h1>
+<lams:Page type="learner" title="${reflectTitle}">
 	<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
-		<p>
+		<html:hidden property="toolSessionID" />
+		<html:hidden property="mindmapContent" styleId="mindmapContent" />
+		<html:hidden property="mode" />
+		<html:hidden property="dispatch" value="finishActivity"/>
+	
+		<div class="panel">
 			<lams:out value="${reflectInstructions}" escapeHtml="true"/>
-		</p>
+		</div>
 		
 		<c:choose>
 			<c:when test="${contentEditable}">
-				<html:textarea cols="60" rows="8" property="entryText" value="${reflectEntry}" styleClass="text-area">
-				</html:textarea>
+				<html:textarea rows="5" property="entryText" value="${reflectEntry}" styleClass="form-control" styleId="focused"/>
 			</c:when>
 		
 			<c:otherwise>
@@ -32,25 +37,18 @@
 			</c:otherwise>
 		</c:choose>
 		
-		<div align="right" class="space-bottom-top">
-			<html:hidden property="toolSessionID" />
-			<html:hidden property="mindmapContent" styleId="mindmapContent" />
-			<html:hidden property="mode" />
-			<html:hidden property="dispatch" value="finishActivity"/>
-			<html:link  href="#" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-				<span class="nextActivity">
-					<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>
-				</span>
-			</html:link>
-		</div>
+		<html:link  href="#nogo" styleClass="btn btn-primary voffset5 pull-right" styleId="finishButton" onclick="submitForm('finish')">
+			<span class="na">
+				<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>
+			</span>
+		</html:link>
 
 	</html:form>
-</div>
-
+</lams:Page>
Index: lams_tool_mindmap/web/pages/learning/submissionDeadline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/pages/learning/submissionDeadline.jsp,v
diff -u -r1.2 -r1.2.2.1
--- lams_tool_mindmap/web/pages/learning/submissionDeadline.jsp	7 Apr 2014 00:27:46 -0000	1.2
+++ lams_tool_mindmap/web/pages/learning/submissionDeadline.jsp	11 Mar 2016 18:22:02 -0000	1.2.2.1
@@ -4,32 +4,28 @@
 	function disableFinishButton() {
 		document.getElementById("finishButton").disabled = true;
 	}
-         function submitForm(methodName){
-                var f = document.getElementById('Form');
-                f.submit();
-        }
-
+	function submitForm(methodName){
+		var f = document.getElementById('Form');
+		f.submit();
+	}
 </script>
 
-<div id="content">
-	<h1>
-		<c:out value="${mindmapDTO.title}"/>
-	</h1>
+<lams:Page type="learner" title="${mindmapDTO.title}">
 
-	<div class="warning">
+	<lams:Alert id="deadline" type="danger" close="false">
 		<fmt:message key="authoring.info.teacher.set.restriction" >
 			<fmt:param><lams:Date value="${submissionDeadline}" /></fmt:param>
 		</fmt:message>
-	</div>
+	</lams:Alert>
 
 	<c:if test="${mode == 'learner' || mode == 'author'}">
 		<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="Form">
 			<html:hidden property="dispatch" value="finishActivity" />
 			<html:hidden property="toolSessionID" />
 
-			<div align="right" class="space-bottom-top">
-				<html:link href="#" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-					<span class="nextActivity">
+			<div class="voffset10 pull-right">
+				<html:link href="#nogo" styleClass="btn btn-primary na" styleId="finishButton" onclick="submitForm('finish')">
+					<span class="na">
 						<c:choose>
 							<c:when test="${activityPosition.last}">
 								<fmt:message key="button.submit" />
@@ -43,5 +39,6 @@
 			</div>
 		</html:form>
 	</c:if>
-</div>
+	
+</lams:Page>