Index: lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -rc5e0a719cb2ca1ad3e8f2b33900f140489ce7a63
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision c5e0a719cb2ca1ad3e8f2b33900f140489ce7a63)
@@ -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_larsrc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -rfa2b057ec9dda91bbe9fa54337c32c443f561cd1 -rc5e0a719cb2ca1ad3e8f2b33900f140489ce7a63
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision fa2b057ec9dda91bbe9fa54337c32c443f561cd1)
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision c5e0a719cb2ca1ad3e8f2b33900f140489ce7a63)
@@ -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_larsrc/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r500f37cffc230632ac8b906e91bcddd44836a814 -rc5e0a719cb2ca1ad3e8f2b33900f140489ce7a63
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 500f37cffc230632ac8b906e91bcddd44836a814)
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision c5e0a719cb2ca1ad3e8f2b33900f140489ce7a63)
@@ -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_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r006c6b1060de8f84a95f80940553251f22e7a60a -rc5e0a719cb2ca1ad3e8f2b33900f140489ce7a63
--- lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 006c6b1060de8f84a95f80940553251f22e7a60a)
+++ lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision c5e0a719cb2ca1ad3e8f2b33900f140489ce7a63)
@@ -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_larsrc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -rc5e0a719cb2ca1ad3e8f2b33900f140489ce7a63
--- lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c5e0a719cb2ca1ad3e8f2b33900f140489ce7a63)
@@ -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_larsrc/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -rc5e0a719cb2ca1ad3e8f2b33900f140489ce7a63
--- lams_tool_larsrc/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_larsrc/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision c5e0a719cb2ca1ad3e8f2b33900f140489ce7a63)
@@ -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_larsrc/web/common/taglibs.jsp
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rc5e0a719cb2ca1ad3e8f2b33900f140489ce7a63
--- lams_tool_larsrc/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_larsrc/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision c5e0a719cb2ca1ad3e8f2b33900f140489ce7a63)
@@ -6,4 +6,5 @@
 <%@ taglib uri="tags-xml" prefix="x" %>
 <%@ 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"%>
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp
===================================================================
diff -u -r0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10 -rc5e0a719cb2ca1ad3e8f2b33900f140489ce7a63
--- lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision 0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10)
+++ lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision c5e0a719cb2ca1ad3e8f2b33900f140489ce7a63)
@@ -22,7 +22,7 @@
 
 			$.validator.addMethod('requireFileCount', function (value, element, param) {
 				return $('#hasFile').val() === 'true' || uppy.getFiles().length >= +param
-			}, '<fmt:message key="error.resource.item.file.blank"/>');
+			}, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.resource.item.file.blank"/></spring:escapeBody>');
 
 						
 	 		$( "#resourceItemForm" ).validate({
@@ -40,7 +40,7 @@
 	 			},
 				messages : {
 					title : {
-						required : '<fmt:message key="error.resource.item.title.blank"/> '
+						required : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.resource.item.title.blank"/></spring:escapeBody> '
 					}
 				},
 				errorPlacement: function(error, element) {
Index: lams_tool_larsrc/web/pages/authoring/parts/addheader.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -rc5e0a719cb2ca1ad3e8f2b33900f140489ce7a63
--- lams_tool_larsrc/web/pages/authoring/parts/addheader.jsp	(.../addheader.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_larsrc/web/pages/authoring/parts/addheader.jsp	(.../addheader.jsp)	(revision c5e0a719cb2ca1ad3e8f2b33900f140489ce7a63)
@@ -46,7 +46,5 @@
 			UPLOAD_FILE_LARGE_MAX_SIZE = '<c:out value="${UPLOAD_FILE_LARGE_MAX_SIZE}"/>',
 			// convert Java syntax to JSON
 	       EXE_FILE_TYPES = JSON.parse("[" + "${EXE_FILE_TYPES}".replace(/\.\w+/g, '"$&"') + "]"),
-		   decoderDiv = $('<div />'),
-	       <fmt:message key="error.attachment.executable" var="EXE_FILE_ERROR_VAR" />
-	       EXE_FILE_ERROR = decoderDiv.html('<c:out value="${EXE_FILE_ERROR_VAR}" />').text();
+		   EXE_FILE_ERROR = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.attachment.executable"/></spring:escapeBody>';
 	</script>
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp
===================================================================
diff -u -rf6b464cd3128a6d8a5a07430d2aeeca8919eb5b7 -rc5e0a719cb2ca1ad3e8f2b33900f140489ce7a63
--- lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision f6b464cd3128a6d8a5a07430d2aeeca8919eb5b7)
+++ lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision c5e0a719cb2ca1ad3e8f2b33900f140489ce7a63)
@@ -21,7 +21,7 @@
 		<script type="text/javascript">
 			$(document).ready(function(){
 				$('#url').focus()
-						 .attr("placeholder","<fmt:message key="label.authoring.basic.resource.url.placeholder" />")
+						 .attr("placeholder","<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.basic.resource.url.placeholder' /></spring:escapeBody>")
 						 .blur(function(){
 							 var url = $(this).val();
 							 if (url.trim() != '') {
@@ -76,11 +76,11 @@
 	 			},
 				messages : {
 					url : {
-						required : '<fmt:message key="error.resource.item.url.blank"/> ',
-						url : '<fmt:message key="error.resource.item.invalid.url"/> ',
+						required : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.resource.item.url.blank"/></spring:escapeBody> ',
+						url : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.resource.item.invalid.url"/></spring:escapeBody> ',
 					},
 					title : {
-						required : '<fmt:message key="error.resource.item.title.blank"/> '
+						required : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.resource.item.title.blank"/></spring:escapeBody> '
 					}
 				}
 			});
Index: lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp
===================================================================
diff -u -rf007d7e87e33de37ad35d279b1da1d59c9f42055 -rc5e0a719cb2ca1ad3e8f2b33900f140489ce7a63
--- lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision f007d7e87e33de37ad35d279b1da1d59c9f42055)
+++ lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision c5e0a719cb2ca1ad3e8f2b33900f140489ce7a63)
@@ -20,7 +20,7 @@
 			  	  extensionIndex = name.lastIndexOf('.'),
 			  	  valid = extensionIndex < 0 || name.substring(extensionIndex).trim() == '.zip';
 			  if (!valid) {
-				  uppy.info('<fmt:message key="error.file.type.zip"/>', 'error', 10000);
+				  uppy.info('<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.file.type.zip"/></spring:escapeBody>', 'error', 10000);
 			  }
 			  
 			  return valid;
@@ -29,7 +29,7 @@
 
 		  	$.validator.addMethod('requireFileCount', function (value, element, param) {
 				return $('#hasFile').val() === 'true' || uppy.getFiles().length >= +param
-			}, '<fmt:message key="error.resource.item.file.blank"/>');
+			}, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.resource.item.file.blank"/></spring:escapeBody>');
 
 						  
 	 		$( "#resourceItemForm" ).validate({
@@ -46,7 +46,7 @@
 	 			},
 				messages : {
 					title : {
-						required : '<fmt:message key="error.resource.item.title.blank"/> '
+						required : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.resource.item.title.blank"/></spring:escapeBody> '
 					}
 				},
 				errorPlacement: function(error, element) {
Index: lams_tool_larsrc/web/pages/learning/addfile.jsp
===================================================================
diff -u -rca136be52df70bbdd506d2383d4d4bd2201a3b3f -rc5e0a719cb2ca1ad3e8f2b33900f140489ce7a63
--- lams_tool_larsrc/web/pages/learning/addfile.jsp	(.../addfile.jsp)	(revision ca136be52df70bbdd506d2383d4d4bd2201a3b3f)
+++ lams_tool_larsrc/web/pages/learning/addfile.jsp	(.../addfile.jsp)	(revision c5e0a719cb2ca1ad3e8f2b33900f140489ce7a63)
@@ -51,9 +51,7 @@
 			UPLOAD_FILE_LARGE_MAX_SIZE = '<c:out value="${UPLOAD_FILE_LARGE_MAX_SIZE}"/>',
 			// convert Java syntax to JSON
 	       EXE_FILE_TYPES = JSON.parse("[" + "${EXE_FILE_TYPES}".replace(/\.\w+/g, '"$&"') + "]"),
-		   decoderDiv = $('<div />'),
-	       <fmt:message key="error.attachment.executable" var="EXE_FILE_ERROR_VAR" />
-	       EXE_FILE_ERROR = decoderDiv.html('<c:out value="${EXE_FILE_ERROR_VAR}" />').text();
+		   EXE_FILE_ERROR = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.attachment.executable"/></spring:escapeBody>';
 
 		$(document).ready(function(){
 			$('#title').focus();
@@ -83,7 +81,7 @@
 				},
 				messages : {
 					title : {
-						required : '<fmt:message key="error.resource.item.title.blank"/> '
+						required : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.resource.item.title.blank"/></spring:escapeBody> '
 					}
 				},
 				errorPlacement: function(error, element) {
Index: lams_tool_larsrc/web/pages/learning/addurl.jsp
===================================================================
diff -u -rf6b464cd3128a6d8a5a07430d2aeeca8919eb5b7 -rc5e0a719cb2ca1ad3e8f2b33900f140489ce7a63
--- lams_tool_larsrc/web/pages/learning/addurl.jsp	(.../addurl.jsp)	(revision f6b464cd3128a6d8a5a07430d2aeeca8919eb5b7)
+++ lams_tool_larsrc/web/pages/learning/addurl.jsp	(.../addurl.jsp)	(revision c5e0a719cb2ca1ad3e8f2b33900f140489ce7a63)
@@ -57,7 +57,7 @@
 		<script type="text/javascript">
 			$(document).ready(function(){
 				$('#addresource #url').focus()
-				.attr("placeholder","<fmt:message key="label.authoring.basic.resource.url.placeholder" />")
+				.attr("placeholder","<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.basic.resource.url.placeholder' /></spring:escapeBody>")
 				.blur(function(){
 					var url = $(this).val();
 					if (url.trim() != '') {
@@ -96,11 +96,11 @@
 				},
 				messages : {
 					url : {
-						required : '<fmt:message key="error.resource.item.url.blank"/> ',
-						url : '<fmt:message key="error.resource.item.invalid.url"/> '
+						required : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.resource.item.url.blank"/></spring:escapeBody> ',
+						url : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.resource.item.invalid.url"/></spring:escapeBody> '
 					},
 					title : {
-						required : '<fmt:message key="error.resource.item.title.blank"/> '
+						required : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.resource.item.title.blank"/></spring:escapeBody> '
 					}
 				},
 			});
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -rc5e0a719cb2ca1ad3e8f2b33900f140489ce7a63
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision c5e0a719cb2ca1ad3e8f2b33900f140489ce7a63)
@@ -108,9 +108,9 @@
 						MAX_RATES = MAX_RATINGS_FOR_ITEM = MIN_RATES = COUNT_RATED_ITEMS = 0, // no restrictions
 						COMMENTS_MIN_WORDS_LIMIT = 0, // comments not used,
 						COMMENT_TEXTAREA_TIP_LABEL = WARN_COMMENTS_IS_BLANK_LABEL = WARN_MIN_NUMBER_WORDS_LABEL = '',
-						AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
+						AVG_RATING_LABEL = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message></spring:escapeBody>',
 						YOUR_RATING_LABEL =
-								'<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
+								'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message></spring:escapeBody>',
 						ALLOW_RERATE = true,
 						SESSION_ID = ${toolSessionID};
 
@@ -256,7 +256,7 @@
 			}
 
 			function hideItem(itemUid) {
-				if(confirm("<fmt:message key='${delConfirmMsgKey}'/>")){
+				if(confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='${delConfirmMsgKey}'/></spring:escapeBody>")){
 					$.ajax({
 						url: '<c:url value="/learning/hideItem.do"/>',
 						data: 'sessionMapID=${sessionMapID}&itemUid=' + itemUid,
Index: lams_tool_larsrc/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -rc5e0a719cb2ca1ad3e8f2b33900f140489ce7a63
--- lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision c5e0a719cb2ca1ad3e8f2b33900f140489ce7a63)
@@ -43,17 +43,17 @@
 				iconSet: 'fontAwesome',
 			   	colNames:['#',
 						'itemUid',
-						"<fmt:message key="monitoring.label.title" />",
-						"<fmt:message key="monitoring.label.type" />",
-					    "<fmt:message key="monitoring.label.suggest" />",
-					    "<fmt:message key="monitoring.label.views" />",
+						"<spring:escapeBody javaScriptEscape='true'><fmt:message key='monitoring.label.title' /></spring:escapeBody>",
+						"<spring:escapeBody javaScriptEscape='true'><fmt:message key='monitoring.label.type' /></spring:escapeBody>",
+					    "<spring:escapeBody javaScriptEscape='true'><fmt:message key='monitoring.label.suggest' /></spring:escapeBody>",
+					    "<spring:escapeBody javaScriptEscape='true'><fmt:message key='monitoring.label.views' /></spring:escapeBody>",
 						<c:if test="${groupSummary.allowRating}">
-					    "<fmt:message key="label.rating" />",
+					    "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.rating' /></spring:escapeBody>",
 					   	</c:if>
 						<c:if test="${groupSummary.allowComments}">
-					    "<fmt:message key="label.comments" />",
+					    "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.comments' /></spring:escapeBody>",
 					   	</c:if>
-					    "<fmt:message key="monitoring.label.actions" />" 
+					    "<spring:escapeBody javaScriptEscape='true'><fmt:message key='monitoring.label.actions' /></spring:escapeBody>" 
 				],
 			   	colModel:[
 			   		{name:'id', index:'id', width:0, sorttype:"int", hidden: true},
@@ -92,10 +92,10 @@
 						iconSet: 'fontAwesome',
 						colNames: [
 						   '',
-						   "<fmt:message key="monitoring.label.user.name"/>",
-						   "<fmt:message key="monitoring.label.access.time"/>", 
-						   "<fmt:message key="monitoring.label.complete.time"/>", 
-						   "<fmt:message key="monitoring.label.time.taken"/>",
+						   "<spring:escapeBody javaScriptEscape='true'><fmt:message key='monitoring.label.user.name'/></spring:escapeBody>",
+						   "<spring:escapeBody javaScriptEscape='true'><fmt:message key='monitoring.label.access.time'/></spring:escapeBody>", 
+						   "<spring:escapeBody javaScriptEscape='true'><fmt:message key='monitoring.label.complete.time'/></spring:escapeBody>", 
+						   "<spring:escapeBody javaScriptEscape='true'><fmt:message key='monitoring.label.time.taken'/></spring:escapeBody>",
 						   'portraitId'
 						],
 						colModel:[
@@ -108,7 +108,7 @@
 						],
 						loadError: function(xhr,st,err) {
 						    	jQuery("#"+subgridTableId).clearGridData();
-						    	jQuery.jgrid.info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="error.loaderror"/>", "<fmt:message key="label.ok"/>");
+						    	jQuery.jgrid.info_dialog("<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.error'/></spring:escapeBody>", "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.loaderror'/></spring:escapeBody>", "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.ok'/></spring:escapeBody>");
 					    },
 						loadComplete: function () {
 					   	 	initializePortraitPopover('<lams:LAMSURL/>');
@@ -223,13 +223,13 @@
             type: 'post',
             success: function () {
             	if (isHideItem) {
-            		linkObject.innerHTML = '<fmt:message key='monitoring.label.show' />' ;
+            		linkObject.innerHTML = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="monitoring.label.show" /></spring:escapeBody>' ;
             		linkObject.onclick = function (){
             			changeItemVisibility(this, itemUid, toolSessionId, false); 
             			return false;
             		}
             	} else {
-            		linkObject.innerHTML = '<fmt:message key='monitoring.label.hide' />' ;
+            		linkObject.innerHTML = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="monitoring.label.hide" /></spring:escapeBody>' ;
             		linkObject.onclick = function (){
             			changeItemVisibility(this, itemUid, toolSessionId, true); 
             			return false;