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);