Index: lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -90,7 +91,7 @@
     	}
     }
     function doCancel() {
-    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+    	if(confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='${cancelConfirmMsgKey}'/></spring:escapeBody>")){
     		closeWindow("cancel");
     	}
     }
Index: lams_tool_daco/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -rfa2b057ec9dda91bbe9fa54337c32c443f561cd1 -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_daco/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision fa2b057ec9dda91bbe9fa54337c32c443f561cd1)
+++ lams_tool_daco/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -148,8 +149,8 @@
 <script type="text/javascript">
 	var minimumWordsSpinnerArray  = new Array();
 	var maxOrderId;
-	var criteriaArrows = '<div class="arrow-up" title="<fmt:message key="${upLabel}"/>" />' + 
-	 					 '<div class="arrow-down" title="<fmt:message key="${downLabel}"/>" />';
+	var criteriaArrows = '<div class="arrow-up" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+	 					 '<div class="arrow-down" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />';
 	  
 	var newGroupId = -1; // groups existing in DB have ID > 0; new, unsaved ones have ID < 0
 	const MAX_RUBRICS_COLUMNS = 5;
@@ -255,7 +256,7 @@
 		if ( validate ) {
 			str += ' onchange="validateRatingLimits('+validate+','+orderId+');" '
 		} 
-		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><fmt:message key="${allLabel}"/></option>';
+		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><spring:escapeBody javaScriptEscape="true"><fmt:message key="${allLabel}"/></spring:escapeBody></option>';
 		if ( zeroDescription ) {
 			str += '<option value="0" '+ ( 0 == currentValue ? ' selected="selected"' : '' ) + '>'+zeroDescription+'</option>';
 		}
@@ -320,52 +321,52 @@
 		if ( style == 0 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateManadatorySpinner(orderId, '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateManadatorySpinner(orderId, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleComment}" />:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleComment}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, true);
 			
 		} else if ( style == 1 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${allowCommentsLabel}" /></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleStar}" /></spring:escapeBody>:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');
 				
 			activateSpinner(orderId, justifyOrComment);
 			
 		} else if ( style == 2 ) { 
-			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><fmt:message key="${rankLabel}"/></label>&nbsp;'
+			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${rankLabel}"/></spring:escapeBody></label>&nbsp;'
 			  + generateSelect('maxRating' + orderId, null, null, orderId, maxRating);
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleRanking}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
 			})).appendTo('#criterias-table-body');
 	
 		} else if ( style == 3) {
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' + inputField + hiddenInputs
-				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleHedging}" /></spring:escapeBody>:&nbsp;</div>' + inputField + hiddenInputs
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${hedgeRankLabel}"/></spring:escapeBody>&nbsp;</label>'
 			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
-				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+				 + generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${justifyLabel}"/></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit)
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, justifyOrComment);
@@ -417,7 +418,7 @@
 		// it deletes either whole criterion or a rubrics row (which is also a criterion)
 		row.append($('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times delete-criteria" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times delete-criteria" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		}));
 	}
 
@@ -433,7 +434,7 @@
 		var cell = $('<td />', {
 			'class': 'criteria-info',
 			// arrows to move whole rubrics table
-		    html: '<div class="voffset5"><fmt:message key="label.rating.style.rubrics" />:<div class="pull-right">' + criteriaArrows + '</div></div>'
+		    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.style.rubrics" /></spring:escapeBody>:<div class="pull-right">' + criteriaArrows + '</div></div>'
 		}).attr('colspan', '3').appendTo(row);
 
 		var rubricsTable = $("<table />").addClass('table-striped table-condensed rubrics-table').attr('groupId', groupId).appendTo(cell)
@@ -443,7 +444,7 @@
 				$(this).closest('tr').find('textarea').height(height);
 			}),
 			addColumnButton = $('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 rubrics-add-column-button')
-										   	 .text('<fmt:message key="label.rating.rubrics.column.add" />').click(function(){
+										   	 .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.add" /></spring:escapeBody>').click(function(){
 						var columns = $('.rubrics-columns-part .rubrics-column', rubricsTable);
 						// no more than X columns allowed
 						if (columns.length >= MAX_RUBRICS_COLUMNS) {
@@ -457,7 +458,7 @@
 
 						// add delete button
 						$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-								  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+								  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 							deleteRubricsColumn($(this));
 						});
 
@@ -489,7 +490,7 @@
 		}
 		
 		$('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 roffset10')
-					   .text('<fmt:message key="label.rating.rubrics.row.add" />').click(function(){
+					   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.add" /></spring:escapeBody>').click(function(){
 			// this will add a row to the existing rubrics table with the given group ID
 			maxOrderId++;
 			$("#criteria-max-order-id").val(maxOrderId);
@@ -503,7 +504,7 @@
 		row.append('<th />');
 
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.headers" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.headers" /></spring:escapeBody>')
 				   .appendTo(row);
 		// empty cell for action buttons
 		$('<th />').attr('colspan', 2).appendTo(row);
@@ -516,7 +517,7 @@
 		for (var i = 0; i < rubricsColumnsLength; i++) {
 			cell = $('<td />').appendTo(row);
 			$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-					  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+					  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 				deleteRubricsColumn($(this));
 			});
 			
@@ -528,9 +529,9 @@
 
 		// description of the rows part
 		row = $('<tr />').addClass('rubrics-rows-part').appendTo(rubricsTable);
-		$('<th />').addClass('rubrics-row-title').text('<fmt:message key="label.rating.rubrics.row.headers" />').appendTo(row);
+		$('<th />').addClass('rubrics-row-title').text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.headers" /></spring:escapeBody>').appendTo(row);
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.content" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.content" /></spring:escapeBody>')
 				   .appendTo(row);
 		$('<td />').attr('colspan', 2).appendTo(row);
 
@@ -624,7 +625,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_tool_daco/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r500f37cffc230632ac8b906e91bcddd44836a814 -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_daco/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 500f37cffc230632ac8b906e91bcddd44836a814)
+++ lams_tool_daco/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -132,12 +133,12 @@
 		    		
 		})).append(jQuery('<td/>', {
 			width: '40px',
-			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
-		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />'
 		    		
 		})).append(jQuery('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		})).appendTo('#criterias-table');
 		
 		reactivateArrows();
@@ -257,7 +258,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r006c6b1060de8f84a95f80940553251f22e7a60a -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 006c6b1060de8f84a95f80940553251f22e7a60a)
+++ lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -11,6 +11,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="csrfguard" prefix="csrf" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
@@ -53,10 +54,10 @@
 		outcomeMappingIds${outcomeTagId} = [],
 		outcomeAddEnabled = true,
 		
-		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeExistingNoneLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.existing.none" /></spring:escapeBody>',
+		outcomeCreateNewLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.create.new" /></spring:escapeBody>',
 		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
-		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
+		outcomeMappingRemoveConfirm = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.remove.confirm" /></spring:escapeBody>';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
Index: lams_tool_daco/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -2,6 +2,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -186,7 +187,7 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
Index: lams_tool_daco/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_daco/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_daco/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -188,7 +189,7 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
Index: lams_tool_daco/web/common/taglibs.jsp
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_daco/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_daco/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -5,4 +5,5 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-xml" prefix="x" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
\ No newline at end of file
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
\ No newline at end of file
Index: lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp
===================================================================
diff -u -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp	(.../addcheckbox.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
+++ lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp	(.../addcheckbox.jsp)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -10,8 +10,8 @@
 	<script type="text/javascript">
 	   var removeAnswerOptionUrl = "<c:url value='/authoring/removeAnswerOption.do'/>";
        var addAnswerOptionUrl = "<c:url value='/authoring/newAnswerOption.do'/>";
-	   var msgShowAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.show' />";
-       var msgHideAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.hide' />";
+	   var msgShowAdditionalOptions = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.basic.additionaloptions.show' /></spring:escapeBody>";
+       var msgHideAdditionalOptions = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.basic.additionaloptions.hide' /></spring:escapeBody>";
 	   	//Initial behavior
 	   	$(document).ready(function() {
 	   		defaultShowAdditionaOptionsArea();
Index: lams_tool_daco/web/pages/authoring/parts/adddate.jsp
===================================================================
diff -u -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_daco/web/pages/authoring/parts/adddate.jsp	(.../adddate.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
+++ lams_tool_daco/web/pages/authoring/parts/adddate.jsp	(.../adddate.jsp)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -8,8 +8,8 @@
 	<lams:css />
 	<!-- To use in external script files. -->
 	<script type="text/javascript">
-	   var msgShowAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.show' />";
-       var msgHideAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.hide' />";
+	   var msgShowAdditionalOptions = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.basic.additionaloptions.show' /></spring:escapeBody>";
+       var msgHideAdditionalOptions = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.basic.additionaloptions.hide' /></spring:escapeBody>";
 	   	//Initial behavior
 	   	$(document).ready(function() {
 	   		defaultShowAdditionaOptionsArea();
Index: lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp
===================================================================
diff -u -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp	(.../adddropdown.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
+++ lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp	(.../adddropdown.jsp)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -10,8 +10,8 @@
 	<script type="text/javascript">
 	   var removeAnswerOptionUrl = "<c:url value='/authoring/removeAnswerOption.do'/>";
        var addAnswerOptionUrl = "<c:url value='/authoring/newAnswerOption.do'/>";
-	   var msgShowAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.show' />";
-       var msgHideAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.hide' />";
+	   var msgShowAdditionalOptions = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.basic.additionaloptions.show' /></spring:escapeBody>";
+       var msgHideAdditionalOptions = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.basic.additionaloptions.hide' /></spring:escapeBody>";
 	   	//Initial behavior
 	   	$(document).ready(function() {
 	   		defaultShowAdditionaOptionsArea();
Index: lams_tool_daco/web/pages/authoring/parts/addfile.jsp
===================================================================
diff -u -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_daco/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
+++ lams_tool_daco/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -8,8 +8,8 @@
 	<lams:css/>
 	<!-- To use in external script files. -->
 	<script type="text/javascript">
-	   var msgShowAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.show' />";
-       var msgHideAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.hide' />";
+	   var msgShowAdditionalOptions = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.basic.additionaloptions.show' /></spring:escapeBody>";
+       var msgHideAdditionalOptions = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.basic.additionaloptions.hide' /></spring:escapeBody>";
 	   	//Initial behavior
 	   	$(document).ready(function() {
 	   		defaultShowAdditionaOptionsArea();
Index: lams_tool_daco/web/pages/authoring/parts/addimage.jsp
===================================================================
diff -u -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_daco/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
+++ lams_tool_daco/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -8,8 +8,8 @@
 	<lams:css/>
 	<!-- To use in external script files. -->
 	<script type="text/javascript">
-	   var msgShowAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.show' />";
-       var msgHideAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.hide' />";
+	   var msgShowAdditionalOptions = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.basic.additionaloptions.show' /></spring:escapeBody>";
+       var msgHideAdditionalOptions = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.basic.additionaloptions.hide' /></spring:escapeBody>";
 	   	//Initial behavior
 	   	$(document).ready(function() {
 	   		defaultShowAdditionaOptionsArea();
Index: lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp
===================================================================
diff -u -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp	(.../addlonglat.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
+++ lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp	(.../addlonglat.jsp)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -10,8 +10,8 @@
 	<lams:css />
 	<!-- To use in external script files. -->
 	<script type="text/javascript">
-	   var msgShowAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.show' />";
-       var msgHideAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.hide' />";
+	   var msgShowAdditionalOptions = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.basic.additionaloptions.show' /></spring:escapeBody>";
+       var msgHideAdditionalOptions = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.basic.additionaloptions.hide' /></spring:escapeBody>";
 	   	//Initial behavior
 	   	$(document).ready(function() {
 	   		defaultShowAdditionaOptionsArea();
Index: lams_tool_daco/web/pages/authoring/parts/addnumber.jsp
===================================================================
diff -u -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_daco/web/pages/authoring/parts/addnumber.jsp	(.../addnumber.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
+++ lams_tool_daco/web/pages/authoring/parts/addnumber.jsp	(.../addnumber.jsp)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -8,8 +8,8 @@
 	<lams:css/>
 	<!-- To use in external script files. -->
 	<script type="text/javascript">
-	   var msgShowAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.show' />";
-       var msgHideAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.hide' />";
+	   var msgShowAdditionalOptions = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.basic.additionaloptions.show' /></spring:escapeBody>";
+       var msgHideAdditionalOptions = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.basic.additionaloptions.hide' /></spring:escapeBody>";
 	   	//Initial behavior
 	   	$(document).ready(function() {
 	   		defaultShowAdditionaOptionsArea();
Index: lams_tool_daco/web/pages/authoring/parts/addradio.jsp
===================================================================
diff -u -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_daco/web/pages/authoring/parts/addradio.jsp	(.../addradio.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
+++ lams_tool_daco/web/pages/authoring/parts/addradio.jsp	(.../addradio.jsp)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -10,8 +10,8 @@
 	<script type="text/javascript">
 	   var removeAnswerOptionUrl = "<c:url value='/authoring/removeAnswerOption.do'/>";
        var addAnswerOptionUrl = "<c:url value='/authoring/newAnswerOption.do'/>";
-	   var msgShowAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.show' />";
-       var msgHideAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.hide' />";
+	   var msgShowAdditionalOptions = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.basic.additionaloptions.show' /></spring:escapeBody>";
+       var msgHideAdditionalOptions = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.basic.additionaloptions.hide' /></spring:escapeBody>";
 	   	//Initial behavior
 	   	$(document).ready(function() {
 	   		defaultShowAdditionaOptionsArea();
Index: lams_tool_daco/web/pages/authoring/parts/addtextarea.jsp
===================================================================
diff -u -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_daco/web/pages/authoring/parts/addtextarea.jsp	(.../addtextarea.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
+++ lams_tool_daco/web/pages/authoring/parts/addtextarea.jsp	(.../addtextarea.jsp)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -8,8 +8,8 @@
 	<lams:css/>
 	<!-- To use in external script files. -->
 	<script type="text/javascript">
-	   var msgShowAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.show' />";
-       var msgHideAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.hide' />";
+	   var msgShowAdditionalOptions = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.basic.additionaloptions.show' /></spring:escapeBody>";
+       var msgHideAdditionalOptions = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.basic.additionaloptions.hide' /></spring:escapeBody>";
 	   	//Initial behavior
 	   	$(document).ready(function() {
 	   		defaultShowAdditionaOptionsArea();
Index: lams_tool_daco/web/pages/authoring/parts/addtextfield.jsp
===================================================================
diff -u -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_daco/web/pages/authoring/parts/addtextfield.jsp	(.../addtextfield.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
+++ lams_tool_daco/web/pages/authoring/parts/addtextfield.jsp	(.../addtextfield.jsp)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -8,8 +8,8 @@
 	<lams:css/>
 	<!-- To use in external script files. -->
 	<script type="text/javascript">
-	   var msgShowAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.show' />";
-       var msgHideAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.hide' />";
+	   var msgShowAdditionalOptions = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.basic.additionaloptions.show' /></spring:escapeBody>";
+       var msgHideAdditionalOptions = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.basic.additionaloptions.hide' /></spring:escapeBody>";
 	   	//Initial behavior
 	   	$(document).ready(function() {
 	   		defaultShowAdditionaOptionsArea();
Index: lams_tool_daco/web/pages/authoring/parts/answeroptions.jsp
===================================================================
diff -u -rdc8a38f2c23fa53840679c499e56fdbc652b8d7a -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_daco/web/pages/authoring/parts/answeroptions.jsp	(.../answeroptions.jsp)	(revision dc8a38f2c23fa53840679c499e56fdbc652b8d7a)
+++ lams_tool_daco/web/pages/authoring/parts/answeroptions.jsp	(.../answeroptions.jsp)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -2,7 +2,7 @@
 
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
 <c:set var="listSize" value="${fn:length(answerOptionList)}" />
-<c:set var="ordinal"><fmt:message key="label.authoring.basic.answeroption.ordinal"/></c:set>
+<c:set var="ordinal"><spring:escapeBody javaScriptEscape='true'></spring:escapeBody><fmt:message key="label.authoring.basic.answeroption.ordinal"/></spring:escapeBody></c:set>
 
 <div id="answerOptionsArea" class="voffset10">
 <form id="answerOptionsForm"><input type="hidden" id="answerOptionCount" name="answerOptionCount" value="${listSize}"/>
Index: lams_tool_daco/web/pages/authoring/parts/buttons.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_daco/web/pages/authoring/parts/buttons.jsp	(.../buttons.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_daco/web/pages/authoring/parts/buttons.jsp	(.../buttons.jsp)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -1,4 +1,4 @@
 <div class="voffset5">
-	<a href="#" onclick="javascript:submitDacoQuestion()" class="btn btn-default btn-xs pull-right loffset5"> <fmt:message key="${addButtonMessageKey}" /> </a> 
-	<a href="#" onclick="javascript:cancelDacoQuestion()" class="btn btn-default btn-xs loffset5 pull-right"> <fmt:message key="label.common.cancel" /> </a>
+	<a href="#" onclick="javascript:submitDacoQuestion()" class="btn btn-default btn-xs pull-right loffset5"> <fmt:message key="${addButtonMessageKey}" /></a> 
+	<a href="#" onclick="javascript:cancelDacoQuestion()" class="btn btn-default btn-xs loffset5 pull-right"> <fmt:message key="label.common.cancel" /></a>
 </div>
Index: lams_tool_daco/web/pages/learning/addRecord.jsp
===================================================================
diff -u -rdee1313f3a1d0a71354604278d1bfc6cb9d49a9d -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_daco/web/pages/learning/addRecord.jsp	(.../addRecord.jsp)	(revision dee1313f3a1d0a71354604278d1bfc6cb9d49a9d)
+++ lams_tool_daco/web/pages/learning/addRecord.jsp	(.../addRecord.jsp)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -10,7 +10,7 @@
 <%-- If the view is horizontal or vertical --%>
 <c:set var="horizontal" value="${sessionMap.learningView=='horizontal'}" />
 <%-- To display A) B) C) in answer options instead of 1) 2) 3) --%>
-<c:set var="ordinal"><fmt:message key="label.authoring.basic.answeroption.ordinal"/></c:set>
+<c:set var="ordinal"><spring:escapeBody javaScriptEscape='true'><fmt:message key="label.authoring.basic.answeroption.ordinal"/></spring:escapeBody></c:set>
 <c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 
 <div class="voffset10">
Index: lams_tool_daco/web/pages/learning/learning.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_daco/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_daco/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -51,15 +51,10 @@
 		var UPLOAD_FILE_MAX_SIZE = '${UPLOAD_FILE_MAX_SIZE}';
 	 	var EXE_STRING = '${EXE_STRING}';
 	 	
-		<fmt:message key="errors.maxfilesize" var="LABEL_MAX_FILE_SIZE_VAR"><param>{0}</param></fmt:message>
-		var LABEL_MAX_FILE_SIZE = '<c:out value="${LABEL_MAX_FILE_SIZE_VAR}" />';
-		
-		<fmt:message key="error.attachment.executable" var="LABEL_NOT_ALLOWED_EXE_VAR"/>
-		var LABEL_NOT_ALLOWED_EXE = '<c:out value="${LABEL_NOT_ALLOWED_EXE_VAR}" />';	
+		var LABEL_MAX_FILE_SIZE = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="errors.maxfilesize"><param>{0}</param></fmt:message></spring:escapeBody>';
+		var LABEL_NOT_ALLOWED_EXE = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.attachment.executable"/></spring:escapeBody>';
+		var LABEL_NOT_ALLOWED_FORMAT = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.attachment.must.be.image"/></spring:escapeBody>';
 
-		<fmt:message key="error.attachment.must.be.image" var="LABEL_NOT_ALLOWED_FORMAT_VAR"/>
-		var LABEL_NOT_ALLOWED_FORMAT = '<c:out value="${LABEL_NOT_ALLOWED_FORMAT_VAR}" />';	
-
     </script>
     <lams:JSImport src="includes/javascript/dacoLearning.js" relative="true" />
 </lams:head>
Index: lams_tool_daco/web/pages/learning/questionSummaries.jsp
===================================================================
diff -u -rdee1313f3a1d0a71354604278d1bfc6cb9d49a9d -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_daco/web/pages/learning/questionSummaries.jsp	(.../questionSummaries.jsp)	(revision dee1313f3a1d0a71354604278d1bfc6cb9d49a9d)
+++ lams_tool_daco/web/pages/learning/questionSummaries.jsp	(.../questionSummaries.jsp)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -16,7 +16,7 @@
 </c:if>
 <c:set var="daco" value="${sessionMap.daco}" />
 <c:set var="questionSummaries" value="${sessionMap.questionSummaries}" />
-<c:set var="ordinal"><fmt:message key="label.authoring.basic.answeroption.ordinal"/></c:set>
+<c:set var="ordinal"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.authoring.basic.answeroption.ordinal"/></spring:escapeBody></c:set>
 
 <c:set var="userRecordCount" value="${includeMode=='monitoring' ? sessionMap.recordCount : fn:length(recordList)}" />
 <c:set var="groupRecordCount" value="${sessionMap.totalRecordCount}" />
Index: lams_tool_daco/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_daco/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_daco/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -26,7 +26,7 @@
             	resizable: true,
             	// include column filters 
                 filter_columnFilters: true, 
-                filter_placeholder: { search : '<fmt:message key="label.search"/>' }, 
+                filter_placeholder: { search : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.search"/></spring:escapeBody>' }, 
                 filter_searchDelay: 700 
             }
 		});
@@ -60,11 +60,11 @@
 							rows += '<td align="center">';
 							if ( userData["recordCount"] > 0) {
 								var url = '<c:url value="/monitoring/listRecords.do"/>?sessionMapID=${sessionMapID}&toolSessionID='+$(table).attr('data-session-id')+'&sort=1&userId='+userData["userId"];
-								var popUpTitle = '<fmt:message key="title.monitoring.recordlist" />';
+								var popUpTitle = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="title.monitoring.recordlist" /></spring:escapeBody>';
 								rows +=	'&nbsp;&nbsp;<a href="#" onclick="javascript:launchPopup(\''+url+'\',\''+popUpTitle+'\');" class="btn btn-default btn-xs">';
 								rows += 'View Records'
 								url = '<c:url value="/monitoring/getQuestionSummaries.do"/>?sessionMapID=${sessionMapID}&toolSessionID='+$(table).attr('data-session-id')+'&userId='+userData["userId"];
-								popUpTitle = '<fmt:message key="label.common.summary" />';
+								popUpTitle = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.common.summary" /></spring:escapeBody>';
 								rows += '</a>&nbsp;&nbsp;<a href="#" onclick="javascript:launchPopup(\''+url+'\',\''+popUpTitle+'\');" class="btn btn-default btn-xs">';
 								rows += 'View Summary'
 								rows += '</a>';
@@ -74,7 +74,7 @@
 							
 							if (${daco.reflectOnActivity}) {
 								rows += '<td style="text-align: left">';
-								rows += (userData["notebookEntry"]) ? userData["notebookEntry"] : '<fmt:message key="label.monitoring.notebook.none" />' ;
+								rows += (userData["notebookEntry"]) ? userData["notebookEntry"] : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.notebook.none" /></spring:escapeBody>' ;
 								rows += '</td>';
 							}
 							
Index: lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -90,7 +91,7 @@
     	}
     }
     function doCancel() {
-    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+    	if(confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='${cancelConfirmMsgKey}'/></spring:escapeBody>")){
     		closeWindow("cancel");
     	}
     }
Index: lams_tool_leader/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -rfa2b057ec9dda91bbe9fa54337c32c443f561cd1 -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_leader/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision fa2b057ec9dda91bbe9fa54337c32c443f561cd1)
+++ lams_tool_leader/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -148,8 +149,8 @@
 <script type="text/javascript">
 	var minimumWordsSpinnerArray  = new Array();
 	var maxOrderId;
-	var criteriaArrows = '<div class="arrow-up" title="<fmt:message key="${upLabel}"/>" />' + 
-	 					 '<div class="arrow-down" title="<fmt:message key="${downLabel}"/>" />';
+	var criteriaArrows = '<div class="arrow-up" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+	 					 '<div class="arrow-down" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />';
 	  
 	var newGroupId = -1; // groups existing in DB have ID > 0; new, unsaved ones have ID < 0
 	const MAX_RUBRICS_COLUMNS = 5;
@@ -255,7 +256,7 @@
 		if ( validate ) {
 			str += ' onchange="validateRatingLimits('+validate+','+orderId+');" '
 		} 
-		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><fmt:message key="${allLabel}"/></option>';
+		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><spring:escapeBody javaScriptEscape="true"><fmt:message key="${allLabel}"/></spring:escapeBody></option>';
 		if ( zeroDescription ) {
 			str += '<option value="0" '+ ( 0 == currentValue ? ' selected="selected"' : '' ) + '>'+zeroDescription+'</option>';
 		}
@@ -320,52 +321,52 @@
 		if ( style == 0 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateManadatorySpinner(orderId, '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateManadatorySpinner(orderId, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleComment}" />:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleComment}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, true);
 			
 		} else if ( style == 1 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${allowCommentsLabel}" /></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleStar}" /></spring:escapeBody>:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');
 				
 			activateSpinner(orderId, justifyOrComment);
 			
 		} else if ( style == 2 ) { 
-			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><fmt:message key="${rankLabel}"/></label>&nbsp;'
+			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${rankLabel}"/></spring:escapeBody></label>&nbsp;'
 			  + generateSelect('maxRating' + orderId, null, null, orderId, maxRating);
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleRanking}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
 			})).appendTo('#criterias-table-body');
 	
 		} else if ( style == 3) {
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' + inputField + hiddenInputs
-				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleHedging}" /></spring:escapeBody>:&nbsp;</div>' + inputField + hiddenInputs
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${hedgeRankLabel}"/></spring:escapeBody>&nbsp;</label>'
 			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
-				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+				 + generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${justifyLabel}"/></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit)
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, justifyOrComment);
@@ -417,7 +418,7 @@
 		// it deletes either whole criterion or a rubrics row (which is also a criterion)
 		row.append($('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times delete-criteria" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times delete-criteria" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		}));
 	}
 
@@ -433,7 +434,7 @@
 		var cell = $('<td />', {
 			'class': 'criteria-info',
 			// arrows to move whole rubrics table
-		    html: '<div class="voffset5"><fmt:message key="label.rating.style.rubrics" />:<div class="pull-right">' + criteriaArrows + '</div></div>'
+		    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.style.rubrics" /></spring:escapeBody>:<div class="pull-right">' + criteriaArrows + '</div></div>'
 		}).attr('colspan', '3').appendTo(row);
 
 		var rubricsTable = $("<table />").addClass('table-striped table-condensed rubrics-table').attr('groupId', groupId).appendTo(cell)
@@ -443,7 +444,7 @@
 				$(this).closest('tr').find('textarea').height(height);
 			}),
 			addColumnButton = $('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 rubrics-add-column-button')
-										   	 .text('<fmt:message key="label.rating.rubrics.column.add" />').click(function(){
+										   	 .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.add" /></spring:escapeBody>').click(function(){
 						var columns = $('.rubrics-columns-part .rubrics-column', rubricsTable);
 						// no more than X columns allowed
 						if (columns.length >= MAX_RUBRICS_COLUMNS) {
@@ -457,7 +458,7 @@
 
 						// add delete button
 						$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-								  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+								  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 							deleteRubricsColumn($(this));
 						});
 
@@ -489,7 +490,7 @@
 		}
 		
 		$('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 roffset10')
-					   .text('<fmt:message key="label.rating.rubrics.row.add" />').click(function(){
+					   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.add" /></spring:escapeBody>').click(function(){
 			// this will add a row to the existing rubrics table with the given group ID
 			maxOrderId++;
 			$("#criteria-max-order-id").val(maxOrderId);
@@ -503,7 +504,7 @@
 		row.append('<th />');
 
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.headers" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.headers" /></spring:escapeBody>')
 				   .appendTo(row);
 		// empty cell for action buttons
 		$('<th />').attr('colspan', 2).appendTo(row);
@@ -516,7 +517,7 @@
 		for (var i = 0; i < rubricsColumnsLength; i++) {
 			cell = $('<td />').appendTo(row);
 			$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-					  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+					  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 				deleteRubricsColumn($(this));
 			});
 			
@@ -528,9 +529,9 @@
 
 		// description of the rows part
 		row = $('<tr />').addClass('rubrics-rows-part').appendTo(rubricsTable);
-		$('<th />').addClass('rubrics-row-title').text('<fmt:message key="label.rating.rubrics.row.headers" />').appendTo(row);
+		$('<th />').addClass('rubrics-row-title').text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.headers" /></spring:escapeBody>').appendTo(row);
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.content" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.content" /></spring:escapeBody>')
 				   .appendTo(row);
 		$('<td />').attr('colspan', 2).appendTo(row);
 
@@ -624,7 +625,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_tool_leader/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r500f37cffc230632ac8b906e91bcddd44836a814 -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_leader/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 500f37cffc230632ac8b906e91bcddd44836a814)
+++ lams_tool_leader/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -132,12 +133,12 @@
 		    		
 		})).append(jQuery('<td/>', {
 			width: '40px',
-			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
-		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />'
 		    		
 		})).append(jQuery('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		})).appendTo('#criterias-table');
 		
 		reactivateArrows();
@@ -257,7 +258,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r006c6b1060de8f84a95f80940553251f22e7a60a -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 006c6b1060de8f84a95f80940553251f22e7a60a)
+++ lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -11,6 +11,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="csrfguard" prefix="csrf" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
@@ -53,10 +54,10 @@
 		outcomeMappingIds${outcomeTagId} = [],
 		outcomeAddEnabled = true,
 		
-		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeExistingNoneLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.existing.none" /></spring:escapeBody>',
+		outcomeCreateNewLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.create.new" /></spring:escapeBody>',
 		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
-		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
+		outcomeMappingRemoveConfirm = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.remove.confirm" /></spring:escapeBody>';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
Index: lams_tool_leader/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -2,6 +2,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -186,7 +187,7 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
Index: lams_tool_leader/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_leader/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_leader/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -188,7 +189,7 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
Index: lams_tool_leader/web/common/taglibs.jsp
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc
--- lams_tool_leader/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_leader/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
@@ -3,4 +3,5 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="csrfguard" prefix="csrf" %>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>