Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_central/web/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_central/web/header.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_gradebook/web/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_gradebook/web/template.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_learning/web/layout/branchingWaitLayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_learning/web/layout/framesetLayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_learning/web/layout/gateLayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_learning/web/layout/groupWaitLayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_learning/web/layout/layout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_assessment/web/common/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_assessment/web/common/messages.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r37c404bc2d0032716112057bebc1314cbc30d102 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_assessment/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 37c404bc2d0032716112057bebc1314cbc30d102)
+++ lams_tool_assessment/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -63,7 +63,7 @@
 			</lams:Tabs>	
 		
 		 	<lams:TabBodyArea>
-		 		<%@ include file="/common/messages.jsp"%>
+		 		<lams:errors/>
 		 		
 				<!--  Set up tabs  -->
 		 		<lams:TabBodys>
Index: lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -112,7 +112,7 @@
 		</div>
 			
 		<div class="panel-body">
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 			
 			<form:form action="saveOrUpdateQuestion.do" method="post" modelAttribute="assessmentQuestionForm" id="assessmentQuestionForm">
 				<form:hidden path="sessionMapID" />
Index: lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp
===================================================================
diff -u -rf60ded2a09e60f1f154f71b40f40caa2908c77c5 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision f60ded2a09e60f1f154f71b40f40caa2908c77c5)
+++ lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -94,7 +94,7 @@
 		</div>
 			
 		<div class="panel-body">
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 		    <div class="error">
 		    	<lams:Alert id="errorMessages" type="danger" close="false" >
 					<span></span>
Index: lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp
===================================================================
diff -u -rf60ded2a09e60f1f154f71b40f40caa2908c77c5 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision f60ded2a09e60f1f154f71b40f40caa2908c77c5)
+++ lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -96,7 +96,7 @@
 			
 		<div class="panel-body">
 		
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 		    <div class="error">
 		    	<lams:Alert id="errorMessages" type="danger" close="false" >
 					<span></span>
Index: lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
===================================================================
diff -u -rf60ded2a09e60f1f154f71b40f40caa2908c77c5 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision f60ded2a09e60f1f154f71b40f40caa2908c77c5)
+++ lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -144,7 +144,7 @@
 			
 		<div class="panel-body">
 			
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 		    <div class="error">
 		    	<lams:Alert id="errorMessages" type="danger" close="false" >
 					<span></span>
Index: lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp
===================================================================
diff -u -rf60ded2a09e60f1f154f71b40f40caa2908c77c5 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision f60ded2a09e60f1f154f71b40f40caa2908c77c5)
+++ lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -169,7 +169,7 @@
 			
 		<div class="panel-body">
 		
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 		    <div class="error">
 		    	<lams:Alert id="errorMessages" type="danger" close="false" >
 					<span></span>
Index: lams_tool_assessment/web/pages/authoring/parts/addordering.jsp
===================================================================
diff -u -rf60ded2a09e60f1f154f71b40f40caa2908c77c5 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision f60ded2a09e60f1f154f71b40f40caa2908c77c5)
+++ lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -99,7 +99,7 @@
 			
 		<div class="panel-body">
 		
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 		    <div class="error">
 		    	<lams:Alert id="errorMessages" type="danger" close="false" >
 					<span></span>
Index: lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp
===================================================================
diff -u -rf60ded2a09e60f1f154f71b40f40caa2908c77c5 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision f60ded2a09e60f1f154f71b40f40caa2908c77c5)
+++ lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -105,7 +105,7 @@
 		</div>
 
 		<div class="panel-body">
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 		    <div class="error">
 		    	<lams:Alert id="errorMessages" type="danger" close="false" >
 					<span></span>
Index: lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp
===================================================================
diff -u -rf60ded2a09e60f1f154f71b40f40caa2908c77c5 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision f60ded2a09e60f1f154f71b40f40caa2908c77c5)
+++ lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -80,7 +80,7 @@
 		</div>
 			
 		<div class="panel-body">
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 		    <div class="error">
 		    	<lams:Alert id="errorMessages" type="danger" close="false" >
 					<span></span>
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -rc5ccd8770302c86aeedce265ffd1b17494ccb463 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision c5ccd8770302c86aeedce265ffd1b17494ccb463)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -527,7 +527,7 @@
 			</button>
 		</div>
 		
-		<%@ include file="/common/messages.jsp"%>
+		<lams:errors/>
 		<br>
 		
 		<div class="form-group">
Index: lams_tool_assessment/web/pages/learning/notebook.jsp
===================================================================
diff -u -rf60ded2a09e60f1f154f71b40f40caa2908c77c5 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_assessment/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision f60ded2a09e60f1f154f71b40f40caa2908c77c5)
+++ lams_tool_assessment/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -27,7 +27,7 @@
 			<form:hidden path="userID" />
 			<form:hidden path="sessionMapID" />
 
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 
 			<div class="panel">
 				<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
Index: lams_tool_assessment/web/pages/learning/results.jsp
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_assessment/web/pages/learning/results.jsp	(.../results.jsp)	(revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/web/pages/learning/results.jsp	(.../results.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -104,7 +104,7 @@
 			<lams:LeaderDisplay username="${sessionMap.groupLeader.firstName} ${sessionMap.groupLeader.lastName}" userId="${sessionMap.groupLeader.userId}"/>
 		</c:if>
 		
-		<%@ include file="/common/messages.jsp"%>
+		<lams:errors/>
 		<br>
 		
 		<%@ include file="results/attemptsummary.jsp"%>
Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
===================================================================
diff -u -r4d547f8d6d94c21faecb89f723c362bf399f4614 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision 4d547f8d6d94c21faecb89f723c362bf399f4614)
+++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -158,7 +158,7 @@
 		</div>
 			
 		<div class="panel-body">
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
                 
             <c:out value="${questionSummary.question.question}" escapeXml="false"/>
 
Index: lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(.../usersummary.jsp)	(revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(.../usersummary.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -153,7 +153,7 @@
 		</div>
 			
 		<div class="panel-body">	
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 			
 			<table class="table table-condensed">
 				<tr>
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_chat/web/common/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_chat/web/common/header.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_chat/web/common/learnerheader.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_chat/web/common/message.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_chat/web/common/messages.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_chat/web/pages/authoring/addCondition.jsp
===================================================================
diff -u -r903574fa3e87a5a85057a975acfe6ccfba0b9de0 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_chat/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 903574fa3e87a5a85057a975acfe6ccfba0b9de0)
+++ lams_tool_chat/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -28,7 +28,7 @@
 	<div class="panel-body">
 	
 		<!-- Basic Info Form-->
-		<%@ include file="/common/messages.jsp"%>
+		<lams:errors/>
 		<form:form action="../authoringCondition/saveOrUpdateCondition.do" method="post" modelAttribute="chatConditionForm" id="chatConditionForm" focus="displayName" >
 			<form:hidden path="orderId" />
 
Index: lams_tool_chat/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r903574fa3e87a5a85057a975acfe6ccfba0b9de0 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_chat/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 903574fa3e87a5a85057a975acfe6ccfba0b9de0)
+++ lams_tool_chat/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -14,7 +14,7 @@
 	</script>
 </lams:head>
 <body style="width: 550px">
-	<%@ include file="/common/messages.jsp"%>
+	<lams:errors/>
 	<h4 class="space-left"><fmt:message key="label.authoring.basic.instructions" /></h4>
 	
 	<form:form action="saveOrUpdatePedagogicalPlannerForm.do" modelAttribute="plannerForm" id="plannerForm" method="post">
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_daco/web/common/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_daco/web/common/messages.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_daco/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r8ee7fa8485b72185b59612fa0cd097adf044d8de -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_daco/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 8ee7fa8485b72185b59612fa0cd097adf044d8de)
+++ lams_tool_daco/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -40,7 +40,7 @@
 		</lams:Tabs>	
 	
 	 	<lams:TabBodyArea>
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 			<form:hidden path="daco.contentId" />
 			<form:hidden path="sessionMapID" />
 			<form:hidden path="contentFolderID" />
Index: lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp
===================================================================
diff -u -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp	(.../addcheckbox.jsp)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
+++ lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp	(.../addcheckbox.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -28,7 +28,7 @@
 <div class="panel-body">
 
 <!-- Add question form-->
-<%@ include file="/common/messages.jsp"%>
+<lams:errors/>
 <form:form action="saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
 	<form:hidden path="sessionMapID" />
 	<input type="hidden" id="questionType" name="questionType" value="9" />
Index: lams_tool_daco/web/pages/authoring/parts/adddate.jsp
===================================================================
diff -u -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_daco/web/pages/authoring/parts/adddate.jsp	(.../adddate.jsp)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
+++ lams_tool_daco/web/pages/authoring/parts/adddate.jsp	(.../adddate.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -26,7 +26,7 @@
 <div class="panel-body">
 
 <!-- Add question form-->
-<%@ include file="/common/messages.jsp"%>
+<lams:errors/>
 <form:form action="saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
 	<form:hidden path="sessionMapID" />
 	<input type="hidden" id="questionType" name="questionType" value="4" />
Index: lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp
===================================================================
diff -u -rc7f58bf04c3ca0557a3d52e0ec23ae7b65423e12 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp	(.../adddropdown.jsp)	(revision c7f58bf04c3ca0557a3d52e0ec23ae7b65423e12)
+++ lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp	(.../adddropdown.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -28,7 +28,7 @@
 <div class="panel-body">
 
 <!-- Add question form-->
-<%@ include file="/common/messages.jsp"%>
+<lams:errors/>
 <form:form action="saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
 	<form:hidden path="sessionMapID" />
 	<input type="hidden" id="questionType" name="questionType" value="8" />
Index: lams_tool_daco/web/pages/authoring/parts/addfile.jsp
===================================================================
diff -u -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_daco/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
+++ lams_tool_daco/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -26,7 +26,7 @@
 <div class="panel-body">
 
 <!-- Add question form-->
-<%@ include file="/common/messages.jsp"%>
+<lams:errors/>
 <form:form action="saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
 	<form:hidden path="sessionMapID" />
 	<input type="hidden" id="questionType" name="questionType" value="5" />
Index: lams_tool_daco/web/pages/authoring/parts/addimage.jsp
===================================================================
diff -u -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_daco/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
+++ lams_tool_daco/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -26,7 +26,7 @@
 <div class="panel-body">
 
 <!-- Add question form-->
-<%@ include file="/common/messages.jsp"%>
+<lams:errors/>
 <form:form action="saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
 	<form:hidden path="sessionMapID" />
 	<input type="hidden" id="questionType" name="questionType" value="6" />
Index: lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp
===================================================================
diff -u -rc7f58bf04c3ca0557a3d52e0ec23ae7b65423e12 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp	(.../addlonglat.jsp)	(revision c7f58bf04c3ca0557a3d52e0ec23ae7b65423e12)
+++ lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp	(.../addlonglat.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -28,7 +28,7 @@
 <div class="panel-body">
 
 <!-- Add question form-->
-<%@ include file="/common/messages.jsp"%>
+<lams:errors/>
 <form:form action="saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
 	<form:hidden path="sessionMapID" />
 	<input type="hidden" id="questionType" name="questionType" value="10" />
Index: lams_tool_daco/web/pages/authoring/parts/addnumber.jsp
===================================================================
diff -u -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_daco/web/pages/authoring/parts/addnumber.jsp	(.../addnumber.jsp)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
+++ lams_tool_daco/web/pages/authoring/parts/addnumber.jsp	(.../addnumber.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -26,7 +26,7 @@
 <div class="panel-body">
 
 <!-- Add question form-->
-<%@ include file="/common/messages.jsp"%>
+<lams:errors/>
 <form:form action="saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
 	<form:hidden path="sessionMapID" />
 	<input type="hidden" id="questionType" name="questionType" value="3" />
Index: lams_tool_daco/web/pages/authoring/parts/addradio.jsp
===================================================================
diff -u -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_daco/web/pages/authoring/parts/addradio.jsp	(.../addradio.jsp)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
+++ lams_tool_daco/web/pages/authoring/parts/addradio.jsp	(.../addradio.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -28,7 +28,7 @@
 <div class="panel-body">
 
 <!-- Add question form-->
-<%@ include file="/common/messages.jsp"%>
+<lams:errors/>
 <form:form action="saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
 	<form:hidden path="sessionMapID" />
 	<input type="hidden" id="questionType" name="questionType" value="7" />
Index: lams_tool_daco/web/pages/authoring/parts/addtextarea.jsp
===================================================================
diff -u -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_daco/web/pages/authoring/parts/addtextarea.jsp	(.../addtextarea.jsp)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
+++ lams_tool_daco/web/pages/authoring/parts/addtextarea.jsp	(.../addtextarea.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -26,7 +26,7 @@
 <div class="panel-body">
 
 <!-- Add question form-->
-<%@ include file="/common/messages.jsp"%>
+<lams:errors/>
 <form:form action="saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
 	<form:hidden path="sessionMapID" />
 	<input type="hidden" id="questionType" name="questionType" value="2" />
Index: lams_tool_daco/web/pages/authoring/parts/addtextfield.jsp
===================================================================
diff -u -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_daco/web/pages/authoring/parts/addtextfield.jsp	(.../addtextfield.jsp)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
+++ lams_tool_daco/web/pages/authoring/parts/addtextfield.jsp	(.../addtextfield.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -26,7 +26,7 @@
 <div class="panel-body">
 
 <!-- Add question form-->
-<%@ include file="/common/messages.jsp"%>
+<lams:errors/>
 
 <form:form action="saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
 	<form:hidden path="sessionMapID" />
Index: lams_tool_daco/web/pages/learning/addRecord.jsp
===================================================================
diff -u -rc7f58bf04c3ca0557a3d52e0ec23ae7b65423e12 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_daco/web/pages/learning/addRecord.jsp	(.../addRecord.jsp)	(revision c7f58bf04c3ca0557a3d52e0ec23ae7b65423e12)
+++ lams_tool_daco/web/pages/learning/addRecord.jsp	(.../addRecord.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -27,7 +27,7 @@
 	</lams:Alert>
 </c:if>
 
-<%@ include file="/common/messages.jsp"%>
+<lams:errors/>
 <%-- The status of the last add/edit operation. --%>
 <c:if test="${recordOperationSuccess=='add'}">
 	<lams:Alert id="addrecordsuccess" type="info" close="true">
Index: lams_tool_daco/web/pages/learning/notebook.jsp
===================================================================
diff -u -rc7f58bf04c3ca0557a3d52e0ec23ae7b65423e12 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_daco/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision c7f58bf04c3ca0557a3d52e0ec23ae7b65423e12)
+++ lams_tool_daco/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -28,7 +28,7 @@
 		<form:hidden path="sessionId" />
 		<form:hidden path="sessionMapID" />
 		
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 
 			<p>
 				<lams:out value="${daco.reflectInstructions}" escapeHtml="true" />
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_doku/web/common/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_doku/web/common/messages.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_doku/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r1d6eef003bf303f75c5405b66a13ac86232cec03 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_doku/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1d6eef003bf303f75c5405b66a13ac86232cec03)
+++ lams_tool_doku/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -44,7 +44,7 @@
 		</lams:Tabs>    
 
 		<lams:TabBodyArea>
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 		   
 		    <!--  Set up tabs  -->
 		    <lams:TabBodys>
Index: lams_tool_doku/web/pages/learning/learning.jsp
===================================================================
diff -u -r1cef918442124e8d987a285095a7504e3bc00461 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
+++ lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -207,7 +207,7 @@
 			</lams:Alert>
 		</c:if>
 
-		<%@ include file="/common/messages.jsp"%>
+		<lams:errors/>
 
 		<div class='panel panel-default 
 				<c:if test="${isTimeLimitEnabled}">lower-to-fit-countdown</c:if>'>			
Index: lams_tool_doku/web/pages/learning/notebook.jsp
===================================================================
diff -u -r1cef918442124e8d987a285095a7504e3bc00461 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_doku/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
+++ lams_tool_doku/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -30,7 +30,7 @@
 		<form:hidden path="sessionMapID" />
 
 		<div id="content">
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 
 			<p>
 				<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_forum/web/common/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_forum/web/common/messages.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/blank.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/error.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/layout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/learnerLayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/tablayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/jsps/admin/config.jsp
===================================================================
diff -u -r39e351aeeadf3d0973293c74f0c89432a954d2e8 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_forum/web/jsps/admin/config.jsp	(.../config.jsp)	(revision 39e351aeeadf3d0973293c74f0c89432a954d2e8)
+++ lams_tool_forum/web/jsps/admin/config.jsp	(.../config.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -15,7 +15,7 @@
 			
 			<a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="admin.return" /></a>
 			
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 		
 			<c:if test="${savedSuccess}">
 				<lams:Alert type="info" id="admin-success" close="false">
Index: lams_tool_forum/web/jsps/authoring/addCondition.jsp
===================================================================
diff -u -r05f1961fd1d7e74738595255cfdb13e344c40123 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_forum/web/jsps/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 05f1961fd1d7e74738595255cfdb13e344c40123)
+++ lams_tool_forum/web/jsps/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -18,7 +18,7 @@
 	<div class="panel-body">	
 	
 		<!-- Basic Info Form-->
-		<%@ include file="/common/messages.jsp"%>
+		<lams:errors/>
 		<form:form action="../authoringCondition/saveOrUpdateCondition.do" method="post" modelAttribute="forumConditionForm" id="forumConditionForm" focus="displayName" >
 			<form:hidden path="orderId" />
 			
Index: lams_tool_forum/web/jsps/authoring/authoring.jsp
===================================================================
diff -u -r610049faaaa86cdd3c98f6c6e038650c9700af5a -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision 610049faaaa86cdd3c98f6c6e038650c9700af5a)
+++ lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -54,7 +54,7 @@
 				</lams:Tabs> 
 			
 				<lams:TabBodyArea>
-					<%@ include file="/common/messages.jsp"%>
+					<lams:errors/>
 				   
 				    <!--  Set up tabs  -->
 				     <lams:TabBodys>
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/header.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -16,7 +16,7 @@
 		<div class="panel-body">
 	
 		<!-- Basic Info Form-->
-		<%@ include file="/common/messages.jsp"%>
+		<lams:errors/>
 
 		<form:form action="createTopic.do" modelAttribute="topicFormId" id="topicFormId" focus="message.subject" enctype="multipart/form-data">
 			<form:hidden path="sessionMapID" />
Index: lams_tool_forum/web/jsps/authoring/message/edit.jsp
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -14,7 +14,7 @@
 		<div class="panel-body">
 	
 		<!-- Basic Info Form-->
-		<%@ include file="/common/messages.jsp"%>
+		<lams:errors/>
 		<form:form action="updateTopic.do" focus="message.subject" enctype="multipart/form-data" id="topicFormId" modelAttribute="topicFormId" onsubmit="return validate();">
 			
 			<input type="hidden" name="topicIndex" value="<c:out value="${topicIndex}"/>">
Index: lams_tool_forum/web/jsps/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r9f988c0cf9ce45c8812158692f38e74688b96ea4 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_forum/web/jsps/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 9f988c0cf9ce45c8812158692f38e74688b96ea4)
+++ lams_tool_forum/web/jsps/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -70,7 +70,7 @@
   	</script>
 </lams:head>
 <body id="body">
-	<%@ include file="/common/messages.jsp"%>
+	<lams:errors/>
 	
 	<form:form action="saveOrUpdatePedagogicalPlannerForm.do" id="plannerForm" modelAttribute="plannerForm" method="post">
 	
Index: lams_tool_forum/web/jsps/learning/notebook.jsp
===================================================================
diff -u -r9f988c0cf9ce45c8812158692f38e74688b96ea4 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_forum/web/jsps/learning/notebook.jsp	(.../notebook.jsp)	(revision 9f988c0cf9ce45c8812158692f38e74688b96ea4)
+++ lams_tool_forum/web/jsps/learning/notebook.jsp	(.../notebook.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -65,7 +65,7 @@
 		
 			<lams:Page type="learner" title="${sessionMap.title}" formID="reflectionForm">
 		
-				<%@ include file="/common/messages.jsp"%>
+				<lams:errors/>
 		
 				<p>
 					<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
Index: lams_tool_forum/web/jsps/learning/viewforum.jsp
===================================================================
diff -u -r610049faaaa86cdd3c98f6c6e038650c9700af5a -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision 610049faaaa86cdd3c98f6c6e038650c9700af5a)
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -151,7 +151,7 @@
 			</c:if>
 			<!-- End announcements and advanced settings -->
 		
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 		
 			<!-- main UI -->
 			<%@ include file="/jsps/learning/message/topiclist.jsp"%>
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/monitoring/header.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/jsps/monitoring/updatemarks.jsp
===================================================================
diff -u -ra34124084b91153f8cbe0720a88be1a8e0ae1e88 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	(.../updatemarks.jsp)	(revision a34124084b91153f8cbe0720a88be1a8e0ae1e88)
+++ lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	(.../updatemarks.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -40,7 +40,7 @@
 					<i class="fa fa-paperclip loffset5" title="<fmt:message key='message.label.attachment'/>"></i>
 				</c:if>
 			</p>
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 		
 			<div class="form-group">
 				<label for="mark"><fmt:message key="lable.topic.title.mark" />*</label>
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_images/web/common/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_images/web/common/messages.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_images/web/pages/admin/config.jsp
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_images/web/pages/admin/config.jsp	(.../config.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_images/web/pages/admin/config.jsp	(.../config.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -16,7 +16,7 @@
 		
 			<a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="admin.return" /></a>
 
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 		
 			<c:if test="${savedSuccess}">
 				<lams:Alert type="info" id="admin-success" close="false">
Index: lams_tool_images/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_images/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_tool_images/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -66,7 +66,7 @@
 			</lams:Tabs>	
 		
 		 	<lams:TabBodyArea>
-		 		<%@ include file="/common/messages.jsp"%>
+		 		<lams:errors/>
 		 		
 				<!--  Set up tabs  -->
 		 		<lams:TabBodys>
Index: lams_tool_images/web/pages/authoring/parts/addimage.jsp
===================================================================
diff -u -ra76d96d2c8738e06130ab51ea379fe34bea5fbd8 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_images/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision a76d96d2c8738e06130ab51ea379fe34bea5fbd8)
+++ lams_tool_images/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -27,7 +27,7 @@
 		</div>
 			
 		<div class="panel-body">
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 			<form:hidden path="sessionMapID" />
 			<form:hidden path="imageIndex" />
 	
Index: lams_tool_images/web/pages/authoring/parts/addmultipleimages.jsp
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_images/web/pages/authoring/parts/addmultipleimages.jsp	(.../addmultipleimages.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_images/web/pages/authoring/parts/addmultipleimages.jsp	(.../addmultipleimages.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -31,7 +31,7 @@
 			
 		<div class="panel-body">
 	
-			<%@ include file="/common/messages.jsp"%>	
+			<lams:errors/>	
 			<form:hidden path="sessionMapID" id="sessionMapID"/>
 	
 			<div class="form-group">
Index: lams_tool_images/web/pages/learning/learning.jsp
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -192,7 +192,7 @@
 			
 		</c:if>
 		
-		<%@ include file="/common/messages.jsp"%>
+		<lams:errors/>
 		
 		<%--Main image---------------------------------------------------%>
 		
Index: lams_tool_images/web/pages/learning/notebook.jsp
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_images/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_images/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -25,7 +25,7 @@
 			<form:hidden path="userID" />
 			<form:hidden path="sessionMapID" />
 
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 
 			<p>
 				<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_imscc/web/common/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_imscc/web/common/messages.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_imscc/web/pages/admin/config.jsp
===================================================================
diff -u -r1d6eef003bf303f75c5405b66a13ac86232cec03 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_imscc/web/pages/admin/config.jsp	(.../config.jsp)	(revision 1d6eef003bf303f75c5405b66a13ac86232cec03)
+++ lams_tool_imscc/web/pages/admin/config.jsp	(.../config.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -16,7 +16,7 @@
 			
 			<a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="admin.return" /></a>
 
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 		
 			<c:if test="${savedSuccess}">
 				<lams:Alert type="info" id="admin-success" close="false">
Index: lams_tool_imscc/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r1d6eef003bf303f75c5405b66a13ac86232cec03 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_imscc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1d6eef003bf303f75c5405b66a13ac86232cec03)
+++ lams_tool_imscc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -83,7 +83,7 @@
 			</lams:Tabs>	
 		
 		 	<lams:TabBodyArea>
-		 		<%@ include file="/common/messages.jsp"%>
+		 		<lams:errors/>
 		 		
 				<!--  Set up tabs  -->
 		 		<lams:TabBodys>
Index: lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp
===================================================================
diff -u -ra76d96d2c8738e06130ab51ea379fe34bea5fbd8 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp	(.../addbasiclti.jsp)	(revision a76d96d2c8738e06130ab51ea379fe34bea5fbd8)
+++ lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp	(.../addbasiclti.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -20,7 +20,7 @@
 		<c:set var="title"><fmt:message key="label.authoring.basic.add.basiclti.tool" /></c:set>
 		<lams:Page title="${title}" type="learner">
 
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 			
 			<form:hidden path="sessionMapID" />
 			<input type="hidden" name="itemType" id="itemType" value="1" />
Index: lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp
===================================================================
diff -u -rda82f07ee37e14346fff93b086a7a9d74eeee238 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp	(.../addcommoncartridge.jsp)	(revision da82f07ee37e14346fff93b086a7a9d74eeee238)
+++ lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp	(.../addcommoncartridge.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -41,7 +41,7 @@
 		<c:set var="title"><fmt:message key="label.authoring.basic.upload.common.cartridge" /></c:set>
 		<lams:Page title="${title}" type="learner">
 
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 							
 			<form:hidden path="sessionMapID" />
 			<input type="hidden" name="itemType" id="itemType" value="2" />
Index: lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp
===================================================================
diff -u -r1d6eef003bf303f75c5405b66a13ac86232cec03 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp	(.../selectResources.jsp)	(revision 1d6eef003bf303f75c5405b66a13ac86232cec03)
+++ lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp	(.../selectResources.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -25,7 +25,7 @@
 	<lams:Page title="${title}" type="learner">
 		<input type="hidden" value="${sessionMapID}" name="sessionMapID"> 
 		
-		<%@ include file="/common/messages.jsp"%>
+		<lams:errors/>
 
 		<table class="table" id="itemTable">
 			
Index: lams_tool_imscc/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r1d6eef003bf303f75c5405b66a13ac86232cec03 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_imscc/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 1d6eef003bf303f75c5405b66a13ac86232cec03)
+++ lams_tool_imscc/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -69,7 +69,7 @@
 </lams:head>
 
 <body id="body">
-	<%@ include file="/common/messages.jsp"%>
+	<lams:errors/>
 	<form:form enctype="multipart/form-data" action="saveOrUpdatePedagogicalPlannerForm.do" modelAttribute="pedagogicalPlannerForm" id="pedagogicalPlannerForm" method="post">
 		<form:hidden path="toolContentID" />
 		<form:hidden path="valid" id="valid" />
Index: lams_tool_imscc/web/pages/learning/learning.jsp
===================================================================
diff -u -r1d6eef003bf303f75c5405b66a13ac86232cec03 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_imscc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 1d6eef003bf303f75c5405b66a13ac86232cec03)
+++ lams_tool_imscc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -66,7 +66,7 @@
 			</lams:Alert>
 		</c:if>
 
-		<%@ include file="/common/messages.jsp"%>
+		<lams:errors/>
 
 		<div class="table-responsive">
 			<table class="table table-hover table-condensed">
Index: lams_tool_imscc/web/pages/learning/notebook.jsp
===================================================================
diff -u -r1d6eef003bf303f75c5405b66a13ac86232cec03 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_imscc/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 1d6eef003bf303f75c5405b66a13ac86232cec03)
+++ lams_tool_imscc/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -32,7 +32,7 @@
 
 		<lams:Page type="learner" title="${sessionMap.title}">
 
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 
 			<div class="panel">
 				<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_kaltura/web/common/empty.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_kaltura/web/common/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_kaltura/web/common/header.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_kaltura/web/common/learnerheader.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_kaltura/web/common/message.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_kaltura/web/common/messages.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_kaltura/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rff911101cbe92d6813691c20c292fa04519820b4 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_kaltura/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
+++ lams_tool_kaltura/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -41,7 +41,7 @@
 				</lams:Tabs>
 				
 				<lams:TabBodyArea>
-					<%@ include file="/common/messages.jsp"%>
+					<lams:errors/>
 					 		
 					<!--  Set up tabs  -->
 					<lams:TabBodys>
Index: lams_tool_kaltura/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -rff911101cbe92d6813691c20c292fa04519820b4 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_kaltura/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
+++ lams_tool_kaltura/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -15,7 +15,7 @@
 </lams:head>
 
 <body style="width: 550px">
-	<%@ include file="/common/messages.jsp"%>
+	<lams:errors/>
 	
 	<h4 class="space-left" style="float:left">
 		<fmt:message key="label.authoring.basic.instructions" />
Index: lams_tool_kaltura/web/pages/learning/commentlist.jsp
===================================================================
diff -u -ra76d96d2c8738e06130ab51ea379fe34bea5fbd8 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_kaltura/web/pages/learning/commentlist.jsp	(.../commentlist.jsp)	(revision a76d96d2c8738e06130ab51ea379fe34bea5fbd8)
+++ lams_tool_kaltura/web/pages/learning/commentlist.jsp	(.../commentlist.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -7,7 +7,7 @@
 <c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 <c:set var="isGroupMonitoring" value="${sessionMap.isGroupMonitoring}" />
 
-<%@ include file="/common/messages.jsp"%>
+<lams:errors/>
 
 <div class="table-responsive">
 	<table id="comments-table" class="table table-hover table-condensed">
Index: lams_tool_kaltura/web/pages/learning/notebook.jsp
===================================================================
diff -u -r58e32af997a2da8fc96806124b29fc68fdefb149 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_kaltura/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 58e32af997a2da8fc96806124b29fc68fdefb149)
+++ lams_tool_kaltura/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -43,7 +43,7 @@
 		
 			<lams:Page type="learner" title="${kaltura.title}">
 		
-				<%@ include file="/common/messages.jsp"%>
+				<lams:errors/>
 		
 				<div class="panel">
 					<lams:out value="${kaltura.reflectInstructions}" escapeHtml="true"/>
Index: lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp
===================================================================
diff -u -r5cc2f28c0fd508cf034496ad94d4892c373431f1 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 5cc2f28c0fd508cf034496ad94d4892c373431f1)
+++ lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -88,7 +88,7 @@
 			</lams:Tabs>   
 			
 			<lams:TabBodyArea>
-				<%@ include file="/common/messages.jsp"%>
+				<lams:errors/>
               
                 <!--  Set up tabs  -->
                 <lams:TabBodys>
Index: lams_tool_lamc/web/authoring/candidateAnswersList.jsp
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_lamc/web/authoring/candidateAnswersList.jsp	(.../candidateAnswersList.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/authoring/candidateAnswersList.jsp	(.../candidateAnswersList.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -14,7 +14,7 @@
 		</c:choose>
 	</c:set>
 	<input type="hidden" name="candidateIndex" value="${candidateIndex}"/>
-	<%@ include file="/common/messages.jsp"%>
+	<lams:errors/>
 
 	<table id="caTable" class="table table-condensed table-no-border">
 	
Index: lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -97,7 +97,7 @@
   	</script>
 </lams:head>
 <body id="body">
-	<%@ include file="/common/messages.jsp"%>
+	<lams:errors/>
 	<h4 class="space-left"><fmt:message key="label.questions"/></h4>
 	<form:form action="saveOrUpdatePedagogicalPlannerForm.do" id="plannerForm" modelAttribute="plannerForm" method="post">
 		
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_lamc/web/common/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_lamc/web/common/messages.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_lamc/web/learning/AnswersContent.jsp
===================================================================
diff -u -r66b044dc18d78c8a61a15c197d0c2d6a1f989c18 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 66b044dc18d78c8a61a15c197d0c2d6a1f989c18)
+++ lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -153,7 +153,7 @@
 				<form:hidden path="userOverPassMark" />
 				<form:hidden path="passMarkApplicable" />
 
-				<%@ include file="/common/messages.jsp"%>
+				<lams:errors/>
 
 				<c:if test="${isLeadershipEnabled}">
 					<h4>
Index: lams_tool_lamc/web/learning/SimpleLearnerError.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_lamc/web/learning/SimpleLearnerError.jsp	(.../SimpleLearnerError.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_lamc/web/learning/SimpleLearnerError.jsp	(.../SimpleLearnerError.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -14,7 +14,7 @@
 <body class="stripes">
 	<lams:Page type="learner" title="${title}">
 		<div class="voffset10 pull-right">
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 		</div>
 		<div id="footer"></div>
 	</lams:Page>
Index: lams_tool_laqa/web/authoring/addCondition.jsp
===================================================================
diff -u -r7ccd2797793d9c746fe08ab675942b820bf47742 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_laqa/web/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 7ccd2797793d9c746fe08ab675942b820bf47742)
+++ lams_tool_laqa/web/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -13,7 +13,7 @@
 	 </form:form>
 		<!-- Basic Info Form-->
 		<form:form action="/lams/tool/laqa11/authoringConditions/saveOrUpdateCondition.do" method="post" modelAttribute="QaConditionForm" id="QaConditionForm" >
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 			<form:hidden path="orderId" />
 			
 			<div class="form-group">
Index: lams_tool_laqa/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r7ccd2797793d9c746fe08ab675942b820bf47742 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_laqa/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 7ccd2797793d9c746fe08ab675942b820bf47742)
+++ lams_tool_laqa/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -67,7 +67,7 @@
 <body id="body">
 	<h4 class="space-left"><fmt:message key="label.questions"/></h4>
 	<form:form action="lams/tool/laqa11/pedagogicalPlanner/saveOrUpdatePedagogicalPlannerForm.do" modelAttribute="pedagogicalPlannerForm" id="pedagogicalPlannerForm" method="post">
-		<%@ include file="/common/messages.jsp"%>
+		<lams:errors/>
 		<form:hidden path="toolContentID" id="toolContentID" />
 		<form:hidden path="valid" id="valid" />
 		<form:hidden path="callID" id="callID" />
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_laqa/web/common/messages.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_larsrc/web/common/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_larsrc/web/common/messages.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r5c34a04ef321a5a0c211fd830ee52eadc90b89ad -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_larsrc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5c34a04ef321a5a0c211fd830ee52eadc90b89ad)
+++ lams_tool_larsrc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -82,7 +82,7 @@
 			</lams:Tabs>    
 
 			<lams:TabBodyArea>
-				<%@ include file="/common/messages.jsp"%>
+				<lams:errors/>
 			   
 			    <!--  Set up tabs  -->
 			    <lams:TabBodys>
Index: lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp
===================================================================
diff -u -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24)
+++ lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -69,7 +69,7 @@
 			
 			<div class="panel-body">
 
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 
 			<form:form action="saveOrUpdateItem.do" method="post" modelAttribute="resourceItemForm"  id="resourceItemForm">
 				<input type="hidden" name="instructionList" id="instructionList" />
Index: lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp
===================================================================
diff -u -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	(.../addlearningobject.jsp)	(revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24)
+++ lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	(.../addlearningobject.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -69,7 +69,7 @@
 			
 			<div class="panel-body">
 
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 
 			<form:form action="saveOrUpdateItem.do" method="post" modelAttribute="resourceItemForm" id="resourceItemForm">
 				<input type="hidden" name="instructionList" id="instructionList" />
Index: lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -43,7 +43,7 @@
 			</div>
 			<div class="panel-body">
 
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 	
 			<form:form action="saveOrUpdateItem.do" method="post" modelAttribute="resourceItemForm" id="resourceItemForm">
 				<form:hidden path="sessionMapID" />
Index: lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp
===================================================================
diff -u -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24)
+++ lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -69,7 +69,7 @@
 			
 			<div class="panel-body">
 
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 			
 			<form:form action="saveOrUpdateItem.do" method="post" modelAttribute="resourceItemForm"	id="resourceItemForm">
 				<form:hidden path="sessionMapID" />
Index: lams_tool_larsrc/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_larsrc/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -72,7 +72,7 @@
   	</script>
 </lams:head>
 <body id="body">
-	<%@ include file="/common/messages.jsp"%>
+	<lams:errors/>
 	<form:form action="saveOrUpdatePedagogicalPlannerForm.do" modelAttribute="pedagogicalPlannerForm" id="pedagogicalPlannerForm" method="post">
 		<form:hidden path="toolContentID" id="toolContentID" />
 		<form:hidden path="valid" id="valid" />
Index: lams_tool_larsrc/web/pages/learning/addfile.jsp
===================================================================
diff -u -r94e36ba92006160e48c47ff2a60bb4f525c011e1 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_larsrc/web/pages/learning/addfile.jsp	(.../addfile.jsp)	(revision 94e36ba92006160e48c47ff2a60bb4f525c011e1)
+++ lams_tool_larsrc/web/pages/learning/addfile.jsp	(.../addfile.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -13,7 +13,7 @@
 	</div>
 	<div class="panel-body">
 	
-	<%@ include file="/common/messages.jsp"%>
+	<lams:errors/>
 	
 	<form:form action="saveOrUpdateItem.do" method="post" modelAttribute="resourceItemForm" id="resourceItemForm" focus="title">
 	
Index: lams_tool_larsrc/web/pages/learning/addurl.jsp
===================================================================
diff -u -r94e36ba92006160e48c47ff2a60bb4f525c011e1 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_larsrc/web/pages/learning/addurl.jsp	(.../addurl.jsp)	(revision 94e36ba92006160e48c47ff2a60bb4f525c011e1)
+++ lams_tool_larsrc/web/pages/learning/addurl.jsp	(.../addurl.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -7,7 +7,7 @@
 	</div>
 	<div class="panel-body">
 	
-	<%@ include file="/common/messages.jsp"%>
+	<lams:errors/>
 	
 	<form:form action="saveOrUpdateItem.do" method="post" modelAttribute="resourceItemForm" id="resourceItemForm" focus="title">
 	
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -165,7 +165,7 @@
 			</lams:Alert>
 		</c:if>
 
-		<%@ include file="/common/messages.jsp"%>
+		<lams:errors/>
 
 		<!--  Instructions -->
 		<div class="panel">
Index: lams_tool_larsrc/web/pages/learning/notebook.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_larsrc/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -26,7 +26,7 @@
 		<form:hidden path="sessionMapID" />
 
 		<div id="content">
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 
 			<p>
 				<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_leader/web/common/empty.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_leader/web/common/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_leader/web/common/header.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_leader/web/common/learnerheader.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_leader/web/common/message.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_leader/web/common/messages.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_mindmap/web/common/empty.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_mindmap/web/common/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_mindmap/web/common/header.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_mindmap/web/common/learnerheader.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_mindmap/web/common/message.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_mindmap/web/common/messages.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_mindmap/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_mindmap/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_tool_mindmap/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -55,7 +55,7 @@
 				</lams:Tabs>
 				
 				<lams:TabBodyArea>
-					<%@ include file="/common/messages.jsp"%>
+					<lams:errors/>
 					 		
 					<!--  Set up tabs  -->
 					<lams:TabBodys>
Index: lams_tool_mindmap/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -rebe9a494826fab1aebb345e6801ad512abb52416 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_mindmap/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision ebe9a494826fab1aebb345e6801ad512abb52416)
+++ lams_tool_mindmap/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -15,7 +15,7 @@
 </lams:head>
 
 <body style="width: 550px">
-	<%@ include file="/common/messages.jsp"%>
+	<lams:errors/>
 	
 	<h4 class="space-left" style="float:left"><fmt:message key="label.authoring.basic.instructions" /></h4>
 	<form:form action="saveOrUpdatePedagogicalPlannerForm.do" modelAttribute="plannerForm" id="pedagogicalPlannerForm" method="post">
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_nb/web/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_nb/web/header.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_nb/web/template/baseContent.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_nb/web/template/learnerTemplate.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_nb/web/template/template.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_notebook/web/common/messages.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/web/pages/authoring/addCondition.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_notebook/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_notebook/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -15,7 +15,7 @@
 		 </form:form>		
 		<form:form action="authoringCondition/saveOrUpdateCondition.do" method="post"
 			modelAttribute="notebookConditionForm" id="notebookConditionForm" focus="displayName">
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 			<form:hidden path="orderId" />
 
 			<div class="form-group">
Index: lams_tool_notebook/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_notebook/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_notebook/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -23,7 +23,7 @@
 		</lams:Tabs>  
 	
 		<lams:TabBodyArea>
-		<%@ include file="/common/messages.jsp"%>
+		<lams:errors/>
 	   
 	    <!--  Set up tabs  -->
 	     <lams:TabBodys>
Index: lams_tool_notebook/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_notebook/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_notebook/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -14,7 +14,7 @@
 	</script>
 </lams:head>
 <body style="width: 550px">
-	<%@ include file="/common/messages.jsp"%>
+	<lams:errors/>
 	<h4 class="space-left" style="float:left"><fmt:message key="label.authoring.basic.instructions" /></h4>
 	<form:form action="/pedagogicalPlanner/saveOrUpdatePedagogicalPlannerForm.do" modelAttribute="pedagogicalPlannerForm" id="pedagogicalPlannerForm" method="post">
 		<form:hidden path="toolContentID" id="toolContentID" />
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_pixlr/web/common/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_pixlr/web/common/message.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_pixlr/web/common/messages.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_pixlr/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_pixlr/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24)
+++ lams_tool_pixlr/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -72,7 +72,7 @@
 				</lams:Tabs>
 			
 				<lams:TabBodyArea>
-					<%@ include file="/common/messages.jsp"%>
+					<lams:errors/>
 					 		
 					<!--  Set up tabs  -->
 					<lams:TabBodys>
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_preview/web/common/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_preview/web/common/messages.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_preview/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r4a6c446731f09a496394db2f52e60431d8160d53 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_preview/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 4a6c446731f09a496394db2f52e60431d8160d53)
+++ lams_tool_preview/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -47,7 +47,7 @@
 		
 		<lams:TabBodyArea>
 		
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 		
 			<lams:TabBodys>
 				<!-- tab content 1 (Basic) -->
Index: lams_tool_preview/web/pages/learning/notebook.jsp
===================================================================
diff -u -r4a6c446731f09a496394db2f52e60431d8160d53 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_preview/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 4a6c446731f09a496394db2f52e60431d8160d53)
+++ lams_tool_preview/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -29,7 +29,7 @@
 
 		<lams:Page type="learner" title="${sessionMap.title}">
 
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 
 			<p>
 				<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -40,7 +40,7 @@
 		</lams:Tabs> 
 		
 		<lams:TabBodyArea>
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 	
 		     <lams:TabBodys>
 				<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_sbmt/web/common/messages.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/learner/notebook.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_sbmt/web/learner/notebook.jsp	(.../notebook.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_sbmt/web/learner/notebook.jsp	(.../notebook.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -19,7 +19,7 @@
 
 	<lams:Page type="learner" title="${sessionMap.title}" formID="refForm">
 
-		<%@ include file="/common/messages.jsp"%>
+		<lams:errors/>
 
 		<div class="panel">
 			<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -170,7 +170,7 @@
 		</c:if>
 		<!-- End notices and announcements -->
 
-		<%@include file="/common/messages.jsp"%>
+		<lams:errors/>
 
 
 		<!--Checks if the filesUploaded property of the SbmtLearnerForm is set -->
Index: lams_tool_sbmt/web/monitoring/mark/updatemark.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_sbmt/web/monitoring/mark/updatemark.jsp	(.../updatemark.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_tool_sbmt/web/monitoring/mark/updatemark.jsp	(.../updatemark.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -69,9 +69,7 @@
 				
 				<%@include file="fileinfo.jsp"%>
 				
-				<logic:messagesPresent>
-					<%@include file="/common/messages.jsp"%>
-				</logic:messagesPresent>
+				<lams:errors/>
 			
 			<dl class="dl-horizontal">		
 				<dt>
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_scratchie/web/common/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_scratchie/web/common/messages.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/web/pages/admin/config.jsp
===================================================================
diff -u -r60b108064c4a844e3f153a849ab51a14bc3a8488 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_scratchie/web/pages/admin/config.jsp	(.../config.jsp)	(revision 60b108064c4a844e3f153a849ab51a14bc3a8488)
+++ lams_tool_scratchie/web/pages/admin/config.jsp	(.../config.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -15,7 +15,7 @@
 			
 			<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="admin.return" /></a>
 			
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 		
 			<c:if test="${savedSuccess}">
 				<lams:Alert type="info" id="admin-success" close="false">
Index: lams_tool_scratchie/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r8d1160279291def89c118e8e21125b53d5bf62a5 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_scratchie/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 8d1160279291def89c118e8e21125b53d5bf62a5)
+++ lams_tool_scratchie/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -57,7 +57,7 @@
 			</lams:Tabs>
 	
 			<lams:TabBodyArea>
-				<%@ include file="/common/messages.jsp"%>
+				<lams:errors/>
 		
 				 <lams:TabBodys>
 					 <!-- tab content 1 (Basic) -->
Index: lams_tool_scratchie/web/pages/authoring/parts/additem.jsp
===================================================================
diff -u -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_scratchie/web/pages/authoring/parts/additem.jsp	(.../additem.jsp)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
+++ lams_tool_scratchie/web/pages/authoring/parts/additem.jsp	(.../additem.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -218,7 +218,7 @@
 				</div>
 			<div class="panel-body panel-${type}-body">
 	
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 			
 			<form:form action="/lams/tool/lascrt11/authoring/saveItem.do" method="post" modelAttribute="scratchieItemForm" id="scratchieItemForm">
 				<form:hidden path="sessionMapID" />
Index: lams_tool_scratchie/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r60b108064c4a844e3f153a849ab51a14bc3a8488 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_scratchie/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 60b108064c4a844e3f153a849ab51a14bc3a8488)
+++ lams_tool_scratchie/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -44,7 +44,7 @@
   	</script>
 </lams:head>
 <body id="body">
-	<%@ include file="/common/messages.jsp"%>
+	<lams:errors/>
 	<form:form enctype="multipart/form-data" modelAttribute="pedagogicalPlannerForm" action="/lams/tool/lascrt11/authoring/saveOrUpdatePedagogicalPlannerForm.do" id="pedagogicalPlannerForm" method="post">
 		<form:hidden path="toolContentID" id="toolContentID" />
 		<form:hidden path="valid" id="valid" />
Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -261,7 +261,7 @@
 			</div>
 		</c:if>
 
-		<%@ include file="/common/messages.jsp"%>
+		<lams:errors/>
 
 		<div id="questionListArea">
 			<%@ include file="questionlist.jsp"%>
Index: lams_tool_scratchie/web/pages/learning/notebook.jsp
===================================================================
diff -u -r60b108064c4a844e3f153a849ab51a14bc3a8488 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_scratchie/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 60b108064c4a844e3f153a849ab51a14bc3a8488)
+++ lams_tool_scratchie/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -28,7 +28,7 @@
 
 		<lams:Page type="learner" title="${sessionMap.title}">
 
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 
 			<div class="panel">
 				<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
Index: lams_tool_scratchie/web/pages/learning/results.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_scratchie/web/pages/learning/results.jsp	(.../results.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_tool_scratchie/web/pages/learning/results.jsp	(.../results.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -353,7 +353,7 @@
 			</lams:Alert>
 		</c:if>
 
-		<%@ include file="/common/messages.jsp"%>
+		<lams:errors/>
 
 		<lams:Alert id="score" type="info" close="false">
 			<fmt:message key="label.you.ve.got">
Index: lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp	(.../itemSummary.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp	(.../itemSummary.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -102,7 +102,7 @@
 			<h3>
 				<c:out value="${item.description}" escapeXml="false"/>
 			</h3>	
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 			
 			<c:forEach var="summary" items="${summaryList}" varStatus="status">
 				<div class="panel panel-default" >
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_scribe/web/common/empty.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_scribe/web/common/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_scribe/web/common/header.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_scribe/web/common/learnerheader.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_scribe/web/common/message.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_scribe/web/layouts/blankLayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_scribe/web/layouts/defaultLayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_scribe/web/layouts/learningLayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_scribe/web/layouts/tabLayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/common/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/common/messages.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_spreadsheet/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_spreadsheet/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
+++ lams_tool_spreadsheet/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -52,7 +52,7 @@
 	    </lams:Tabs>   
 
 		<lams:TabBodyArea>
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
                
 			<!--  Set up tabs  -->
 			<lams:TabBodys>
Index: lams_tool_spreadsheet/web/pages/learning/learning.jsp
===================================================================
diff -u -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_spreadsheet/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
+++ lams_tool_spreadsheet/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -58,7 +58,7 @@
 		</c:if>
 		
 
-		<%@ include file="/common/messages.jsp"%>
+		<lams:errors/>
 		
 		<p>
 			<c:out value="${spreadsheet.instructions}" escapeXml="false"/>
Index: lams_tool_spreadsheet/web/pages/learning/notebook.jsp
===================================================================
diff -u -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_spreadsheet/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
+++ lams_tool_spreadsheet/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -28,7 +28,7 @@
 		<form:hidden path="userID" />
 		<form:hidden path="sessionMapID" />
 
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 
 			<p>
 				<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
Index: lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp
===================================================================
diff -u -r1c2cbdf724dbd52eb7515ffa2e429e0abfa06787 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp	(.../editmark.jsp)	(revision 1c2cbdf724dbd52eb7515ffa2e429e0abfa06787)
+++ lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp	(.../editmark.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -16,7 +16,7 @@
 	<lams:Page type="learner" title="${title}" formID="markForm">
 	
 		<!-- Basic Info Form-->
- 		<%@ include file="/common/messages.jsp"%>
+ 		<lams:errors/>
 
 		<p><fmt:message key="label.reviewitem.spreadsheet.sent.by" />&nbsp;<strong>${markForm.userName}</strong></p>
 		
Index: lams_tool_spreadsheet/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_spreadsheet/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -75,7 +75,7 @@
 <i class="fa fa-refresh fa-spin fa-fw" style="display:none" id="messageArea_Busy"></i>
 <span id="messageArea"></span>
 
-<%@ include file="/common/messages.jsp"%>
+<lams:errors/>
 
 <div id="summariesArea">
 	<%@ include file="/pages/monitoring/parts/summarylist.jsp"%>
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_survey/web/common/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_survey/web/common/messages.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_survey/web/pages/authoring/addCondition.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_survey/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -14,7 +14,7 @@
 	 <form:form modelAttribute="surveyConditionForm">
 	 </form:form>
 	<form:form action="../authoringCondition/saveOrUpdateCondition.do" method="post" modelAttribute="surveyConditionForm" id="surveyConditionForm" focus="displayName" >
-		<%@ include file="/common/messages.jsp"%>
+		<lams:errors/>
 		<form:hidden path="orderId" />
 		
 		<div class="form-group">
Index: lams_tool_survey/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_survey/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -48,7 +48,7 @@
 	
 			<lams:TabBodyArea>
 			
-				<%@ include file="/common/messages.jsp"%>
+				<lams:errors/>
 	
 				<lams:TabBodys>
 					<!-- tab content 1 (Basic) -->
Index: lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp	(.../addchoicequestion.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp	(.../addchoicequestion.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -19,7 +19,7 @@
 	
 			<form:form action="saveOrUpdateItem.do" modelAttribute="surveyItemForm" id="surveyItemForm" method="post">
 			
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 				<%-- This field is not belong STRUTS form --%>
 				<input type="hidden" name="instructionList" id="instructionList" />
 				<form:hidden path="sessionMapID" />
Index: lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp	(.../addopenquestion.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp	(.../addopenquestion.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -19,7 +19,7 @@
 			<form:hidden path="contentFolderID" />
 			<form:hidden path="itemIndex" />
 			<form:hidden path="itemType" value="3" />
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 
 			<div class="form-group">
 				<label for="question.description"><fmt:message key="label.question" /></label>
Index: lams_tool_survey/web/pages/learning/notebook.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_survey/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -27,7 +27,7 @@
 				<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
 			</div>
 
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 
 			<form:textarea rows="5" id="focused" path="entryText" cssClass="form-control" />
 
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_task/web/common/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_task/web/common/messages.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_task/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_task/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -82,7 +82,7 @@
 			</lams:Tabs>
 			
 			<lams:TabBodyArea>
-				<%@ include file="/common/messages.jsp"%>
+				<lams:errors/>
 		
 				<lams:TabBodys>
 					<!-- tab content 1 (Basic) -->
Index: lams_tool_task/web/pages/authoring/parts/addcondition.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_task/web/pages/authoring/parts/addcondition.jsp	(.../addcondition.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/pages/authoring/parts/addcondition.jsp	(.../addcondition.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -22,7 +22,7 @@
 			<!-- Basic Info Form-->
 			<form:form action="../authoringCondition/saveOrUpdateCondition.do" method="post" modelAttribute="taskListConditionForm" id="taskListConditionForm" focus="name"
 			 onSubmit="javascript:return false;" >
-				<%@ include file="/common/messages.jsp"%>
+				<lams:errors/>
 				<form:hidden path="sessionMapID" />
 				<form:hidden path="sequenceId" />
 	
Index: lams_tool_task/web/pages/authoring/parts/addtask.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_task/web/pages/authoring/parts/addtask.jsp	(.../addtask.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/pages/authoring/parts/addtask.jsp	(.../addtask.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -26,7 +26,7 @@
 			
 		<div class="panel-body">
 
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 
 			<form:form action="saveOrUpdateItem.do" modelAttribute="taskListItemForm" method="post" id="taskListItemForm" focus="title" >
 	
Index: lams_tool_task/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_task/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -52,7 +52,7 @@
   	</script>
 </lams:head>
 <body id="body">
-	<%@ include file="/common/messages.jsp"%>
+	<lams:errors/>
 	<h4 class="space-left"><fmt:message key="planner.item.title"/></h4>
 	<form:form  action="saveOrUpdatePedagogicalPlannerForm.do"  modelAttribute="plannerForm" id="pedagogicalPlannerForm" method="post">
 		<form:hidden path="toolContentID" id="toolContentID" />
Index: lams_tool_task/web/pages/learning/learning.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_task/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -116,7 +116,7 @@
 
 		<!--Task Information-->
 
-		<%@ include file="/common/messages.jsp"%>
+		<lams:errors/>
 
 		<c:if test="${not empty taskList.submissionDeadline}">
 			<lams:Alert id="submissionDeadline" type="info" close="true">
Index: lams_tool_task/web/pages/learning/parts/addtask.jsp
===================================================================
diff -u -ra76d96d2c8738e06130ab51ea379fe34bea5fbd8 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_task/web/pages/learning/parts/addtask.jsp	(.../addtask.jsp)	(revision a76d96d2c8738e06130ab51ea379fe34bea5fbd8)
+++ lams_tool_task/web/pages/learning/parts/addtask.jsp	(.../addtask.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -35,7 +35,7 @@
 		<h5>
 			<fmt:message key="label.learning.new.task.details" />
 		</h5>
-		<%@ include file="/common/messages.jsp"%>
+		<lams:errors/>
 
 		<div class="form-group">
 			<label for="taskTitle">
Index: lams_tool_task/web/pages/learning/parts/notebook.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_task/web/pages/learning/parts/notebook.jsp	(.../notebook.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/pages/learning/parts/notebook.jsp	(.../notebook.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -24,7 +24,7 @@
 
 		<lams:Page type="learner" title="${sessionMap.title}" formID="messageForm">
 
-			<%@ include file="/common/messages.jsp"%>
+			<lams:errors/>
 
 			<p>
 				<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
Index: lams_tool_vote/web/authoring/AuthoringMaincontent.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_vote/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_vote/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -124,7 +124,7 @@
 	         </lams:Tabs>   
 
 			<lams:TabBodyArea>
-				<%@ include file="/common/messages.jsp"%>
+				<lams:errors/>
               
                 <!--  Set up tabs  -->
                  <lams:TabBodys>
Index: lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194
--- lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
@@ -68,7 +68,7 @@
   	</script>
 </lams:head>
 <body id="body">
-	<%@ include file="/common/messages.jsp"%>
+	<lams:errors/>
 	<form:form action="<lams:WebAppURL />pedagogicalPlanner/saveOrUpdatePedagogicalPlannerForm.do" modelAttribute="pedagogicalPlannerForm" method="post">
 		<form:hidden path="toolContentID" />
 		<form:hidden path="valid" />
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_vote/web/common/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_vote/web/common/messages.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_wiki/web/common/empty.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_wiki/web/common/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_wiki/web/common/header.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_wiki/web/common/learnerheader.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 refers to a dead (removed) revision in file `lams_tool_wiki/web/common/message.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?