Index: lams_gradebook/web/common/taglibs.jsp
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -r87c236112358ed9c229876a63816b5e14b17f2af
--- lams_gradebook/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_gradebook/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
@@ -4,4 +4,5 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ 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_gradebook/web/gradebookCourseLearner.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r87c236112358ed9c229876a63816b5e14b17f2af
--- lams_gradebook/web/gradebookCourseLearner.jsp	(.../gradebookCourseLearner.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_gradebook/web/gradebookCourseLearner.jsp	(.../gradebookCourseLearner.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
@@ -37,16 +37,17 @@
 			    rowNum:10,
 			    colNames:[
 			    	'', 
-			    	"<fmt:message key="gradebook.columntitle.lessonName"/>", 
-			    	"<fmt:message key="gradebook.columntitle.subGroup"/>", 
-			    	"<fmt:message key="gradebook.columntitle.progress"/>", 
-			    	"<fmt:message key="gradebook.columntitle.startDate"/>", 
-			    	"<fmt:message key="gradebook.columntitle.completeDate"/>", 
-			    	"<fmt:message key="gradebook.columntitle.lessonFeedback"/>", 
-			    	"<fmt:message key="gradebook.columntitle.averageTimeTaken"/>", 
-			    	"<fmt:message key="gradebook.columntitle.timeTaken"/>", 
-			    	"<fmt:message key="gradebook.columntitle.averageMark"/>", 
-			    	"<fmt:message key="gradebook.columntitle.mark"/>"],
+					"<spring:escapeBody javaScriptEscape='true'><fmt:message key='gradebook.columntitle.lessonName' /></spring:escapeBody>",
+					"<spring:escapeBody javaScriptEscape='true'><fmt:message key='gradebook.columntitle.subGroup' /></spring:escapeBody>",
+					"<spring:escapeBody javaScriptEscape='true'><fmt:message key='gradebook.columntitle.progress' /></spring:escapeBody>",
+					"<spring:escapeBody javaScriptEscape='true'><fmt:message key='gradebook.columntitle.startDate' /></spring:escapeBody>",
+					"<spring:escapeBody javaScriptEscape='true'><fmt:message key='gradebook.columntitle.completeDate' /></spring:escapeBody>",
+					"<spring:escapeBody javaScriptEscape='true'><fmt:message key='gradebook.columntitle.lessonFeedback' /></spring:escapeBody>",
+					"<spring:escapeBody javaScriptEscape='true'><fmt:message key='gradebook.columntitle.averageTimeTaken' /></spring:escapeBody>",
+					"<spring:escapeBody javaScriptEscape='true'><fmt:message key='gradebook.columntitle.timeTaken' /></spring:escapeBody>",
+					"<spring:escapeBody javaScriptEscape='true'><fmt:message key='gradebook.columntitle.averageMark' /></spring:escapeBody>",
+					"<spring:escapeBody javaScriptEscape='true'><fmt:message key='gradebook.columntitle.mark' /></spring:escapeBody>"
+				],
 			    colModel:[
 			    	{name:'id', index:'id', sortable:false, editable:false, hidden:true, search:false, hidedlg:true},
 			    	{name:'rowName',index:'rowName', sortable:true, editable:false},
@@ -62,7 +63,7 @@
 			    ],
  			    loadError: function(xhr,st,err) {
 			    	$("#organisationGrid").jqGrid('clearGridData');
-			    	alert("<fmt:message key="label.error"/>\n\n<fmt:message key="gradebook.error.loaderror"/>");
+			    	alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.error"/></spring:escapeBody>\n\n<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.error.loaderror"/></spring:escapeBody>");
 			    },
  			    subGrid: true,
 				subGridRowExpanded: function(subgrid_id, row_id) {
@@ -84,13 +85,13 @@
 							 rowNum:10,
 						     colNames: [
 						     	'',
-						     	"<fmt:message key="gradebook.columntitle.activity"/>",
-						     	"<fmt:message key="gradebook.columntitle.progress"/>", 
-						     	"<fmt:message key="gradebook.columntitle.activityFeedback"/>", 
-						     	"<fmt:message key="gradebook.columntitle.averageTimeTaken"/>", 
-						     	"<fmt:message key="gradebook.columntitle.timeTaken"/>", 
-						     	"<fmt:message key="gradebook.columntitle.averageMark"/>", 
-						     	"<fmt:message key="gradebook.columntitle.mark"/>"
+						     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.activity"/></spring:escapeBody>",
+						     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.progress"/></spring:escapeBody>", 
+						     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.activityFeedback"/></spring:escapeBody>", 
+						     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.averageTimeTaken"/></spring:escapeBody>", 
+						     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.timeTaken"/></spring:escapeBody>", 
+						     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.averageMark"/></spring:escapeBody>", 
+						     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.mark"/></spring:escapeBody>"
 						     ],
 						     colModel: [
 						       	{name:'id', index:'id', sortable:false, hidden:true, hidedlg:true},
@@ -104,7 +105,7 @@
 						     ],
  						     loadError: function(xhr,st,err) {
 						    	$("#"+subgrid_table_id).jqGrid('clearGridData');
-						    	alert("<fmt:message key="label.error"/>\n\n<fmt:message key="gradebook.error.loaderror"/>");
+						    	alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.error"/></spring:escapeBody>\n\n<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.error.loaderror"/></spring:escapeBody>");
 						     },
  							 gridComplete: function(){
 							 	fixPagerInCenter(subgrid_table_id+"_pager", 1);
Index: lams_gradebook/web/gradebookCourseMonitor.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r87c236112358ed9c229876a63816b5e14b17f2af
--- lams_gradebook/web/gradebookCourseMonitor.jsp	(.../gradebookCourseMonitor.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_gradebook/web/gradebookCourseMonitor.jsp	(.../gradebookCourseMonitor.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
@@ -72,11 +72,11 @@
 				multiPageSelection : true,
 				colNames:[
 					'', 
-					"<fmt:message key="gradebook.columntitle.lessonName"/>", 
-					"<fmt:message key="gradebook.columntitle.subGroup"/>", 
-					"<fmt:message key="gradebook.columntitle.startDate"/>", 
-					"<fmt:message key="gradebook.columntitle.averageTimeTaken"/>", 
-			    	"<fmt:message key="gradebook.columntitle.averageMark"/>"
+					"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.lessonName"/></spring:escapeBody>", 
+					"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.subGroup"/></spring:escapeBody>", 
+					"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.startDate"/></spring:escapeBody>", 
+					"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.averageTimeTaken"/></spring:escapeBody>", 
+			    	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.averageMark"/></spring:escapeBody>"
 				],
 			    colModel:[
 			      {name:'id', index:'id', sortable:false, editable:false, hidden:true, search:false, hidedlg:true},
@@ -88,7 +88,7 @@
 			    ],
 			    loadError: function(xhr,st,err) {
 			    	jQuery("#organisationGrid").clearGridData();
-			   	 	alert("<fmt:message key="gradebook.error.loaderror"/>");
+			   	 	alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.error.loaderror"/></spring:escapeBody>");
 			    },
 			    subGrid: true,
 				subGridRowExpanded: function(subgrid_id, row_id) {
@@ -114,13 +114,13 @@
 						 rowNum:10,
 					     colNames: [
 					     	'',
-					     	"<fmt:message key="gradebook.columntitle.learnerName"/>",
-					     	"<fmt:message key="gradebook.columntitle.progress"/>", 
-					     	"<fmt:message key="gradebook.columntitle.timeTaken"/>", 
-					    	"<fmt:message key="gradebook.columntitle.startDate"/>", 
-					    	"<fmt:message key="gradebook.columntitle.completeDate"/>", 
-					     	"<fmt:message key="gradebook.columntitle.lessonFeedback"/>", 
-			    			"<fmt:message key="gradebook.columntitle.mark"/>",
+					     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.learnerName"/></spring:escapeBody>",
+					     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.progress"/></spring:escapeBody>", 
+					     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.timeTaken"/></spring:escapeBody>", 
+					    	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.startDate"/></spring:escapeBody>", 
+					    	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.completeDate"/></spring:escapeBody>", 
+					     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.lessonFeedback"/></spring:escapeBody>", 
+			    			"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.mark"/></spring:escapeBody>",
 			    			'portraitId'
 					     ],
 					     colModel:[
@@ -136,7 +136,7 @@
 					     ],
 					     loadError: function(xhr,st,err) {
 				    		jQuery("#"+subgrid_table_id).clearGridData();
-				    		alert("<fmt:message key="gradebook.error.loaderror"/>");
+				    		alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.error.loaderror"/></spring:escapeBody>");
 				    	 },
 				    	 formatCell: function(rowid, cellname,value, iRow, iCol) {
 					    	 if (cellname == "mark") {
@@ -188,7 +188,7 @@
 				guiStyle: "bootstrap",
 				iconSet: 'fontAwesome',
 				autoencode:false,
-				caption: "<fmt:message key="gradebook.gridtitle.learner.view"/>",
+				caption: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.gridtitle.learner.view"/></spring:escapeBody>",
 			    datatype: "xml",
 			    url: "<lams:LAMSURL />gradebook/gradebook/getUserGridData.do?view=listView&organisationID=${organisationID}",
 			    height: "100%",
@@ -202,7 +202,7 @@
 			    rowNum:10,
 			    colNames:[
 					'',
-					"<fmt:message key="gradebook.columntitle.learnerName"/>",
+					"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.learnerName"/></spring:escapeBody>",
 					'portraitId'
 			    ],
 			    colModel:[
@@ -212,7 +212,7 @@
 			    ],
 			    loadError: function(xhr,st,err) {
 			    	jQuery("#userView").clearGridData();
-			    	alert("<fmt:message key="gradebook.error.loaderror"/>");
+			    	alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.error.loaderror"/></spring:escapeBody>");
 			    },
 			    subGrid: true,
 				subGridRowExpanded: function(subgrid_id, row_id) {
@@ -236,16 +236,16 @@
 						     cellurl: "", //will be updated dynamically
 						     colNames: [
 								'', 
-								"<fmt:message key="gradebook.columntitle.lessonName"/>", 
-								"<fmt:message key="gradebook.columntitle.subGroup"/>", 
-								"<fmt:message key="gradebook.columntitle.progress"/>", 
-								"<fmt:message key="gradebook.columntitle.startDate"/>", 
-								"<fmt:message key="gradebook.columntitle.completeDate"/>", 
-								"<fmt:message key="gradebook.columntitle.lessonFeedback"/>", 
-								"<fmt:message key="gradebook.columntitle.averageTimeTaken"/>", 
-								"<fmt:message key="gradebook.columntitle.timeTaken"/>", 
-								"<fmt:message key="gradebook.columntitle.averageMark"/>", 
-								"<fmt:message key="gradebook.columntitle.mark"/>"
+								"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.lessonName"/></spring:escapeBody>", 
+								"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.subGroup"/></spring:escapeBody>", 
+								"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.progress"/></spring:escapeBody>", 
+								"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.startDate"/></spring:escapeBody>", 
+								"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.completeDate"/></spring:escapeBody>", 
+								"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.lessonFeedback"/></spring:escapeBody>", 
+								"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.averageTimeTaken"/></spring:escapeBody>", 
+								"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.timeTaken"/></spring:escapeBody>", 
+								"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.averageMark"/></spring:escapeBody>", 
+								"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.mark"/></spring:escapeBody>"
 						     ],
 						     colModel: [
 								{name:'id', index:'id', sortable:false, editable:false, hidden:true, search:false, hidedlg:true},
@@ -262,7 +262,7 @@
 						     ],
 						     loadError: function(xhr,st,err) {
 						    	jQuery("#"+subgrid_table_id).clearGridData();
-						    	alert("<fmt:message key="gradebook.error.loaderror"/>");
+						    	alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.error.loaderror"/></spring:escapeBody>");
 						     },
 						     formatCell: function(rowid, cellname,value, iRow, iCol) {
 					    	 	if (cellname == "mark") {
@@ -302,7 +302,7 @@
 					    	 		var currRowData = jQuery("#"+subgrid_table_id).getRowData(rowid);
 						     		if (currRowData['marksAvailable'] != null && currRowData['marksAvailable'] != "") {
 						     			if (parseFloat(value) > parseFloat(currRowData['marksAvailable'])){
-						     				displayCellErrorMessage(jQuery("#"+subgrid_table_id)[0], iRow, iCol, "<fmt:message key="label.error"/>", "<fmt:message key="error.markhigher"/>", "<fmt:message key="label.ok"/>");
+						     				displayCellErrorMessage(jQuery("#"+subgrid_table_id)[0], iRow, iCol, "<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.error"/></spring:escapeBody>", "<spring:escapeBody javaScriptEscape='true'><fmt:message key="error.markhigher"/></spring:escapeBody>", "<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.ok"/></spring:escapeBody>");
 						     				jQuery("#"+subgrid_table_id).restoreCell( iRow, iCol);
 						     				throw("Mark must be lower than maximum mark");
 						     			}
@@ -327,7 +327,7 @@
 						     	$("#organisationGrid").trigger("reloadGrid");
 						     },
 						     errorCell: function(serverresponse, status) {
-						     	alert("<fmt:message key="error.cellsave"/>");
+						     	alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key="error.cellsave"/></spring:escapeBody>");
 						     },
 							 gridComplete: function(){
 								processLessonDateFields( lessonDatesHidden, jQuery("#"+subgrid_table_id) );
Index: lams_gradebook/web/gradebookMonitorContent.jsp
===================================================================
diff -u -rde8a34efc3db82bd2746e1357041208a3d5828f6 -r87c236112358ed9c229876a63816b5e14b17f2af
--- lams_gradebook/web/gradebookMonitorContent.jsp	(.../gradebookMonitorContent.jsp)	(revision de8a34efc3db82bd2746e1357041208a3d5828f6)
+++ lams_gradebook/web/gradebookMonitorContent.jsp	(.../gradebookMonitorContent.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
@@ -39,7 +39,7 @@
 			$("#markChartBusy").css("display", "block");
 			drawHistogram('markChartDiv',
 					'<lams:LAMSURL/>gradebook/gradebookMonitoring/getMarkChartData.do?lessonID=${lessonDetails.lessonID}',
-					'<fmt:message key="label.marks"/>', '<fmt:message key="label.number.learners.in.mark.range"/>');
+					'<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.marks"/></spring:escapeBody>', '<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.number.learners.in.mark.range"/></spring:escapeBody>');
 			graphLoaded = true;
 			$("#markChartBusy").css("display", "none");
 		}
@@ -106,7 +106,7 @@
 			guiStyle: "bootstrap4",
 			iconSet: 'fontAwesomeSolid',
 			autoencode:false,
-			caption: "<fmt:message key="gradebook.gridtitle.usergrid"/>",
+			caption: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.gridtitle.usergrid"/></spring:escapeBody>",
 		    datatype: "xml",
 		    url: "<lams:LAMSURL />gradebook/gradebook/getUserGridData.do?view=monUserView&lessonID=${lessonDetails.lessonID}",
 		    height: "100%",
@@ -122,13 +122,13 @@
 		    rowNum:10,
 			cellurl: "<lams:LAMSURL />gradebook/gradebookMonitoring/updateUserLessonGradebookData.do?<csrf:token/>&lessonID=${lessonDetails.lessonID}",
 		    colNames:["", 
-		    	"<fmt:message key="gradebook.columntitle.name"/>", 
-		    	"<fmt:message key="gradebook.columntitle.progress"/>", 
-		    	"<fmt:message key="gradebook.columntitle.timeTaken"/>", 
-		    	"<fmt:message key="gradebook.columntitle.startDate"/>", 
-		    	"<fmt:message key="gradebook.columntitle.completeDate"/>", 
-		    	"<fmt:message key="gradebook.columntitle.lessonFeedback"/>", 
-		    	"<fmt:message key="gradebook.columntitle.mark"/>",
+		    	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.name"/></spring:escapeBody>", 
+		    	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.progress"/></spring:escapeBody>", 
+		    	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.timeTaken"/></spring:escapeBody>", 
+		    	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.startDate"/></spring:escapeBody>", 
+		    	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.completeDate"/></spring:escapeBody>", 
+		    	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.lessonFeedback"/></spring:escapeBody>", 
+		    	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.mark"/></spring:escapeBody>",
 		    	'portraitId',
 		    	'hasArchivedMarks'
 		    ],
@@ -152,7 +152,7 @@
 		      ],
 		    loadError: function(xhr,st,err) {
 			    jQuery("#userView").clearGridData();
-			   	alert("<fmt:message key="gradebook.error.loaderror"/>");
+			   	alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.error.loaderror"/></spring:escapeBody>");
 		    },
 
 		    subGrid: true,
@@ -182,14 +182,14 @@
 					     colNames: [
 					     	'',
 					     	'',
-					     	"<fmt:message key="gradebook.columntitle.activity"/>",
-					     	"<fmt:message key="gradebook.columntitle.progress"/>",
-					    	"<fmt:message key="gradebook.columntitle.startDate"/>", 
-					     	"<fmt:message key="gradebook.columntitle.timeTaken"/>", 
-					    	"<fmt:message key="gradebook.columntitle.completeDate"/>", 
-					     	"<fmt:message key="gradebook.columntitle.activityFeedback"/>", 
-					     	"<fmt:message key="gradebook.columntitle.outcome"/>",
-					     	"<fmt:message key="gradebook.columntitle.mark"/>"
+					     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.activity"/></spring:escapeBody>",
+					     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.progress"/></spring:escapeBody>",
+					    	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.startDate"/></spring:escapeBody>", 
+					     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.timeTaken"/></spring:escapeBody>", 
+					    	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.completeDate"/></spring:escapeBody>", 
+					     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.activityFeedback"/></spring:escapeBody>", 
+					     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.outcome"/></spring:escapeBody>",
+					     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.mark"/></spring:escapeBody>"
 					     ],
 					     colModel: [
 					       	{name:'id', index:'id', sortable:false, hidden:true, hidedlg:true},
@@ -215,7 +215,7 @@
 					     ],
 					     loadError: function(xhr,st,err) {
 					    	jQuery("#"+subgrid_table_id).clearGridData();
-					 	 	alert("<fmt:message key="gradebook.error.loaderror"/>");
+					 	 	alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.error.loaderror"/></spring:escapeBody>");
 					     },
 					     formatCell: function(rowid, cellname,value, iRow, iCol) {
 				    	 	if (cellname == "mark") {
@@ -255,7 +255,7 @@
 				    	 		var currRowData = jQuery("#"+subgrid_table_id).getRowData(rowid);
 					     		if (currRowData['marksAvailable'] != null && currRowData['marksAvailable'] != "") {
 					     			if (parseFloat(value) > parseFloat(currRowData['marksAvailable'])){
-					     				displayCellErrorMessage(jQuery("#"+subgrid_table_id)[0], iRow, iCol, "<fmt:message key="label.error"/>", "<fmt:message key="error.markhigher"/>", "<fmt:message key="label.ok"/>");
+					     				displayCellErrorMessage(jQuery("#"+subgrid_table_id)[0], iRow, iCol, "<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.error"/></spring:escapeBody>", "<spring:escapeBody javaScriptEscape='true'><fmt:message key="error.markhigher"/></spring:escapeBody>", "<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.ok"/></spring:escapeBody>");
 					     				jQuery("#"+subgrid_table_id).restoreCell( iRow, iCol);
 					     				throw("Mark must be lower than maximum mark");
 					     			}
@@ -289,7 +289,7 @@
 					     	}
 					     },
 					     errorCell: function(serverresponse, status) {
-					     	alert("<fmt:message key="error.cellsave"/>");
+					     	alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key="error.cellsave"/></spring:escapeBody>");
 					     },
 						 gridComplete: function(){
 						 	fixPagerInCenter(subgrid_table_id+"_pager", 1);
@@ -320,7 +320,7 @@
 											// add a marker for unsetting result
 											editablePossibleValues.unshift({
 												value : -1,
-												text  : '<fmt:message key="outcome.result.not.set"/>'
+												text  : '<spring:escapeBody javaScriptEscape='true'><fmt:message key="outcome.result.not.set"/></spring:escapeBody>'
 											});
 											outcomeValues[this.mappingId] = editablePossibleValues;
 											// build HTML code for x-editable
@@ -336,7 +336,7 @@
 												mappingId = editable.attr('mappingId');
 											editable.editable({
 											    type: 'select',
-											    emptytext : '<fmt:message key="outcome.result.error"/>',
+											    emptytext : '<spring:escapeBody javaScriptEscape='true'><fmt:message key="outcome.result.error"/></spring:escapeBody>',
 											    pk : mappingId,
 											    // a trick to send extra param to the server
 											    name : userID,
@@ -383,14 +383,14 @@
 									 sortname: "sequence",
 								     pager: false,
 								     colNames: [
-								    	"<fmt:message key="gradebook.columntitle.attempt"/>",
-								     	"<fmt:message key="gradebook.columntitle.progress"/>",
-								     	"<fmt:message key="gradebook.columntitle.timeTaken"/>", 
-								    	"<fmt:message key="gradebook.columntitle.startDate"/>", 
-								    	"<fmt:message key="gradebook.columntitle.completeDate"/>", 
-								     	"<fmt:message key="gradebook.columntitle.activityFeedback"/>", 
-								     	"<fmt:message key="gradebook.columntitle.lesson.mark"/>",
-								     	"<fmt:message key="gradebook.columntitle.mark"/>"
+								    	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.attempt"/></spring:escapeBody>",
+								     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.progress"/></spring:escapeBody>",
+								     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.timeTaken"/></spring:escapeBody>", 
+								    	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.startDate"/></spring:escapeBody>", 
+								    	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.completeDate"/></spring:escapeBody>", 
+								     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.activityFeedback"/></spring:escapeBody>", 
+								     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.lesson.mark"/></spring:escapeBody>",
+								     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.mark"/></spring:escapeBody>"
 								     ],
 								     colModel: [
 								       	{name:'id', index:'id',  sortable:false, editable: false ,width:140, align:"right"},
@@ -410,7 +410,7 @@
 								     ],
 								     loadError: function(xhr,st,err) {
 								    	jQuery("#"+subgrid_table_id).clearGridData();
-								 	 	alert("<fmt:message key="gradebook.error.loaderror"/>");
+								 	 	alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.error.loaderror"/></spring:escapeBody>");
 								     }
 							  	});
 							}
@@ -433,7 +433,7 @@
 				guiStyle: "bootstrap4",
 				iconSet: 'fontAwesomeSolid',
 				autoencode:false,
-				caption: "<fmt:message key="gradebook.gridtitle.activitygrid"/>",
+				caption: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.gridtitle.activitygrid"/></spring:escapeBody>",
 			    datatype: "xml",
 			    url: "<lams:LAMSURL />gradebook/gradebook/getActivityGridData.do?view=monActivityView&lessonID=${lessonDetails.lessonID}",
 			    height: "100%",
@@ -449,10 +449,10 @@
 			    colNames:[
 			    	'', 
 			    	'',
-			    	"<fmt:message key="gradebook.columntitle.name"/>", 
-			    	"<fmt:message key="gradebook.columntitle.averageTimeTaken"/>", 
-			    	"<fmt:message key="gradebook.columntitle.competences"/>", 
-			    	"<fmt:message key="gradebook.columntitle.averageMark"/>"
+			    	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.name"/></spring:escapeBody>", 
+			    	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.averageTimeTaken"/></spring:escapeBody>", 
+			    	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.competences"/></spring:escapeBody>", 
+			    	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.averageMark"/></spring:escapeBody>"
 			    ],
 			    colModel:[
 			      {name:'id', index:'id', sortable:false, hidden:true, hidedlg:true},
@@ -464,7 +464,7 @@
 			    ],
 			    loadError: function(xhr,st,err) {
 		    		jQuery("#activityView").clearGridData();
-		    		alert("<fmt:message key="gradebook.error.loaderror"/>");
+		    		alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.error.loaderror"/></spring:escapeBody>");
 		    	},
 		    	beforeEditCell : function() {
 				    $(this).data('isCellEdited', true);
@@ -499,13 +499,13 @@
 					     colNames: [
 					     	'',
 					     	'',
-					     	"<fmt:message key="gradebook.columntitle.name"/>",
-					     	"<fmt:message key="gradebook.columntitle.progress"/>", 
-					     	"<fmt:message key="gradebook.columntitle.timeTaken"/>", 
-					    	"<fmt:message key="gradebook.columntitle.startDate"/>", 
-					    	"<fmt:message key="gradebook.columntitle.completeDate"/>", 
-					     	"<fmt:message key="gradebook.columntitle.activityFeedback"/>", 
-					     	"<fmt:message key="gradebook.columntitle.mark"/>",
+					     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.name"/></spring:escapeBody>",
+					     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.progress"/></spring:escapeBody>", 
+					     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.timeTaken"/></spring:escapeBody>", 
+					    	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.startDate"/></spring:escapeBody>", 
+					    	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.completeDate"/></spring:escapeBody>", 
+					     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.activityFeedback"/></spring:escapeBody>", 
+					     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.mark"/></spring:escapeBody>",
 						    'portraitId',
 					     	'activityURL',
 					     	'hasArchivedMarks'
@@ -530,7 +530,7 @@
 					     ],
 					     loadError: function(xhr,st,err) {
 					    		jQuery("#"+subgrid_table_id).clearGridData();
-					    		alert("<fmt:message key="gradebook.error.loaderror"/>");
+					    		alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.error.loaderror"/></spring:escapeBody>");
 					    	 },
 				    	 beforeEditCell : function() {
 						    $("#activityView").data('isCellEdited', true);
@@ -575,7 +575,7 @@
 				    	 		var currRowData = jQuery("#"+subgrid_table_id).getRowData(rowid);
 					     		if (currRowData['marksAvailable'] != null && currRowData['marksAvailable'] != "") {
 					     			if (parseFloat(value) > parseFloat(currRowData['marksAvailable'])){
-					     				displayCellErrorMessage(jQuery("#"+subgrid_table_id)[0], iRow, iCol, "<fmt:message key="label.error"/>", "<fmt:message key="error.markhigher"/>", "<fmt:message key="label.ok"/>");
+					     				displayCellErrorMessage(jQuery("#"+subgrid_table_id)[0], iRow, iCol, "<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.error"/></spring:escapeBody>", "<spring:escapeBody javaScriptEscape='true'><fmt:message key="error.markhigher"/></spring:escapeBody>", "<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.ok"/></spring:escapeBody>");
 					     				jQuery("#"+subgrid_table_id).restoreCell( iRow, iCol);
 					     				throw("Mark must be lower than maximum mark");
 					     			}
@@ -603,7 +603,7 @@
 					     	}
 					     },
 					     errorCell: function(serverresponse, status) {
-					     	alert("<fmt:message key="error.cellsave"/>");
+					     	alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key="error.cellsave"/></spring:escapeBody>");
 					     },
 						 gridComplete: function(){
 					   	 	initializePortraitPopover('<lams:LAMSURL/>');
@@ -635,14 +635,14 @@
 									 sortorder: "asc", 
 									 sortname: "sequence", 
 								     colNames: [
-								    	"<fmt:message key="gradebook.columntitle.attempt"/>",
-								     	"<fmt:message key="gradebook.columntitle.activityFeedback"/>", 
-								     	"<fmt:message key="gradebook.columntitle.lesson.mark"/>",
-								     	"<fmt:message key="gradebook.columntitle.progress"/>",
-								     	"<fmt:message key="gradebook.columntitle.timeTaken"/>", 
-								    	"<fmt:message key="gradebook.columntitle.startDate"/>", 
-								    	"<fmt:message key="gradebook.columntitle.completeDate"/>", 
-								     	"<fmt:message key="gradebook.columntitle.mark"/>"
+								    	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.attempt"/></spring:escapeBody>",
+								     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.activityFeedback"/></spring:escapeBody>", 
+								     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.lesson.mark"/></spring:escapeBody>",
+								     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.progress"/></spring:escapeBody>",
+								     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.timeTaken"/></spring:escapeBody>", 
+								    	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.startDate"/></spring:escapeBody>", 
+								    	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.completeDate"/></spring:escapeBody>", 
+								     	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.columntitle.mark"/></spring:escapeBody>"
 								     ],
 								     colModel: [
 								       	{name:'id', index:'id',  sortable:false, editable: false, align:"right"},
@@ -662,7 +662,7 @@
 								     ],
 								     loadError: function(xhr,st,err) {
 								    	jQuery("#"+subgrid_table_id).clearGridData();
-								 	 	alert("<fmt:message key="gradebook.error.loaderror"/>");
+								 	 	alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.error.loaderror"/></spring:escapeBody>");
 								     },
 							    	 beforeEditCell : function() {
 									    $("#activityView").data('isCellEdited', true);
Index: lams_gradebook/web/releaseLessonMarks.jsp
===================================================================
diff -u -r3eab31a1109437bc25679e6ebe38be0a350e17ac -r87c236112358ed9c229876a63816b5e14b17f2af
--- lams_gradebook/web/releaseLessonMarks.jsp	(.../releaseLessonMarks.jsp)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
+++ lams_gradebook/web/releaseLessonMarks.jsp	(.../releaseLessonMarks.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
@@ -96,7 +96,7 @@
 
 	// release/hide marks
 	function toggleMarksRelease() {
-		showConfirm(marksReleased ? "<fmt:message key="gradebook.monitor.releasemarks.check.hide"/>" : "<fmt:message key="gradebook.monitor.releasemarks.check.release"/>", function() {
+		showConfirm(marksReleased ? "<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.monitor.releasemarks.check.hide"/></spring:escapeBody>" : "<spring:escapeBody javaScriptEscape='true'><fmt:message key="gradebook.monitor.releasemarks.check.release"/></spring:escapeBody>", function() {
 			releaseMarksAlertBox.hide();
 			
 			$.ajax({
@@ -112,7 +112,7 @@
 				    	marksReleased = !marksReleased;
 				    	updateReleaseMarksDependantElements();
 			    	} else {
-						releaseMarksAlertBox.removeClass('alert-success').addClass('alert-danger').text("<fmt:message key="error.releasemarks.fail"/>").show();
+						releaseMarksAlertBox.removeClass('alert-success').addClass('alert-danger').text("<spring:escapeBody javaScriptEscape='true'><fmt:message key="error.releasemarks.fail"/></spring:escapeBody>").show();
 			    	}
 		    	}
 			});
@@ -134,11 +134,11 @@
 
 		if (finalList.length == 0) {
 			releaseMarksAlertBox.removeClass('alert-success').addClass('alert-danger')
-								.text('<fmt:message key="gradebook.monitor.releasemarks.send.emails.no.learners" />').show();
+								.text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="gradebook.monitor.releasemarks.send.emails.no.learners" /></spring:escapeBody>').show();
 			return;
 		}
 		
-		showConfirm('<fmt:message key="gradebook.monitor.releasemarks.send.emails.confirm" />'.replace('[COUNT_PLACEHOLDER]', finalList.length), function() {
+		showConfirm('<spring:escapeBody javaScriptEscape="true"><fmt:message key="gradebook.monitor.releasemarks.send.emails.confirm" /></spring:escapeBody>'.replace('[COUNT_PLACEHOLDER]', finalList.length), function() {
 			$.ajax({
 				'url'      : '<lams:LAMSURL/>gradebook/gradebookMonitoring/sendReleaseMarksEmails.do',
 				'data'     : {
@@ -181,7 +181,7 @@
 			iconSet: 'fontAwesomeSolid',
 		   	url: "<lams:LAMSURL/>monitoring/emailNotifications/getUsers.do?searchType=4&lessonID=" + releaseMarksLessonID,
 			datatype: "json",
-		   	colNames:['<fmt:message key="gradebook.columntitle.learnerName"/>'],
+		   	colNames:['<spring:escapeBody javaScriptEscape="true">"<fmt:message key="gradebook.columntitle.learnerName"/></spring:escapeBody>'],
 		   	colModel:[
 		   		{name:'name',index:'name', sortable: false, sorttype: 'text'}
 		   	],
Index: lams_monitoring/web/emailnotifications/archivedEmailList5.jsp
===================================================================
diff -u -r35dd47046a83ab2f9e80f76dc22d1521412219b5 -r87c236112358ed9c229876a63816b5e14b17f2af
--- lams_monitoring/web/emailnotifications/archivedEmailList5.jsp	(.../archivedEmailList5.jsp)	(revision 35dd47046a83ab2f9e80f76dc22d1521412219b5)
+++ lams_monitoring/web/emailnotifications/archivedEmailList5.jsp	(.../archivedEmailList5.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
@@ -36,7 +36,7 @@
 				iconSet: 'fontAwesome',
 			   	url: "<c:url value='/emailNotifications/getArchivedRecipients.do'/>?emailNotificationUid=" + notificationUid,
 				datatype: "json",
-			   	colNames:['<fmt:message key="email.notifications.user.name"/>'],
+				colNames: ['<spring:escapeBody javaScriptEscape="true"><fmt:message key="email.notifications.user.name" /></spring:escapeBody>'],
 			   	colModel:[
 			        {
 					   'name'     : 'name', 
Index: lams_monitoring/web/emailnotifications/courseNotifications.jsp
===================================================================
diff -u -r40de3afab4e8d589660daffb6efd6e568e87f8fa -r87c236112358ed9c229876a63816b5e14b17f2af
--- lams_monitoring/web/emailnotifications/courseNotifications.jsp	(.../courseNotifications.jsp)	(revision 40de3afab4e8d589660daffb6efd6e568e87f8fa)
+++ lams_monitoring/web/emailnotifications/courseNotifications.jsp	(.../courseNotifications.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
@@ -46,7 +46,7 @@
 				iconSet: 'fontAwesome',
 			   	url: "<c:url value='/emailNotifications/getUsers.do?'/>" + getSearchParams(),
 				datatype: "json",
-			   	colNames:['<fmt:message key="email.notifications.user.name"/>'],
+				colNames: ['<spring:escapeBody javaScriptEscape="true"><fmt:message key="email.notifications.user.name" /></spring:escapeBody>'],
 			   	colModel:[
 			   		{name:'name',index:'name', width:260, firstsortorder:'desc', sorttype: 'text'}
 			   	],
@@ -79,17 +79,17 @@
     			},
     			activate: function(event, ui) {
     				if ($('#accordion').accordion('option', 'active') == 0) {
-    					$("#emailButton").attr('value', '<fmt:message key="email.notifications.send"/>');
+    					$("#emailButton").attr('value', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="email.notifications.send"/></spring:escapeBody>');
     				} else {
-    					$("#emailButton").attr('value', '<fmt:message key="email.notifications.button.schedule"/>');
+    					$("#emailButton").attr('value', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="email.notifications.button.schedule"/></spring:escapeBody>');
     				}
     		    }
     		});
 			
 			jQuery("#lessonsTable").jqGrid({
 				datatype: "local",
 				rowNum: 10000,
-			   	colNames:['Id', '<fmt:message key="email.notifications.lesson.name"/>'],
+			   	colNames:['Id', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="email.notifications.lesson.name"/></spring:escapeBody>'],
 			   	colModel:[
 					{name:'id2',index:'id2', width:35, sorttype:"int"},
 			   		{name:'name',index:'name', width:225, firstsortorder:'desc', sorttype: 'text'}
@@ -150,11 +150,11 @@
     	            type: 'post',
     	            success: function (json) {
     		            if (json.isSuccessfullySent) {
-    		            	alert("<fmt:message key="email.notifications.emails.successfully.sent" />");
+    		            	alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key="email.notifications.emails.successfully.sent" /></spring:escapeBody>");
     					} else if (json.isSuccessfullyScheduled) {
-    		            	alert("<fmt:message key="email.notifications.emails.successfully.scheduled" />");
+    		            	alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key="email.notifications.emails.successfully.scheduled" /></spring:escapeBody>");
     					} else {
-    						alert("<fmt:message key="email.notifications.problems.sending.emails" />");
+    						alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key="email.notifications.problems.sending.emails" /></spring:escapeBody>");
     					}
     	            }
     	       	});
Index: lams_monitoring/web/emailnotifications/lessonNotifications.jsp
===================================================================
diff -u -r0aa9f13e05d384ced6793a22c6a72057c071fc42 -r87c236112358ed9c229876a63816b5e14b17f2af
--- lams_monitoring/web/emailnotifications/lessonNotifications.jsp	(.../lessonNotifications.jsp)	(revision 0aa9f13e05d384ced6793a22c6a72057c071fc42)
+++ lams_monitoring/web/emailnotifications/lessonNotifications.jsp	(.../lessonNotifications.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
@@ -47,7 +47,7 @@
 				iconSet: 'fontAwesome',
 			   	url: "<c:url value='/emailNotifications/getUsers.do?'/>" + getSearchParams(),
 				datatype: "json",
-			   	colNames:['<fmt:message key="email.notifications.user.name"/>'],
+			   	colNames:['<spring:escapeBody javaScriptEscape='true'><fmt:message key="email.notifications.user.name"/></spring:escapeBody>'],
 			   	colModel:[
 			   		{name:'name',index:'name', width:260, firstsortorder:'desc', sorttype: 'text'}
 			   	],
@@ -83,9 +83,9 @@
     			},
     			activate: function(event, ui) {
     				if ($('#accordion').accordion('option', 'active') == 0) {
-    					$("#emailButton").attr('value', '<fmt:message key="email.notifications.send"/>');
+    					$("#emailButton").attr('value', '<spring:escapeBody javaScriptEscape='true'><fmt:message key="email.notifications.send"/></spring:escapeBody>');
     				} else {
-    					$("#emailButton").attr('value', '<fmt:message key="email.notifications.button.schedule"/>');
+    					$("#emailButton").attr('value', '<spring:escapeBody javaScriptEscape='true'><fmt:message key="email.notifications.button.schedule"/></spring:escapeBody>');
     				}
     			}
     		});
@@ -127,11 +127,11 @@
     	            type: 'post',
     	            success: function (json) {
     		            if (json.isSuccessfullySent) {
-    		            	alert("<fmt:message key="email.notifications.emails.successfully.sent" />");
+    		            	alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key="email.notifications.emails.successfully.sent" /></spring:escapeBody>");
     					} else if (json.isSuccessfullyScheduled) {
-    		            	alert("<fmt:message key="email.notifications.emails.successfully.scheduled" />");
+    		            	alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key="email.notifications.emails.successfully.scheduled" /></spring:escapeBody>");
     					} else {
-    						alert("<fmt:message key="email.notifications.problems.sending.emails" />");
+    						alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key="email.notifications.problems.sending.emails" /></spring:escapeBody>");
     					}
     	            }
     	       	});
Index: lams_monitoring/web/emailnotifications/lessonNotifications5.jsp
===================================================================
diff -u -r35dd47046a83ab2f9e80f76dc22d1521412219b5 -r87c236112358ed9c229876a63816b5e14b17f2af
--- lams_monitoring/web/emailnotifications/lessonNotifications5.jsp	(.../lessonNotifications5.jsp)	(revision 35dd47046a83ab2f9e80f76dc22d1521412219b5)
+++ lams_monitoring/web/emailnotifications/lessonNotifications5.jsp	(.../lessonNotifications5.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
@@ -42,7 +42,7 @@
 				iconSet: 'fontAwesomeSolid',
 			   	url: "<c:url value='/emailNotifications/getUsers.do?'/>" + getSearchParams(),
 				datatype: "json",
-			   	colNames:['<fmt:message key="email.notifications.user.name"/>'],
+				colNames:['<spring:escapeBody javaScriptEscape='true'><fmt:message key="email.notifications.user.name"/></spring:escapeBody>'],
 			   	colModel:[
 			   		{name:'name',index:'name', width:260, firstsortorder:'desc', sorttype: 'text'}
 			   	],
@@ -86,8 +86,8 @@
     		
 			$('#accordion .accordion-collapse').on('show.bs.collapse', function () {
 				$("#emailButton").attr('value', 
-						$(this).is("#nowDiv") ? '<fmt:message key="email.notifications.send"/>'
-											  : '<fmt:message key="email.notifications.button.schedule"/>');
+						$(this).is("#nowDiv") ? '<spring:escapeBody javaScriptEscape='true'><fmt:message key="email.notifications.send"/></spring:escapeBody>'
+											  : '<spring:escapeBody javaScriptEscape='true'><fmt:message key="email.notifications.button.schedule"/></spring:escapeBody>');
 			});
 			
     		$('#emailButton').click(function() {
@@ -129,11 +129,11 @@
         	            let showToast = window.parent.showToast;
         	            
     		            if (json.isSuccessfullySent) {
-    		            	showToast("<fmt:message key="email.notifications.emails.successfully.sent" />");
+    		            	showToast("<spring:escapeBody javaScriptEscape='true'><fmt:message key="email.notifications.emails.successfully.sent" /></spring:escapeBody>");
     					} else if (json.isSuccessfullyScheduled) {
-    						showToast("<fmt:message key="email.notifications.emails.successfully.scheduled" />");
+    						showToast("<spring:escapeBody javaScriptEscape='true'><fmt:message key="email.notifications.emails.successfully.scheduled" /></spring:escapeBody>");
     					} else {
-    						showToast("<fmt:message key="email.notifications.problems.sending.emails" />");
+    						showToast("<spring:escapeBody javaScriptEscape='true'><fmt:message key="email.notifications.problems.sending.emails" /></spring:escapeBody>");
     					}
     	            }
     	       	});
Index: lams_monitoring/web/emailnotifications/scheduledEmailList.jsp
===================================================================
diff -u -r328b2d5068eb7b9c271f43e55b3f19a05733312b -r87c236112358ed9c229876a63816b5e14b17f2af
--- lams_monitoring/web/emailnotifications/scheduledEmailList.jsp	(.../scheduledEmailList.jsp)	(revision 328b2d5068eb7b9c271f43e55b3f19a05733312b)
+++ lams_monitoring/web/emailnotifications/scheduledEmailList.jsp	(.../scheduledEmailList.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
@@ -27,8 +27,8 @@
 	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript">
-	var deleteConfirmationMessage1 = '<fmt:message key="email.notification.delete.alert1"><fmt:param>%replace%</fmt:param></fmt:message>';
-	var deleteConfirmationMessage2 = '<fmt:message key="email.notification.delete.alert2"/>';
+	var deleteConfirmationMessage1 = '<spring:escapeBody javaScriptEscape='true'><fmt:message key="email.notification.delete.alert1"><fmt:param>%replace%</fmt:param></fmt:message></spring:escapeBody>';
+	var deleteConfirmationMessage2 = '<spring:escapeBody javaScriptEscape='true'><fmt:message key="email.notification.delete.alert2"/></spring:escapeBody>';
 	
 	function deleteNotification(triggerName, scheduledate, deleteUrlParams) {
 		var msg = deleteConfirmationMessage1;
Index: lams_monitoring/web/emailnotifications/scheduledEmailList5.jsp
===================================================================
diff -u -r35dd47046a83ab2f9e80f76dc22d1521412219b5 -r87c236112358ed9c229876a63816b5e14b17f2af
--- lams_monitoring/web/emailnotifications/scheduledEmailList5.jsp	(.../scheduledEmailList5.jsp)	(revision 35dd47046a83ab2f9e80f76dc22d1521412219b5)
+++ lams_monitoring/web/emailnotifications/scheduledEmailList5.jsp	(.../scheduledEmailList5.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
@@ -25,8 +25,8 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
 	<script type="text/javascript">
-	var deleteConfirmationMessage1 = '<fmt:message key="email.notification.delete.alert1"><fmt:param>%replace%</fmt:param></fmt:message>';
-	var deleteConfirmationMessage2 = '<fmt:message key="email.notification.delete.alert2"/>';
+	var deleteConfirmationMessage1 = '<spring:escapeBody javaScriptEscape='true'><fmt:message key="email.notification.delete.alert1"><fmt:param>%replace%</fmt:param></fmt:message></spring:escapeBody>';
+	var deleteConfirmationMessage2 = '<spring:escapeBody javaScriptEscape='true'><fmt:message key="email.notification.delete.alert2"/></spring:escapeBody>';
 	
 	function deleteNotification(triggerName, scheduledate, deleteUrlParams) {
 		var msg = deleteConfirmationMessage1;
Index: lams_monitoring/web/gate/conditionGateContent.jsp
===================================================================
diff -u -r54007f98ca71e0073f19c5db78536437123287c6 -r87c236112358ed9c229876a63816b5e14b17f2af
--- lams_monitoring/web/gate/conditionGateContent.jsp	(.../conditionGateContent.jsp)	(revision 54007f98ca71e0073f19c5db78536437123287c6)
+++ lams_monitoring/web/gate/conditionGateContent.jsp	(.../conditionGateContent.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
@@ -43,7 +43,7 @@
     </lams:head>
     
     <body class="stripes">
-		<c:set var="title"><fmt:message key="label.condition.gate.title"/></c:set>
+		<c:set var="title"><spring:escapeBody javaScriptEscape='true'></spring:escapeBody><fmt:message key="label.condition.gate.title"/></spring:escapeBody></c:set>
 		<lams:Page title="${title}" type="monitoring">
 			
 			<%@ include file="gateInfo.jsp" %>
Index: lams_monitoring/web/gate/passwordGateContent.jsp
===================================================================
diff -u -r7116e79c883ad42375d9fa3278dec8a84733ea86 -r87c236112358ed9c229876a63816b5e14b17f2af
--- lams_monitoring/web/gate/passwordGateContent.jsp	(.../passwordGateContent.jsp)	(revision 7116e79c883ad42375d9fa3278dec8a84733ea86)
+++ lams_monitoring/web/gate/passwordGateContent.jsp	(.../passwordGateContent.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
@@ -49,7 +49,7 @@
     </lams:head>
     
     <body class="stripes">
-		<c:set var="title"><fmt:message key="label.password.gate.title"/></c:set>
+		<c:set var="title"><spring:escapeBody javaScriptEscape='true'><fmt:message key="label.password.gate.title"/></spring:escapeBody></c:set>
 		<lams:Page title="${title}" type="monitoring" formID="gateForm">
 			
 			<%@ include file="gateInfo.jsp" %>
Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -r99df1f178e0956c7f6691ee7c0eda8459ce1b2a2 -r87c236112358ed9c229876a63816b5e14b17f2af
--- lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 99df1f178e0956c7f6691ee7c0eda8459ce1b2a2)
+++ lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
@@ -95,174 +95,90 @@
 					csrfTokenName = '<csrf:tokenname/>',
 					csrfTokenValue = '<csrf:tokenvalue/>',
 
-					decoderDiv = $('<div />'),
 					LABELS = {
-						<fmt:message key="index.emailnotifications" var="EMAIL_NOTIFICATIONS_TITLE_VAR"/>
-						EMAIL_NOTIFICATIONS_TITLE : '<c:out value="${EMAIL_NOTIFICATIONS_TITLE_VAR}" />',
-						<fmt:message key="force.complete.click" var="FORCE_COMPLETE_CLICK_VAR"/>
-						FORCE_COMPLETE_CLICK : decoderDiv.html('<c:out value="${FORCE_COMPLETE_CLICK_VAR}" />').text(),
-						<fmt:message key="button.force.complete" var="FORCE_COMPLETE_BUTTON_VAR"/>
-						FORCE_COMPLETE_BUTTON : '<c:out value="${FORCE_COMPLETE_BUTTON_VAR}" />',
-						<fmt:message key="force.complete.end.lesson.confirm" var="FORCE_COMPLETE_END_LESSON_CONFIRM_VAR"/>
-						FORCE_COMPLETE_END_LESSON_CONFIRM : decoderDiv.html('<c:out value="${FORCE_COMPLETE_END_LESSON_CONFIRM_VAR}" />').text(),
-						<fmt:message key="force.complete.activity.confirm" var="FORCE_COMPLETE_ACTIVITY_CONFIRM_VAR"/>
-						FORCE_COMPLETE_ACTIVITY_CONFIRM : decoderDiv.html('<c:out value="${FORCE_COMPLETE_ACTIVITY_CONFIRM_VAR}" />').text(),
-						<fmt:message key="force.complete.remove.content" var="FORCE_COMPLETE_REMOVE_CONTENT_VAR"/>
-						FORCE_COMPLETE_REMOVE_CONTENT : decoderDiv.html('<c:out value="${FORCE_COMPLETE_REMOVE_CONTENT_VAR}" />').text(),
-						<fmt:message key="force.complete.drop.fail" var="FORCE_COMPLETE_DROP_FAIL_VAR"/>
-						FORCE_COMPLETE_DROP_FAIL : '<c:out value="${FORCE_COMPLETE_DROP_FAIL_VAR}" />',
-						<fmt:message key="learner.group.count" var="LEARNER_GROUP_COUNT_VAR"/>
-						LEARNER_GROUP_COUNT : '<c:out value="${LEARNER_GROUP_COUNT_VAR}" />',
-						<fmt:message key="learner.group.show" var="LEARNER_GROUP_SHOW_VAR"/>
-						LEARNER_GROUP_SHOW : '<c:out value="${LEARNER_GROUP_SHOW_VAR}" />',
-						<fmt:message key="learner.group.remove.progress" var="LEARNER_GROUP_REMOVE_PROGRESS_VAR"/>
-						LEARNER_GROUP_REMOVE_PROGRESS : decoderDiv.html('<c:out value="${LEARNER_GROUP_REMOVE_PROGRESS_VAR}" />').text(),
-						<fmt:message key="button.email" var="EMAIL_BUTTON_VAR"/>
-						EMAIL_BUTTON : '<c:out value="${EMAIL_BUTTON_VAR}" />',
-						<fmt:message key="email.notifications" var="NOTIFCATIONS_VAR"/>
-						NOTIFCATIONS : '<c:out value="${NOTIFCATIONS_VAR}" />',
-						<fmt:message key="button.save" var="SAVE_BUTTON_VAR"/>
-						SAVE_BUTTON : '<c:out value="${SAVE_BUTTON_VAR}" />',
-						<fmt:message key="button.cancel" var="CANCEL_BUTTON_VAR"/>
-						CANCEL_BUTTON : '<c:out value="${CANCEL_BUTTON_VAR}" />',
-						<fmt:message key="learner.finished.dialog.title" var="LEARNER_FINISHED_DIALOG_TITLE_VAR"/>
-						LEARNER_FINISHED_DIALOG_TITLE : '<c:out value="${LEARNER_FINISHED_DIALOG_TITLE_VAR}" />',
-						<fmt:message key="lesson.enable.presence.alert" var="LESSON_PRESENCE_ENABLE_ALERT_VAR"/>
-						LESSON_PRESENCE_ENABLE_ALERT : decoderDiv.html('<c:out value="${LESSON_PRESENCE_ENABLE_ALERT_VAR}" />').text(),
-						<fmt:message key="lesson.disable.presence.alert" var="LESSON_PRESENCE_DISABLE_ALERT_VAR"/>
-						LESSON_PRESENCE_DISABLE_ALERT : decoderDiv.html('<c:out value="${LESSON_PRESENCE_DISABLE_ALERT_VAR}" />').text(),
-						<fmt:message key="lesson.enable.im.alert" var="LESSON_IM_ENABLE_ALERT_VAR"/>
-						LESSON_IM_ENABLE_ALERT : decoderDiv.html('<c:out value="${LESSON_IM_ENABLE_ALERT_VAR}" />').text(),
-						<fmt:message key="lesson.disable.im.alert" var="LESSON_IM_DISABLE_ALERT_VAR"/>
-						LESSON_IM_DISABLE_ALERT : decoderDiv.html('<c:out value="${LESSON_IM_DISABLE_ALERT_VAR}" />').text(),
-						<fmt:message key="lesson.remove.alert" var="LESSON_REMOVE_ALERT_VAR"/>
-						LESSON_REMOVE_ALERT : decoderDiv.html('<c:out value="${LESSON_REMOVE_ALERT_VAR}" />').text(),
-						<fmt:message key="lesson.remove.doublecheck.alert" var="LESSON_REMOVE_DOUBLECHECK_ALERT_VAR"/>
-						LESSON_REMOVE_DOUBLECHECK_ALERT : decoderDiv.html('<c:out value="${LESSON_REMOVE_DOUBLECHECK_ALERT_VAR}" />').text(),
-						<fmt:message key="lesson.state.created" var="LESSON_STATE_CREATED_VAR"/>
-						LESSON_STATE_CREATED : '<c:out value="${LESSON_STATE_CREATED_VAR}" />',
-						<fmt:message key="lesson.state.scheduled" var="LESSON_STATE_SCHEDULED_VAR"/>
-						LESSON_STATE_SCHEDULED : '<c:out value="${LESSON_STATE_SCHEDULED_VAR}" />',
-						<fmt:message key="lesson.state.started" var="LESSON_STATE_STARTED_VAR"/>
-						LESSON_STATE_STARTED : '<c:out value="${LESSON_STATE_STARTED_VAR}" />',
-						<fmt:message key="lesson.state.suspended" var="LESSON_STATE_SUSPENDED_VAR"/>
-						LESSON_STATE_SUSPENDED : '<c:out value="${LESSON_STATE_SUSPENDED_VAR}" />',
-						<fmt:message key="lesson.state.finished" var="LESSON_STATE_FINISHED_VAR"/>
-						LESSON_STATE_FINISHED : '<c:out value="${LESSON_STATE_FINISHED_VAR}" />',
-						<fmt:message key="lesson.state.archived" var="LESSON_STATE_ARCHIVED_VAR"/>
-						LESSON_STATE_ARCHIVED : '<c:out value="${LESSON_STATE_ARCHIVED_VAR}" />',
-						<fmt:message key="lesson.state.removed" var="LESSON_STATE_REMOVED_VAR"/>
-						LESSON_STATE_REMOVED : '<c:out value="${LESSON_STATE_REMOVED_VAR}" />',
-						<fmt:message key="lesson.state.action.disable" var="LESSON_STATE_ACTION_DISABLE_VAR"/>
-						LESSON_STATE_ACTION_DISABLE : '<c:out value="${LESSON_STATE_ACTION_DISABLE_VAR}" />',
-						<fmt:message key="lesson.state.action.activate" var="LESSON_STATE_ACTION_ACTIVATE_VAR"/>
-						LESSON_STATE_ACTION_ACTIVATE : '<c:out value="${LESSON_STATE_ACTION_ACTIVATE_VAR}" />',
-						<fmt:message key="lesson.state.action.remove" var="LESSON_STATE_ACTION_REMOVE_VAR"/>
-						LESSON_STATE_ACTION_REMOVE : '<c:out value="${LESSON_STATE_ACTION_REMOVE_VAR}" />',
-						<fmt:message key="lesson.state.action.archive" var="LESSON_STATE_ACTION_ARCHIVE_VAR"/>
-						LESSON_STATE_ACTION_ARCHIVE : '<c:out value="${LESSON_STATE_ACTION_ARCHIVE_VAR}" />',
-						<fmt:message key="error.lesson.schedule.date" var="LESSON_ERROR_SCHEDULE_DATE_VAR"/>
-						LESSON_ERROR_SCHEDULE_DATE : decoderDiv.html('<c:out value="${LESSON_ERROR_SCHEDULE_DATE_VAR}" />').text(),
-						<fmt:message key="button.edit.class" var="LESSON_EDIT_CLASS_VAR"/>
-						LESSON_EDIT_CLASS : '<c:out value="${LESSON_EDIT_CLASS_VAR}" />',
-						<fmt:message key="class.add.all.confirm" var="CLASS_ADD_ALL_CONFIRM_VAR"/>
-						CLASS_ADD_ALL_CONFIRM : '<c:out value="${CLASS_ADD_ALL_CONFIRM_VAR}" />',
-						<fmt:message key="class.add.all.success" var="CLASS_ADD_ALL_SUCCESS_VAR"/>
-						CLASS_ADD_ALL_SUCCESS : '<c:out value="${CLASS_ADD_ALL_SUCCESS_VAR}" />',
-						<fmt:message key="lesson.group.dialog.class" var="LESSON_GROUP_DIALOG_CLASS_VAR"/>
-						LESSON_GROUP_DIALOG_CLASS : '<c:out value="${LESSON_GROUP_DIALOG_CLASS_VAR}" />',
-						<fmt:message key="label.learner.progress.activity.current.tooltip" var="CURRENT_ACTIVITY_VAR"/>
-						CURRENT_ACTIVITY : '<c:out value="${CURRENT_ACTIVITY_VAR}" />',
-						<fmt:message key="label.learner.progress.activity.completed.tooltip" var="COMPLETED_ACTIVITY_VAR"/>
-						COMPLETED_ACTIVITY : '<c:out value="${COMPLETED_ACTIVITY_VAR}" />',
-						<fmt:message key="label.learner.progress.activity.attempted.tooltip" var="ATTEMPTED_ACTIVITY_VAR"/>
-						ATTEMPTED_ACTIVITY : '<c:out value="${ATTEMPTED_ACTIVITY_VAR}" />',
-						<fmt:message key="label.learner.progress.activity.tostart.tooltip" var="TOSTART_ACTIVITY_VAR"/>
-						TOSTART_ACTIVITY : '<c:out value="${TOSTART_ACTIVITY_VAR}" />',
-						<fmt:message key="label.learner.progress.activity.support.tooltip" var="SUPPORT_ACTIVITY_VAR"/>
-						SUPPORT_ACTIVITY : '<c:out value="${SUPPORT_ACTIVITY_VAR}" />',
-						<fmt:message key="label.learner.progress.not.started" var="PROGRESS_NOT_STARTED_VAR"/>
-						PROGRESS_NOT_STARTED : '<c:out value="${PROGRESS_NOT_STARTED_VAR}" />',
-						<fmt:message key="button.timechart" var="TIME_CHART_VAR"/>
-						TIME_CHART : '<c:out value="${TIME_CHART_VAR}" />',
-						<fmt:message key="button.timechart.tooltip" var="TIME_CHART_TOOLTIP_VAR"/>
-						TIME_CHART_TOOLTIP : '<c:out value="${TIME_CHART_TOOLTIP_VAR}" />',
-						<fmt:message key="button.live.edit.confirm" var="LIVE_EDIT_CONFIRM_VAR"/>
-						LIVE_EDIT_CONFIRM : decoderDiv.html('<c:out value="${LIVE_EDIT_CONFIRM_VAR}" />').text(),
-						<fmt:message key="lesson.task.gate" var="CONTRIBUTE_GATE_VAR"/>
-						CONTRIBUTE_GATE : '<c:out value="${CONTRIBUTE_GATE_VAR}" />',
-						<fmt:message key="lesson.task.gate.password" var="CONTRIBUTE_GATE_PASSWORD_VAR"/>
-						CONTRIBUTE_GATE_PASSWORD : '<c:out value="${CONTRIBUTE_GATE_PASSWORD_VAR}" />',
-						<fmt:message key="lesson.task.grouping" var="CONTRIBUTE_GROUPING_VAR"/>
-						CONTRIBUTE_GROUPING : '<c:out value="${CONTRIBUTE_GROUPING_VAR}" />',
-						<fmt:message key="lesson.task.branching" var="CONTRIBUTE_BRANCHING_VAR"/>
-						CONTRIBUTE_BRANCHING : '<c:out value="${CONTRIBUTE_BRANCHING_VAR}" />',
-						<fmt:message key="lesson.task.content.edited" var="CONTRIBUTE_CONTENT_EDITED_VAR"/>
-						CONTRIBUTE_CONTENT_EDITED : '<c:out value="${CONTRIBUTE_CONTENT_EDITED_VAR}" />',
-						<fmt:message key="lesson.task.tool" var="CONTRIBUTE_TOOL_VAR"/>
-						CONTRIBUTE_TOOL : '<c:out value="${CONTRIBUTE_TOOL_VAR}" />',
-						<fmt:message key="button.task.go.tooltip" var="CONTRIBUTE_TOOLTIP_VAR"/>
-						CONTRIBUTE_TOOLTIP : '<c:out value="${CONTRIBUTE_TOOLTIP_VAR}" />',
-						<fmt:message key="button.task.go" var="CONTRIBUTE_BUTTON_VAR"/>
-						CONTRIBUTE_BUTTON : '<c:out value="${CONTRIBUTE_BUTTON_VAR}" />',
-						<fmt:message key="button.task.gate.open.now" var="CONTRIBUTE_OPEN_GATE_NOW_BUTTON_VAR"/>
-						CONTRIBUTE_OPEN_GATE_NOW_BUTTON : '<c:out value="${CONTRIBUTE_OPEN_GATE_NOW_BUTTON_VAR}" />',
-						<fmt:message key="button.task.gate.open.now.tooltip" var="CONTRIBUTE_OPEN_GATE_NOW_TOOLTIP_VAR"/>
-						CONTRIBUTE_OPEN_GATE_NOW_TOOLTIP : '<c:out value="${CONTRIBUTE_OPEN_GATE_NOW_TOOLTIP_VAR}" />',
-						<fmt:message key="button.task.gate.open" var="CONTRIBUTE_OPEN_GATE_BUTTON_VAR"/>
-						CONTRIBUTE_OPEN_GATE_BUTTON : '<c:out value="${CONTRIBUTE_OPEN_GATE_BUTTON_VAR}" />',
-						<fmt:message key="button.task.gate.open.tooltip" var="CONTRIBUTE_OPEN_GATE_TOOLTIP_VAR"/>
-						CONTRIBUTE_OPEN_GATE_TOOLTIP : '<c:out value="${CONTRIBUTE_OPEN_GATE_TOOLTIP_VAR}" />',
-						<fmt:message key="button.task.gate.opened" var="CONTRIBUTE_OPENED_GATE_VAR"/>
-						CONTRIBUTE_OPENED_GATE : '<c:out value="${CONTRIBUTE_OPENED_GATE_VAR}" />',
-						<fmt:message key="button.task.gate.opened.tooltip" var="CONTRIBUTE_OPENED_GATE_TOOLTIP_VAR"/>
-						CONTRIBUTE_OPENED_GATE_TOOLTIP : '<c:out value="${CONTRIBUTE_OPENED_GATE_TOOLTIP_VAR}" />',
-						<fmt:message key="lesson.task.attention" var="CONTRIBUTE_ATTENTION_VAR"/>
-						CONTRIBUTE_ATTENTION : '<c:out value="${CONTRIBUTE_ATTENTION_VAR}" />',
-						<fmt:message key="button.help" var="BUTTON_HELP_VAR"/>
-						HELP : '<c:out value="${BUTTON_HELP_VAR}" />',
-						<fmt:message key="label.lesson.introduction" var="LESSON_INTRODUCTION_VAR"/>
-						LESSON_INTRODUCTION : '<c:out value="${LESSON_INTRODUCTION_VAR}" />',
-						<fmt:message key="label.email" var="EMAIL_TITLE_VAR"/>
-						EMAIL_TITLE : '<c:out value="${EMAIL_TITLE_VAR}" />',
-						<fmt:message key="tour.this.is.disabled" var="TOUR_DISABLED_ELEMENT_VAR"/>
-						TOUR_DISABLED_ELEMENT : '<c:out value="${TOUR_DISABLED_ELEMENT_VAR}" />',
-						<fmt:message key="progress.email.sent.success" var="PROGRESS_EMAIL_SUCCESS_VAR"/>
-						PROGRESS_EMAIL_SUCCESS : '<c:out value="${PROGRESS_EMAIL_SUCCESS_VAR}" />',
-						<fmt:message key="progress.email.send.now.question" var="PROGRESS_EMAIL_SEND_NOW_QUESTION_VAR"/>
-						PROGRESS_EMAIL_SEND_NOW_QUESTION : '<c:out value="${PROGRESS_EMAIL_SEND_NOW_QUESTION_VAR}" />',
-						<fmt:message key="progress.email.send.failed" var="PROGRESS_EMAIL_SEND_FAILED_VAR"/>
-						PROGRESS_EMAIL_SEND_FAILED : '<c:out value="${PROGRESS_EMAIL_SEND_FAILED_VAR}" />',
-						<fmt:message key="progress.email.select.date.first" var="PROGRESS_EMAIL_SELECT_DATE_FIRST_VAR"/>
-						PROGRESS_SELECT_DATE_FIRST : '<c:out value="${PROGRESS_EMAIL_SELECT_DATE_FIRST_VAR}" />',
-						<fmt:message key="progress.email.enter.two.dates.first" var="PROGRESS_EMAIL_ENTER_TWO_DATES_FIRST_VAR"/>
-						PROGRESS_ENTER_TWO_DATES_FIRST : '<c:out value="${PROGRESS_EMAIL_ENTER_TWO_DATES_FIRST_VAR}" />',
-						<fmt:message key="progress.email.would.you.like.to.generate" var="PROGRESS_EMAIL_GENERATE_ONE_VAR"/>
-						PROGRESS_EMAIL_GENERATE_ONE : '<c:out value="${PROGRESS_EMAIL_GENERATE_ONE_VAR}" />',
-						<fmt:message key="progress.email.how.many.dates.to.generate" var="PROGRESS_EMAIL_GENERATE_TWO_VAR"/>
-						PROGRESS_EMAIL_GENERATE_TWO : '<c:out value="${PROGRESS_EMAIL_GENERATE_TWO_VAR}" />',
-						<fmt:message key="progress.email.title" var="PROGRESS_EMAIL_TITLE_VAR"/>
-						PROGRESS_EMAIL_TITLE : '<c:out value="${PROGRESS_EMAIL_TITLE_VAR}" />',
-						<fmt:message key="error.date.in.past" var="ERROR_DATE_IN_PAST_VAR"/>
-						ERROR_DATE_IN_PAST : '<c:out value="${ERROR_DATE_IN_PAST_VAR}" />',
-						<fmt:message key="label.lesson.starts" var="LESSON_START_VAR"><fmt:param value="%0"/></fmt:message>
-						LESSON_START : '<c:out value="${LESSON_START_VAR}"/>',
-						<fmt:message key="label.lesson.finishes" var="LESSON_FINISH_VAR"><fmt:param value="%0"/></fmt:message>
-						LESSON_FINISH : '<c:out value="${LESSON_FINISH_VAR}" />',
-						<fmt:message key="lesson.display.activity.scores.alert" var="LESSON_ACTIVITY_SCORES_ENABLE_ALERT_VAR"/>
-						LESSON_ACTIVITY_SCORES_ENABLE_ALERT : decoderDiv.html('<c:out value="${LESSON_ACTIVITY_SCORES_ENABLE_ALERT_VAR}" />').text(),
-						<fmt:message key="lesson.hide.activity.scores.alert" var="LESSON_ACTIVITY_SCORES_DISABLE_ALERT_VAR"/>
-						LESSON_ACTIVITY_SCORES_DISABLE_ALERT : decoderDiv.html('<c:out value="${LESSON_ACTIVITY_SCORES_DISABLE_ALERT_VAR}" />').text(),
-						<fmt:message key="label.reschedule" var="RESCHEDULE_VAR"/>
-						RESCHEDULE : decoderDiv.html('<c:out value="${RESCHEDULE_VAR}" />').text(),
-						<fmt:message key="error.lesson.end.date.must.be.after.start.date" var="LESSON_ERROR_START_END_DATE_VAR"/>
-						LESSON_ERROR_START_END_DATE : decoderDiv.html('<c:out value="${LESSON_ERROR_START_END_DATE_VAR}" />').text(),
-						<fmt:message key="button.live.edit" var="LIVE_EDIT_BUTTON_VAR"/>
-						LIVE_EDIT_BUTTON: '<c:out value="${LIVE_EDIT_BUTTON_VAR}" />',
-						<fmt:message key="button.live.edit.tooltip" var="LIVE_EDIT_TOOLTIP_VAR"/>
-						LIVE_EDIT_TOOLTIP: '<c:out value="${LIVE_EDIT_TOOLTIP_VAR}" />',
-						<fmt:message key="label.person.editing.lesson" var="LIVE_EDIT_WARNING_VAR"><fmt:param value="%0"/></fmt:message>
-						LIVE_EDIT_WARNING: '<c:out value="${LIVE_EDIT_WARNING_VAR}" />'
+						EMAIL_NOTIFICATIONS_TITLE : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='index.emailnotifications'/></spring:escapeBody>",
+						FORCE_COMPLETE_CLICK : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='force.complete.click'/></spring:escapeBody>",
+						FORCE_COMPLETE_BUTTON : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='button.force.complete'/></spring:escapeBody>",
+						FORCE_COMPLETE_END_LESSON_CONFIRM : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='force.complete.end.lesson.confirm'/></spring:escapeBody>",
+						FORCE_COMPLETE_ACTIVITY_CONFIRM : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='force.complete.activity.confirm'/></spring:escapeBody>",
+						FORCE_COMPLETE_REMOVE_CONTENT : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='force.complete.remove.content'/></spring:escapeBody>",
+						FORCE_COMPLETE_DROP_FAIL : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='force.complete.drop.fail'/></spring:escapeBody>",
+						LEARNER_GROUP_COUNT : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='learner.group.count'/></spring:escapeBody>",
+						LEARNER_GROUP_SHOW : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='learner.group.show'/></spring:escapeBody>",
+						LEARNER_GROUP_REMOVE_PROGRESS : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='learner.group.remove.progress'/></spring:escapeBody>",
+						EMAIL_BUTTON : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='button.email'/></spring:escapeBody>",
+						NOTIFCATIONS : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='email.notifications'/></spring:escapeBody>",
+						SAVE_BUTTON : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='button.save'/></spring:escapeBody>",
+						CANCEL_BUTTON : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='button.cancel'/></spring:escapeBody>",
+						LEARNER_FINISHED_DIALOG_TITLE : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='learner.finished.dialog.title'/></spring:escapeBody>",
+						LESSON_PRESENCE_ENABLE_ALERT : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.enable.presence.alert'/></spring:escapeBody>",
+						LESSON_PRESENCE_DISABLE_ALERT : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.disable.presence.alert'/></spring:escapeBody>",
+						LESSON_IM_ENABLE_ALERT : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.enable.im.alert'/></spring:escapeBody>",
+						LESSON_IM_DISABLE_ALERT : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.disable.im.alert'/></spring:escapeBody>",
+						LESSON_REMOVE_ALERT : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.remove.alert'/></spring:escapeBody>",
+						LESSON_REMOVE_DOUBLECHECK_ALERT : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.remove.doublecheck.alert'/></spring:escapeBody>",
+						LESSON_STATE_CREATED : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.state.created'/></spring:escapeBody>",
+						LESSON_STATE_SCHEDULED : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.state.scheduled'/></spring:escapeBody>",
+						LESSON_STATE_STARTED : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.state.started'/></spring:escapeBody>",
+						LESSON_STATE_SUSPENDED : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.state.suspended'/></spring:escapeBody>",
+						LESSON_STATE_FINISHED : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.state.finished'/></spring:escapeBody>",
+						LESSON_STATE_ARCHIVED : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.state.archived'/></spring:escapeBody>",
+						LESSON_STATE_REMOVED : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.state.removed'/></spring:escapeBody>",
+						LESSON_STATE_ACTION_DISABLE : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.state.action.disable'/></spring:escapeBody>",
+						LESSON_STATE_ACTION_ACTIVATE : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.state.action.activate'/></spring:escapeBody>",
+						LESSON_STATE_ACTION_REMOVE : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.state.action.remove'/></spring:escapeBody>",
+						LESSON_STATE_ACTION_ARCHIVE : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.state.action.archive'/></spring:escapeBody>",
+						LESSON_ERROR_SCHEDULE_DATE : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.lesson.schedule.date'/></spring:escapeBody>",
+						LESSON_EDIT_CLASS : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='button.edit.class'/></spring:escapeBody>",
+						CLASS_ADD_ALL_CONFIRM : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='class.add.all.confirm'/></spring:escapeBody>",
+						CLASS_ADD_ALL_SUCCESS : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='class.add.all.success'/></spring:escapeBody>",
+						LESSON_GROUP_DIALOG_CLASS : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.group.dialog.class'/></spring:escapeBody>",
+						CURRENT_ACTIVITY : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.learner.progress.activity.current.tooltip'/></spring:escapeBody>",
+						COMPLETED_ACTIVITY : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.learner.progress.activity.completed.tooltip'/></spring:escapeBody>",
+						ATTEMPTED_ACTIVITY : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.learner.progress.activity.attempted.tooltip'/></spring:escapeBody>",
+						TOSTART_ACTIVITY : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.learner.progress.activity.tostart.tooltip'/></spring:escapeBody>",
+						SUPPORT_ACTIVITY : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.learner.progress.activity.support.tooltip'/></spring:escapeBody>",
+						PROGRESS_NOT_STARTED : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.learner.progress.not.started'/></spring:escapeBody>",
+						TIME_CHART : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='button.timechart'/></spring:escapeBody>",
+						TIME_CHART_TOOLTIP : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='button.timechart.tooltip'/></spring:escapeBody>",
+						LIVE_EDIT_CONFIRM : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='button.live.edit.confirm'/></spring:escapeBody>",
+						CONTRIBUTE_GATE : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.task.gate'/></spring:escapeBody>",
+						CONTRIBUTE_GATE_PASSWORD : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.task.gate.password'/></spring:escapeBody>",
+						CONTRIBUTE_GROUPING : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.task.grouping'/></spring:escapeBody>",
+						CONTRIBUTE_BRANCHING : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.task.branching'/></spring:escapeBody>",
+						CONTRIBUTE_CONTENT_EDITED : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.task.content.edited'/></spring:escapeBody>",
+						CONTRIBUTE_TOOL : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.task.tool'/></spring:escapeBody>",
+						CONTRIBUTE_TOOLTIP : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='button.task.go.tooltip'/></spring:escapeBody>",
+						CONTRIBUTE_BUTTON : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='button.task.go'/></spring:escapeBody>",
+						CONTRIBUTE_OPEN_GATE_NOW_BUTTON: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='button.task.gate.open.now'/></spring:escapeBody>",
+						CONTRIBUTE_OPEN_GATE_NOW_TOOLTIP: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='button.task.gate.open.now.tooltip'/></spring:escapeBody>",
+						CONTRIBUTE_OPEN_GATE_BUTTON: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='button.task.gate.open'/></spring:escapeBody>",
+						CONTRIBUTE_OPEN_GATE_TOOLTIP: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='button.task.gate.open.tooltip'/></spring:escapeBody>",
+						CONTRIBUTE_OPENED_GATE: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='button.task.gate.opened'/></spring:escapeBody>",
+						CONTRIBUTE_OPENED_GATE_TOOLTIP: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='button.task.gate.opened.tooltip'/></spring:escapeBody>",
+						CONTRIBUTE_ATTENTION: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.task.attention'/></spring:escapeBody>",
+						HELP: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='button.help'/></spring:escapeBody>",
+						LESSON_INTRODUCTION: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.lesson.introduction'/></spring:escapeBody>",
+						EMAIL_TITLE: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.email'/></spring:escapeBody>",
+						TOUR_DISABLED_ELEMENT: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='tour.this.is.disabled'/></spring:escapeBody>",
+						PROGRESS_EMAIL_SUCCESS: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='progress.email.sent.success'/></spring:escapeBody>",
+						PROGRESS_EMAIL_SEND_NOW_QUESTION: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='progress.email.send.now.question'/></spring:escapeBody>",
+						PROGRESS_EMAIL_SEND_FAILED: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='progress.email.send.failed'/></spring:escapeBody>",
+						PROGRESS_SELECT_DATE_FIRST: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='progress.email.select.date.first'/></spring:escapeBody>",
+						PROGRESS_ENTER_TWO_DATES_FIRST: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='progress.email.enter.two.dates.first'/></spring:escapeBody>",
+						PROGRESS_EMAIL_GENERATE_ONE: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='progress.email.would.you.like.to.generate'/></spring:escapeBody>",
+						PROGRESS_EMAIL_GENERATE_TWO: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='progress.email.how.many.dates.to.generate'/></spring:escapeBody>",
+						PROGRESS_EMAIL_TITLE: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='progress.email.title'/></spring:escapeBody>",
+						ERROR_DATE_IN_PAST: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.date.in.past'/></spring:escapeBody>",
+						LESSON_START: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.lesson.starts'><fmt:param value='%0'/></fmt:message></spring:escapeBody>",
+						LESSON_FINISH: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.lesson.finishes'><fmt:param value='%0'/></fmt:message></spring:escapeBody>",
+						LESSON_ACTIVITY_SCORES_ENABLE_ALERT: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.display.activity.scores.alert'/></spring:escapeBody>",
+						LESSON_ACTIVITY_SCORES_DISABLE_ALERT: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lesson.hide.activity.scores.alert'/></spring:escapeBody>",
+						RESCHEDULE: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.reschedule'/></spring:escapeBody>",
+						LESSON_ERROR_START_END_DATE: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.lesson.end.date.must.be.after.start.date'/></spring:escapeBody>",
+						LIVE_EDIT_BUTTON: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='button.live.edit'/></spring:escapeBody>",
+						LIVE_EDIT_TOOLTIP: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='button.live.edit.tooltip'/></spring:escapeBody>",
+						LIVE_EDIT_WARNING: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.person.editing.lesson'><fmt:param value='%0'/></fmt:message></spring:escapeBody>"
 					};
 
 			<c:if test="${jqGridInternationalised}">
Index: lams_monitoring/web/monitorTour.jsp
===================================================================
diff -u -r6f1fed4f14cf4217a48f7b4a0f31d77f280d542c -r87c236112358ed9c229876a63816b5e14b17f2af
--- lams_monitoring/web/monitorTour.jsp	(.../monitorTour.jsp)	(revision 6f1fed4f14cf4217a48f7b4a0f31d77f280d542c)
+++ lams_monitoring/web/monitorTour.jsp	(.../monitorTour.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
@@ -21,214 +21,214 @@
 			  name: "LAMSMonitorTour",
 		      steps: [
 		          {  // 0
-			        title: "<fmt:message key="tour.intro.title"/>",
-			        content: "<fmt:message key="tour.intro.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.intro.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.intro.content"/></spring:escapeBody>",
 			        orphan: true
 			      }, {
 			        element: "#page-tabs",
-			        title: "<fmt:message key="tour.tab.selection.title"/>",
-			        content: "<p><fmt:message key="tour.tab.selection.content.1"/></p><p><fmt:message key="tour.tab.selection.content.2"/></p><p><fmt:message key="tour.tab.selection.content.3"/></p><p><fmt:message key="tour.tab.selection.content.4"/></p><p><fmt:message key="tour.tab.selection.content.5"/></p>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.tab.selection.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><p><fmt:message key="tour.tab.selection.content.1"/></p><p><fmt:message key="tour.tab.selection.content.2"/></p><p><fmt:message key="tour.tab.selection.content.3"/></p><p><fmt:message key="tour.tab.selection.content.4"/></p><p><fmt:message key="tour.tab.selection.content.5"/></p></spring:escapeBody>",
 		        	placement: "bottom",
 			      },{
 			      	element: "#tour-refresh-button",
-			        title: "<fmt:message key="button.refresh"/>",
-			        content: "<fmt:message key="tour.tab.refresh.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="button.refresh"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.tab.refresh.content"/></spring:escapeBody>",
 		        	placement: "left",
 			      },{
 			        element: "#description",
-			        title: "<fmt:message key="summery.desc.lbl"/>",
-			        content: "<fmt:message key="tour.lesson.description"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="summery.desc.lbl"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.lesson.description"/></spring:escapeBody>",
 			        placement: "bottom",
 			      },{ 
 			        element: "#lessonStateLabel:first-child",
-			        title: "<fmt:message key="lesson.state"/>",
-			        content: "<p><fmt:message key="tour.lesson.state.content.1"/></p><p><fmt:message key="tour.lesson.state.content.2"/></p><p><fmt:message key="tour.lesson.state.content.3"/></p><p><fmt:message key="tour.lesson.state.content.4"/></p><p><fmt:message key="tour.lesson.state.content.5"/></p>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="lesson.state"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><p><fmt:message key="tour.lesson.state.content.1"/></p><p><fmt:message key="tour.lesson.state.content.2"/></p><p><fmt:message key="tour.lesson.state.content.3"/></p><p><fmt:message key="tour.lesson.state.content.4"/></p><p><fmt:message key="tour.lesson.state.content.5"/></p></spring:escapeBody>",
 			        placement: "right",
 			      },{  // 5
 			        element: "#tour-learner-count",
-			        title: "<fmt:message key="lesson.learners"/>",
-			        content: "<p><fmt:message key="tour.lesson.count.learners.content.1"/></p><p><fmt:message key="tour.lesson.count.learners.content.2"/></p>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="lesson.learners"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><p><fmt:message key="tour.lesson.count.learners.content.1"/></p><p><fmt:message key="tour.lesson.count.learners.content.2"/></p></spring:escapeBody>",
 			        placement: "right",
 			      },{
 			        element: "#viewLearnersButton",
-			        title: "<fmt:message key="button.view.learners"/>",
-			        content: "<fmt:message key="tour.learner.in.class.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="button.view.learners"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.learner.in.class.content"/></spring:escapeBody>",
 			        placement: "top",
 			      },{
 			        element: "#editClassButton",
-			        title: "<fmt:message key="button.edit.class"/>",
-			        content: "<fmt:message key="tour.edit.class.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="button.edit.class"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.edit.class.content"/></spring:escapeBody>",
 			        placement: "top",
 			      },{
 			        element: "#notificationButton",
-			        title: "<fmt:message key="email.notifications"/>",
-			        content: "<fmt:message key="tour.email.notifications.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="email.notifications"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.email.notifications.content"/></spring:escapeBody>",
 			        placement: "top",
 			      },{   
 			        element: "#editIntroButton",
-			        title: "<fmt:message key="label.lesson.introduction"/>",
-			        content: "<fmt:message key="tour.edit.lesson.introduction"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.lesson.introduction"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.edit.lesson.introduction"/></spring:escapeBody>",
 			        placement: "top",
 			      },{  // 10
 			        element: "#gradebookOnCompleteButton",
-			        title: "<fmt:message key="label.display.activity.scores"/>",
-			        content: "<fmt:message key="tour.display.activity.scores.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.display.activity.scores"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.display.activity.scores.content"/></spring:escapeBody>",
 			        placement: "top",
 			      },{
 			        element: "#tour-lesson-im",
-			        title: "<fmt:message key="lesson.im"/>",
-			        content: "<p><fmt:message key="tour.lesson.im.content.1"/></p><p><fmt:message key="tour.lesson.im.content.2"/></p><p><fmt:message key="tour.lesson.im.content.3"/></p><p><fmt:message key="tour.lesson.im.content.4"/></p>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="lesson.im"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><p><fmt:message key="tour.lesson.im.content.1"/></p><p><fmt:message key="tour.lesson.im.content.2"/></p><p><fmt:message key="tour.lesson.im.content.3"/></p><p><fmt:message key="tour.lesson.im.content.4"/></p></spring:escapeBody>",
 			        placement: "bottom",
 			        onShow: revealIM,
 			        onHide: hideIM
 			      },{
 			        element: "#sendProgressEmail", 
-			        title: "<fmt:message key="tour.progress.email.send.title"/>",
-			        content: "<fmt:message key="tour.progress.email.send.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.progress.email.send.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.progress.email.send.content"/></spring:escapeBody>",
 			        placement: "bottom"
 			      },{
 			        element: "#configureProgressEmail", 
-			        title: "<fmt:message key="tour.progress.email.configure.title"/>",
-			        content: "<fmt:message key="tour.progress.email.confure.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.progress.email.configure.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.progress.email.confure.content"/></spring:escapeBody>",
 			        placement: "bottom"
 			      },{ 
 			        element: "#chartDiv",
-			        title: "<fmt:message key="lesson.chart.title"/>",
-			        content: "<fmt:message key="tour.completion.chart.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="lesson.chart.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.completion.chart.content"/></spring:escapeBody>",
 			        placement: "left",
 			        onNext: switchToSequence
 			      },{   // 15
-			      	title: "<fmt:message key="tab.sequence"/>",
-			        content: "<fmt:message key="tour.tab.sequence.content"/>",
+			      	title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tab.sequence"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.tab.sequence.content"/></spring:escapeBody>",
 			        orphan: true,
 					delayOnElement:	{ delayElement: "#sequenceTopButtonsContainer", maxDelay: 2000 },
 			        onPrev: switchToLesson
 			      },{
 			        element: "#sequenceCanvas",
-			        title: "<fmt:message key="tab.sequence"/>",
-			        content: "<fmt:message key="tour.activity.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tab.sequence"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.activity.content"/></spring:escapeBody>",
 			        placement: "top",
 			        backdrop: true
 			      },{
 			        element: "#sequenceCanvas",
-			        title: "<fmt:message key="tour.move.learners.title"/>",
-			        content: "<fmt:message key="tour.move.learners.small.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.move.learners.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.move.learners.small.content"/></spring:escapeBody>",
 			        placement: "top",
 					backdrop: true
 			      },{
 			        element: "#sequenceCanvas",
-			        title: "<fmt:message key="tour.move.learners.title"/>",
-			        content: "<fmt:message key="tour.move.learners.affect.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.move.learners.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.move.learners.affect.content"/></spring:escapeBody>",
 			        placement: "top",
 			        backdrop: true
 			      },{ 
 			        element: "#sequenceCanvas",
-			        title: "<fmt:message key="tour.move.learners.title"/>",
-			        content: "<fmt:message key="tour.move.learners.large.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.move.learners.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.move.learners.large.content"/></spring:escapeBody>",
 			        placement: "top",
 			        backdrop: true
 			      },{ // 20
 			        element: "#completedLearnersContainer",
-			        title: "<fmt:message key="tour.completed.learners.title"/>",
-			        content: "<fmt:message key="tour.completed.learners.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.completed.learners.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.completed.learners.content"/></spring:escapeBody>",
 			        placement: "top",
 			        backdrop: true
 			      },{
 			        element: "#liveEditButton",
-			        title: "<fmt:message key="tour.live.edit.title"/>",
-			        content: "<fmt:message key="tour.live.edit.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.live.edit.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.live.edit.content"/></spring:escapeBody>",
 			        placement: "left"
 			      },{
 			        element: "#sequenceSearchPhrase",
-			        title: "<fmt:message key="tour.learner.search.title"/>",
-			        content: "<fmt:message key="tour.learner.search.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.learner.search.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.learner.search.content"/></spring:escapeBody>",
 					delayOnElement:	{ delayElement: "element", maxDelay: 2000 },
 			        onNext: switchToLearners,
 			        placement: "bottom"
 			      },{
-			        title: "<fmt:message key="tab.learners"/>",
-			        content: "<fmt:message key="tour.tab.learners.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tab.learners"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.tab.learners.content"/></spring:escapeBody>",
 			        orphan: true,
 					delayOnElement:	{ delayElement: "#tabLearnerControlTable", maxDelay: 2000 },
 			        onPrev: switchToSequence
 			      },{ 
 			        element: "#tabLearnersContainer",
-			        title: "<fmt:message key="tab.learners"/>",
-			        content: "<p><fmt:message key="tour.learners.progress.content.1"/></p><p><fmt:message key="tour.learners.progress.content.2"/></p><p><fmt:message key="tour.learners.progress.content.3"/></p>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tab.learners"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><p><fmt:message key="tour.learners.progress.content.1"/></p><p><fmt:message key="tour.learners.progress.content.2"/></p><p><fmt:message key="tour.learners.progress.content.3"/></p></spring:escapeBody>",
 			        placement: "top",
 			        backdrop: true,
 			      },{  // 25
 			        element: "#learnersSearchPhrase",
-			        title: "<fmt:message key="tour.learner.search.title"/>",
-			        content: "<fmt:message key="tour.learner.search.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.learner.search.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.learner.search.content"/></spring:escapeBody>",
 			        placement: "bottom",
 			      },{
 			        element: "#orderByCompletionCheckbox",
-			        title: "<fmt:message key="tour.completion.sorting.title"/>",
-			        content: "<fmt:message key="tour.completion.sorting.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.completion.sorting.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.completion.sorting.content"/></spring:escapeBody>",
 			        placement: "bottom",
 			      },{
 			        element: "#journalButton", 
-			        title: "<fmt:message key="button.journal.entries"/>",
-			        content: "<fmt:message key="tour.journal.entries.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="button.journal.entries"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.journal.entries.content"/></spring:escapeBody>",
 			        placement: "bottom",
 			      },{
 			        element: ".tour-email-button:first", 
-			        title: "<fmt:message key="label.email"/>",
-			        content: "<fmt:message key="tour.email.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.email"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.email.content"/></spring:escapeBody>",
 			        placement: "left",
 			        delayOnElement:	{ delayElement: "element", maxDelay: 2000 },
 			        onNext: switchToGradebook
 			      },{ 
 			        element: "#userView",
-			        title: "<fmt:message key="tour.gradebook.learner.grades"/>",
-			        content: "<fmt:message key="tour.gradebook.learner.grades.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.learner.grades"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.learner.grades.content"/></spring:escapeBody>",
 			        placement: "top",
 			        delayOnElement:	{ delayElement: "#gradebookTopButtonsContainer", maxDelay: 2000 },
 			        onPrev: switchToLearners
 			      },{ // 30
 			        element: "#activityView",
-			        title: "<fmt:message key="tour.gradebook.activity.grades"/>",
-			        content: "<fmt:message key="tour.gradebook.activity.grades.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.activity.grades"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.activity.grades.content"/></spring:escapeBody>",
 			        placement: "top"
 			      },{
 			        element: "#export-grades-button",
-			        title: "<fmt:message key="tour.gradebook.export.grades"/>",
-			        content: "<fmt:message key="tour.gradebook.export.grades.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.export.grades"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.export.grades.content"/></spring:escapeBody>",
 			        placement: "bottom"
 			      },{
 			        element: "#tour-release-marks",
-			        title: "<fmt:message key="tour.gradebook.release.marks"/>",
-			        content: "<fmt:message key="tour.gradebook.release.marks.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.release.marks"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.release.marks.content"/></spring:escapeBody>",
 			        placement: "bottom"
 			      },{
 			        element: "#tour-mark-chart-button",
-			        title: "<fmt:message key="tour.gradebook.show.marks.chart"/>",
-			        content: "<fmt:message key="tour.gradebook.show.marks.chart.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.show.marks.chart"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.show.marks.chart.content"/></spring:escapeBody>",
 			        placement: "bottom",
 			        onNext: showMarkChart
 			      },{  
 			        element: "#markChartDiv",
-			        title: "<fmt:message key="tour.gradebook.marks.chart"/>",
-			        content: "<fmt:message key="tour.histogram.help.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.marks.chart"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.histogram.help.content"/></spring:escapeBody>",
 			        backdrop: true,
 			        placement: "top",
 			        onNext: hideMarkChart
 			      },{ // 35
 			        element: "#tour-weight-button",
-			        title: "<fmt:message key="tour.gradebook.show.weight"/>",
-			        content: "<fmt:message key="tour.gradebook.show.weight.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.show.weight"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.show.weight.content"/></spring:escapeBody>",
 			        placement: "bottom",
 			        onPrev: showMarkChart
 			      },{
 			        element: "#tour-dates",
-			        title: "<fmt:message key="tour.gradebook.show.dates"/>",
-			        content: "<fmt:message key="tour.gradebook.show.dates.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.show.dates"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.show.dates.content"/></spring:escapeBody>",
 			        placement: "bottom",
 			        onPrev: showMarkChart
 			      },{  // 37
-					title: "<fmt:message key="tour.end.title"/>",
-			        content: "<p><fmt:message key="tour.end.content.1"/></p><p><fmt:message key="tour.end.content.2"/></p>",
+					title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.end.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><p><fmt:message key="tour.end.content.1"/></p><p><fmt:message key="tour.end.content.2"/></p></spring:escapeBody>",
 			        placement: "top",
 			        orphan: true
 			      }		     
Index: lams_monitoring/web/taglibs.jsp
===================================================================
diff -u -rdf1fa56fb8f2b8a120a20a57f8439173c1374e10 -r87c236112358ed9c229876a63816b5e14b17f2af
--- lams_monitoring/web/taglibs.jsp	(.../taglibs.jsp)	(revision df1fa56fb8f2b8a120a20a57f8439173c1374e10)
+++ lams_monitoring/web/taglibs.jsp	(.../taglibs.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
@@ -1,6 +1,7 @@
 <%@ page contentType="text/html; charset=utf-8" language="java" %>
 <%@ taglib uri="csrfguard" prefix="csrf" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
Index: lams_monitoring/web/tblmonitor/teams.jsp
===================================================================
diff -u -rf619aa5955dca265aae7744ea3319f3ec468801e -r87c236112358ed9c229876a63816b5e14b17f2af
--- lams_monitoring/web/tblmonitor/teams.jsp	(.../teams.jsp)	(revision f619aa5955dca265aae7744ea3319f3ec468801e)
+++ lams_monitoring/web/tblmonitor/teams.jsp	(.../teams.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
@@ -45,13 +45,13 @@
 					type : 'bar',
 					data : {
 						datasets : [ {
-							label: "<fmt:message key='label.ira' />",
+							label: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.ira' /></spring:escapeBody>",
 							data : summaryChartIraDataset,
 							backgroundColor : 'rgba(249, 248, 113, 0.85)'
 											  
 						},
 						{
-							label: "<fmt:message key='label.tra' />",
+							label: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.tra' /></spring:escapeBody>",
 							data : summaryChartTraDataset,
 							backgroundColor : 'rgba(1, 117, 226, 0.85)'
 											  
@@ -73,7 +73,7 @@
 									},
 									scaleLabel : {
 										display : true,
-										labelString : "<fmt:message key='label.ira.tra.correct.count'/>",
+										labelString : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.ira.tra.correct.count'/></spring:escapeBody>",
 										fontSize : 16
 									}
 								}
@@ -104,7 +104,7 @@
 			//titles
 			var groupId = link.data('group-id');
 			var groupName = $("#group-name-" + groupId).html();
-			var title = groupName + ": <fmt:message key='label.ira.tra.correct.count'/>";
+			var title = groupName + ": <spring:escapeBody javaScriptEscape='true'><fmt:message key='label.ira.tra.correct.count'/></spring:escapeBody>";
 
 			var userNames = [];
 			$(".belong-to-group-" + groupId).each(function() { 
@@ -240,7 +240,7 @@
 
 	function onChangeLeaderCallback(response){
         if (response.isSuccessful) {
-        	alert("<fmt:message key='label.leader.successfully.changed'/>");
+        	alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.leader.successfully.changed'/></spring:escapeBody>");
 			loadTab("teams");
 		} else {
 			alert("Leader was not changed.");
Index: lams_monitoring/web/timeLimit.jsp
===================================================================
diff -u -r0083f3733489a25a89db5cfa6810303c015acd8f -r87c236112358ed9c229876a63816b5e14b17f2af
--- lams_monitoring/web/timeLimit.jsp	(.../timeLimit.jsp)	(revision 0083f3733489a25a89db5cfa6810303c015acd8f)
+++ lams_monitoring/web/timeLimit.jsp	(.../timeLimit.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
@@ -370,7 +370,7 @@
 								expiredHideContainers.hide();
 							}
 						},
-						expiryText : '<span class="countdown-timeout"><fmt:message key="label.monitoring.time.limit.expired" /></span>'
+						expiryText : '<span class="countdown-timeout"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.time.limit.expired" /></spring:escapeBody>></span>'
 					});
 		} else {
 			// if counter is paused, we can not adjust time, so resume it for a moment
@@ -387,7 +387,7 @@
 	}
 
 	function timeLimitFinishNow(){
-		if (confirm('<fmt:message key="label.monitoring.time.limit.finish.now.confirm" />')) {
+		if (confirm('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.time.limit.finish.now.confirm" /></spring:escapeBody>')) {
 			updateTimeLimit('absolute', 'stop');
 		}
 	}
Index: lams_monitoring/web/timeLimit5.jsp
===================================================================
diff -u -reccd6838790a4369b6788e48fb5ae5851622fe35 -r87c236112358ed9c229876a63816b5e14b17f2af
--- lams_monitoring/web/timeLimit5.jsp	(.../timeLimit5.jsp)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
+++ lams_monitoring/web/timeLimit5.jsp	(.../timeLimit5.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
@@ -361,7 +361,7 @@
 								expiredHideContainers.hide();
 							}
 						},
-						expiryText : '<span class="countdown-timeout"><fmt:message key="label.monitoring.time.limit.expired" /></span>'
+						expiryText : '<span class="countdown-timeout"><spring:escapeBody javaScriptEscape='true'><fmt:message key="label.monitoring.time.limit.expired" /></spring:escapeBody></span>'
 					});
 		} else {
 			// if counter is paused, we can not adjust time, so resume it for a moment
@@ -378,7 +378,7 @@
 	}
 
 	function timeLimitFinishNow(){
-		showConfirm('<fmt:message key="label.monitoring.time.limit.finish.now.confirm" />', function(){
+		showConfirm('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.time.limit.finish.now.confirm" /></spring:escapeBody>', function(){
 			updateTimeLimit('absolute', 'stop');
 		});
 	}
Index: lams_monitoring/web/timer.jsp
===================================================================
diff -u -rc834a3c9964666b01df4eef7b31b6d12564c80dd -r87c236112358ed9c229876a63816b5e14b17f2af
--- lams_monitoring/web/timer.jsp	(.../timer.jsp)	(revision c834a3c9964666b01df4eef7b31b6d12564c80dd)
+++ lams_monitoring/web/timer.jsp	(.../timer.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
@@ -110,7 +110,7 @@
  						var ratioLeft = 1 - toSeconds(periods[4],periods[5],periods[6])/startNumberOfSeconds
 						NProgress.set(ratioLeft);
  					},
-					expiryText: '<span class="text-danger countdown-row-replacement-text"><fmt:message key="label.time.is.expired" /></span>',
+					expiryText: '<span class="text-danger countdown-row-replacement-text"><spring:escapeBody javaScriptEscape='true'><fmt:message key="label.time.is.expired" /></spring:escapeBody></span>',
 					onExpiry: function(periods) {
 						isCounting = false;
 						if ( playSound ) {