Index: lams_gradebook/web/gradebookMonitor.jsp
===================================================================
diff -u -r051ab022e4087566f23069b2299f804d791c8e49 -r5ec41d4ed4459b29690d8e575899f85cf0558460
--- lams_gradebook/web/gradebookMonitor.jsp	(.../gradebookMonitor.jsp)	(revision 051ab022e4087566f23069b2299f804d791c8e49)
+++ lams_gradebook/web/gradebookMonitor.jsp	(.../gradebookMonitor.jsp)	(revision 5ec41d4ed4459b29690d8e575899f85cf0558460)
@@ -155,6 +155,7 @@
 			    height: "100%",
 			    width: jqgridWidth,
 				shrinkToFit: false,
+				cmTemplate: { title: false },
 			    cellEdit: true,
 			    viewrecords: true,
 			    sortorder: "asc", 
@@ -164,7 +165,7 @@
 			    rowNum:10,
 				cellurl: "<lams:LAMSURL />/gradebook/gradebookMonitoring.do?dispatch=updateUserLessonGradebookData&lessonID=${lessonDetails.lessonID}",
 			    colNames:["", 
-			    	"<fmt:message key="gradebook.columntitle.name"/>", 
+			    	"<fmt:message key="gradebook.columntitle.name"/>AAAAAAAAAAA", 
 			    	"<fmt:message key="gradebook.columntitle.progress"/>", 
 			    	"<fmt:message key="gradebook.columntitle.timeTaken"/>", 
 			    	"<fmt:message key="gradebook.columntitle.startDate"/>", 
@@ -185,8 +186,8 @@
 			      {name:'portraitId', index:'portraitId', width:0, hidden: true}
 			      ],
 			    loadError: function(xhr,st,err) {
-				    	jQuery("#userView").clearGridData();
-				    	alert("<fmt:message key="gradebook.error.loaderror"/>");
+				    jQuery("#userView").clearGridData();
+				   	alert("<fmt:message key="gradebook.error.loaderror"/>");
 			    },
 			    subGrid: true,
 				subGridRowExpanded: function(subgrid_id, row_id) {
@@ -202,6 +203,7 @@
 						     url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getActivityGridData&lessonID=${lessonDetails.lessonID}&view=monUserView&userID=" + userID,
 						     height: "100%",
 						     autowidth:true,
+						     cmTemplate: { title: false },
 						     cellEdit:true,
 						     pager: subgrid_table_id + "_pager",
 						     rowList:[10,20,30,40,50,100],
@@ -230,7 +232,7 @@
 								{name:'mark', index:'mark', sortable:true, editable: true, editrules:{number:true}, width:50, align:"center" }
 						     ],
 						     loadError: function(xhr,st,err) {
-						    		jQuery("#"+subgrid_table_id).clearGridData();
+						    	jQuery("#"+subgrid_table_id).clearGridData();
 						 	 	alert("<fmt:message key="gradebook.error.loaderror"/>");
 						     },
 						     formatCell: function(rowid, cellname,value, iRow, iCol) {
@@ -302,14 +304,12 @@
 						     	alert("<fmt:message key="error.cellsave"/>");
 						     },
 							 gridComplete: function(){
-							 	toolTip($(".jqgrow"), "jqgridTooltip");
 							 	fixPagerInCenter(subgrid_table_id+"_pager", 1);
 							 }
 					  	}).navGrid("#"+subgrid_table_id+"_pager", {edit:false,add:false,del:false,search:false}); // applying refresh button
 					  
 					},
 					gridComplete: function(){
-						toolTip($(".jqgrow"), "jqgridTooltip");  // Allow tooltips for this grid	
 				   	 	initializePortraitPopover('<lams:LAMSURL/>');
 						// Load dates shown but hide straight away as all columns needed initially so that subgrid is displayed properly LDEV-4289
 						processLessonDateFields( lessonDatesHidden );
@@ -328,10 +328,11 @@
 				    height: "100%",
 				    width: jqgridWidth,
 				    shrinkToFit: false,
+				    cmTemplate: { title: false },
 				    cellEdit: true,
 				    pager: "activityViewPager",
 				    rowList:[10,20,30,40,50,100],
-				    	rowNum:10,
+				    rowNum:10,
 				    sortorder: "asc", 
 				    sortname: "activityId", 
 				    colNames:[
@@ -351,9 +352,9 @@
 				      {name:'avgMark',index:'avgMark', sortable:true, editable:false, width:50, align:"center"}
 				    ],
 				    loadError: function(xhr,st,err) {
-			    			jQuery("#activityView").clearGridData();
-			    			alert("<fmt:message key="gradebook.error.loaderror"/>");
-			    		},
+			    		jQuery("#activityView").clearGridData();
+			    		alert("<fmt:message key="gradebook.error.loaderror"/>");
+			    	},
 				    subGrid: true,
 					subGridRowExpanded: function(subgrid_id, row_id) {
 					   var subgrid_table_id;
@@ -370,6 +371,7 @@
 						     url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getUserGridData&view=monActivityView&lessonID=${lessonDetails.lessonID}&activityID=" + activityID + "&groupId=" + groupID,
 						     height: "100%",
 						     autowidth:true,
+						     cmTemplate: { title: false },
 						     cellEdit:true,
 						     cellurl: "<lams:LAMSURL />/gradebook/gradebookMonitoring.do?dispatch=updateUserActivityGradebookData&lessonID=${lessonDetails.lessonID}&view=monActivityView&activityID=" + activityID,
 						     sortorder: "asc", 
@@ -471,7 +473,6 @@
 						     	alert("<fmt:message key="error.cellsave"/>");
 						     },
 							 gridComplete: function(){
-							 	toolTip($(".jqgrow"), "jqgridTooltip");	// applying tooltips for this grid
 						   	 	initializePortraitPopover('<lams:LAMSURL/>');
 						   	 	fixPagerInCenter(subgrid_table_id+"_pager", 1);
 							 }
@@ -480,7 +481,6 @@
 
 					},
 					 gridComplete: function(){
-					 	toolTip($(".jqgrow"), "jqgridTooltip");	// enable tooltips for grid
 					 	fixPagerInCenter('activityViewPager', 0);
 					 }	 
 				}).navGrid("#activityViewPager", {edit:false,add:false,del:false,search:false}); // enable refresh button
@@ -732,10 +732,7 @@
 				<br />
 				
 				<table id="activityView" class="scroll" ></table>
-				<div id="activityViewPager" class="scroll" ></div>	
-				
-				<%-- not #tooltip as it conflicts with the learner progress tooltip --%>
-				<div class="tooltip-lg" id="jqgridTooltip"></div> 
+				<div id="activityViewPager" class="scroll" ></div>
 			</div>
 	 
 	<c:if test="not isInTabs">