Index: lams_learning/web/lessonComplete.jsp
===================================================================
diff -u -r495d8ba0d70ac286d4e8aaa40dd390669cf59e99 -r21f82ef5c6ab672a3ad2848d330824c97b877738
--- lams_learning/web/lessonComplete.jsp	(.../lessonComplete.jsp)	(revision 495d8ba0d70ac286d4e8aaa40dd390669cf59e99)
+++ lams_learning/web/lessonComplete.jsp	(.../lessonComplete.jsp)	(revision 21f82ef5c6ab672a3ad2848d330824c97b877738)
@@ -61,7 +61,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/free.jquery.jqgrid.min.js"></script>
 	<script type="text/javascript">
 		function restartLesson(){
-			if (confirm('<fmt:message key="message.learner.progress.restart.confirm"/>')) {
+			if (confirm('<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.learner.progress.restart.confirm"/></spring:escapeBody>')) {
 				window.location.href = "<lams:WebAppURL/>learner/restartLesson.do?lessonID=${lessonID}";
 			}
 		}
@@ -103,10 +103,10 @@
 				    iconSet 		   : 'fontAwesome',
 				    autoencode		   : false,
 					colNames : [
-						'<fmt:message key="gradebook.columntitle.activity"/>',
-						'<fmt:message key="gradebook.columntitle.progress"/>',
-						'<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.averageMark"/></spring:escapeBody>',
+						'<spring:escapeBody javaScriptEscape="true"><fmt:message key="gradebook.columntitle.mark"/></spring:escapeBody>'
 					],
 				    colModel : [
 				        {
@@ -152,9 +152,9 @@
 					},
 				    loadError : function(xhr,st,err) {
 				    	$("#userGradebookGrid").clearGridData();
-				    	$.jgrid.info_dialog('<fmt:message key="error.title"/>', 
-		    					'<fmt:message key="message.lesson.finished.report.load.error"/>',
-		    					'<fmt:message key="message.lesson.finished.ok"/>');
+				    	$.jgrid.info_dialog('<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.title"/></spring:escapeBody>', 
+		    					'<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.lesson.finished.report.load.error"/></spring:escapeBody>',
+		    					'<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.lesson.finished.ok"/></spring:escapeBody>');
 				    }
 				});
 			});