Index: lams_gradebook/web/gradebookCourseMonitor.jsp
===================================================================
diff -u -r4e2c39e0ea14d5a8aa406327a16425e81b1e6702 -r62aaf160878735888d077bf28fac3c1989bb8fbd
--- lams_gradebook/web/gradebookCourseMonitor.jsp	(.../gradebookCourseMonitor.jsp)	(revision 4e2c39e0ea14d5a8aa406327a16425e81b1e6702)
+++ lams_gradebook/web/gradebookCourseMonitor.jsp	(.../gradebookCourseMonitor.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
@@ -40,8 +40,8 @@
 				document.getElementById("datesShown").style.display="none";
 				document.getElementById("datesNotShown").style.display="inline";
 	        } else { 
-		        	grid.jqGrid('showCol','startDate');
-		        	grid.jqGrid('showCol','finishDate');
+		        grid.jqGrid('showCol','startDate');
+		       	grid.jqGrid('showCol','finishDate');
 				document.getElementById("datesShown").style.display="inline";
 				document.getElementById("datesNotShown").style.display="none";
 	        }
@@ -63,6 +63,7 @@
 			    height: "100%",
 			    width: jqgridWidth,
 				shrinkToFit: false,
+				cmTemplate: { title: false },
 			    sortorder: "asc", 
 			    sortname: "id", 
 			    pager: 'organisationGridPager',
@@ -87,7 +88,7 @@
 			      {name:'avgMark',index:'avgMark', sortable:true, editable:false, search:false, width:50, align:"center"}
 			    ],
 			    loadError: function(xhr,st,err) {
-			    		jQuery("#organisationGrid").clearGridData();
+			    	jQuery("#organisationGrid").clearGridData();
 			   	 	alert("<fmt:message key="gradebook.error.loaderror"/>");
 			    },
 			    subGrid: true,
@@ -104,6 +105,7 @@
 					     url: "<lams:LAMSURL />gradebook/gradebook/getUserGridData.do?view=monCourse&lessonID=" + lessonID,
 					     height: "100%",
 					     autowidth:true,
+					     cmTemplate: { title: false },
 					     cellEdit:true,
 					     cellurl: "<lams:LAMSURL />gradebook/gradebookMonitoring/updateUserLessonGradebookData.do?lessonID=" + lessonID,
 					     sortorder: "asc", 
@@ -116,11 +118,11 @@
 					     	"<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.startDate"/>", 
+					    	"<fmt:message key="gradebook.columntitle.completeDate"/>", 
 					     	"<fmt:message key="gradebook.columntitle.lessonFeedback"/>", 
-			    				"<fmt:message key="gradebook.columntitle.mark"/>",
-			    				'portraitId'
+			    			"<fmt:message key="gradebook.columntitle.mark"/>",
+			    			'portraitId'
 					     ],
 					     colModel:[
 					     	{name:'id', index:'id', sortable:false, editable:false, hidden:true, search:false, hidedlg:true},
@@ -168,15 +170,13 @@
 							fixArrowColumn(subgrid_id);
 							processLessonDateFields( lessonDatesHidden, jQuery("#"+subgrid_table_id) );
 							fixPagerInCenter(subgrid_table_id+"_pager",2);
-						 	toolTip($(".jqgrow"));	// enable tooltips for grid
 							initializePortraitPopover('<lams:LAMSURL/>');
 						 }	
 					 }).navGrid("#"+subgrid_table_id+"_pager", {edit:false,add:false,del:false,search:false})
 					jQuery("#"+subgrid_table_id).jqGrid('filterToolbar');
 
 					},
 					gridComplete: function(){
-						toolTip($(".jqgrow"));	// enable tooltips for grid
 						fixPagerInCenter('organisationGridPager', 0);
 						processLessonDateFields( lessonDatesHidden, jQuery("#organisationGrid") ); // LDEV-4289 hide dates to start
 						hideShowLessonCheckboxes(); 
@@ -195,6 +195,7 @@
 			    height: "100%",
 			    width: jqgridWidth,
 			    shrinkToFit: false,
+			    cmTemplate: { title: false },
 			    sortorder: "asc", 
 			    sortname: "rowName", 
 			    pager: 'userViewPager',
@@ -216,18 +217,19 @@
 			    },
 			    subGrid: true,
 				subGridRowExpanded: function(subgrid_id, row_id) {
-				   var subgrid_table_id;
-				   var userID = jQuery("#userView").getRowData(row_id)["id"];
-				   subgrid_table_id = subgrid_id+"_t";
-					 jQuery("#"+subgrid_id).html("<table id='"+subgrid_table_id+"' class='scroll'></table><div id='"+subgrid_table_id+"_pager' class='scroll' ></div>");
-					   	jQuery("#"+subgrid_table_id).jqGrid({
+					var subgrid_table_id;
+					var userID = jQuery("#userView").getRowData(row_id)["id"];
+					subgrid_table_id = subgrid_id+"_t";
+					jQuery("#"+subgrid_id).html("<table id='"+subgrid_table_id+"' class='scroll'></table><div id='"+subgrid_table_id+"_pager' class='scroll' ></div>");
+					jQuery("#"+subgrid_table_id).jqGrid({
 							 guiStyle: "bootstrap",
 							 iconSet: 'fontAwesome',
 							 autoencode:false,
 						     datatype: "xml",
 						     url: "<lams:LAMSURL />gradebook/gradebook/getCourseGridData.do?view=monUserView&organisationID=${organisationID}&userID=" + userID,
 						     height: "100%",
 						     autowidth:true,
+						     cmTemplate: { title: false },
 						     cellEdit:true,
 						     pager: subgrid_table_id + "_pager",
 						     rowList:[10,20,30,40,50,100],
@@ -332,16 +334,14 @@
 							 gridComplete: function(){
 								processLessonDateFields( lessonDatesHidden, jQuery("#"+subgrid_table_id) );
 								fixPagerInCenter(subgrid_table_id+"_pager",1);
-							 	toolTip($(".jqgrow"));
 							 }
-					  	}).navGrid("#"+subgrid_table_id+"_pager", {edit:false,add:false,del:false,search:false}); // applying refresh button
+					}).navGrid("#"+subgrid_table_id+"_pager", {edit:false,add:false,del:false,search:false}); // applying refresh button
 					  
-					},
-					gridComplete: function(){
-						toolTip($(".jqgrow"));  // allowing tooltips for this grid	
-						fixPagerInCenter('userViewPager',0);
-						initializePortraitPopover('<lams:LAMSURL/>');
-					}
+				},
+				gridComplete: function(){
+					fixPagerInCenter('userViewPager',0);
+					initializePortraitPopover('<lams:LAMSURL/>');
+				}
 			}).navGrid("#userViewPager", {edit:false,add:false,del:false,search:false}); // applying refresh button
 			jQuery("#userView").jqGrid('filterToolbar');