Index: lams_central/web/css/defaultHTML_learner.scss
===================================================================
diff -u -ra83b0eec89979dce7415b02afdda324b14018dbb -r8a6afcdd450adc0cd87ea7dbc69cac9fb14a3fb9
--- lams_central/web/css/defaultHTML_learner.scss	(.../defaultHTML_learner.scss)	(revision a83b0eec89979dce7415b02afdda324b14018dbb)
+++ lams_central/web/css/defaultHTML_learner.scss	(.../defaultHTML_learner.scss)	(revision 8a6afcdd450adc0cd87ea7dbc69cac9fb14a3fb9)
@@ -704,6 +704,29 @@
 	font-size: medium;
 }
 
+// Tooltips used for learner progress and gradebook (large version)
+.tooltip {
+	position: absolute;
+	border: $border-thin-default;
+	background-color: $gray-light-mid;
+	padding: 3px;
+	z-index: 5;
+	width: 150px;
+	font-size: 0.9em;
+	word-wrap: break-word;
+}
+
+.tooltip-lg{
+	display: none;
+    position:absolute;
+	border: $border-thin-default;
+    background-color:$gray-light-mid;
+    padding:5px;
+    width:250px;
+    font-size: 1.1em;
+	word-wrap: break-word;
+}
+
 // Image Gallery
 .caption-heading {
 	color: $brand-primary; 
Index: lams_central/web/css/progressBar.scss
===================================================================
diff -u -ra83b0eec89979dce7415b02afdda324b14018dbb -r8a6afcdd450adc0cd87ea7dbc69cac9fb14a3fb9
--- lams_central/web/css/progressBar.scss	(.../progressBar.scss)	(revision a83b0eec89979dce7415b02afdda324b14018dbb)
+++ lams_central/web/css/progressBar.scss	(.../progressBar.scss)	(revision 8a6afcdd450adc0cd87ea7dbc69cac9fb14a3fb9)
@@ -1,17 +1,5 @@
 @import "_lams_variables.scss";
 	
-div#tooltip {
-	display: none;
-	position: absolute;
-	border: $border-thin-default;
-	background-color: $gray-light-mid;
-	padding: 3px;
-	z-index: 5;
-	width: 100px;
-	font-size: 9px;
-	word-wrap: break-word;
-}
-
 .progressBarContainer {
 	overflow: auto;
 }
Index: lams_central/web/includes/javascript/progressBar.js
===================================================================
diff -u -r76801f73be716e866e4fc8ddfa2ed8b579ea8928 -r8a6afcdd450adc0cd87ea7dbc69cac9fb14a3fb9
--- lams_central/web/includes/javascript/progressBar.js	(.../progressBar.js)	(revision 76801f73be716e866e4fc8ddfa2ed8b579ea8928)
+++ lams_central/web/includes/javascript/progressBar.js	(.../progressBar.js)	(revision 8a6afcdd450adc0cd87ea7dbc69cac9fb14a3fb9)
@@ -407,8 +407,8 @@
 				var tooltipText = '<b>' + activity.name + '</b><br />'
 						+ activity.statusTooltip;
 				// move to proper place and show
-				$('#tooltip').stop(true, true).css("left", x + 10).css("top", y + 20)
-						.html(tooltipText).delay(1000).fadeIn();
+				$('#tooltip').stop(true, true).css("left", x + 10).css("top", y + 20).css("opacity",1)
+						.html(tooltipText).delay(700).fadeIn();
 			},
 
 			mouseout = function() {
Index: lams_gradebook/web/gradebookCourseLearner.jsp
===================================================================
diff -u -r4aa4657ce84fa3953a74a6b259e3252920349b36 -r8a6afcdd450adc0cd87ea7dbc69cac9fb14a3fb9
--- lams_gradebook/web/gradebookCourseLearner.jsp	(.../gradebookCourseLearner.jsp)	(revision 4aa4657ce84fa3953a74a6b259e3252920349b36)
+++ lams_gradebook/web/gradebookCourseLearner.jsp	(.../gradebookCourseLearner.jsp)	(revision 8a6afcdd450adc0cd87ea7dbc69cac9fb14a3fb9)
@@ -180,7 +180,7 @@
  		<div>
  			<table id="organisationGrid" class="scroll"></table>
 			<div id="organisationGridPager" class="scroll"></div>
- 			<div class="tooltip" id="tooltip"></div>
+ 			<div class="tooltip-lg" id="tooltip"></div>
 		</div>
  		<div id="footer">
 		</div> <!--Closes footer-->
Index: lams_gradebook/web/gradebookCourseMonitor.jsp
===================================================================
diff -u -rc81f6bc91f57ba94de5f9631d889176668abc5af -r8a6afcdd450adc0cd87ea7dbc69cac9fb14a3fb9
--- lams_gradebook/web/gradebookCourseMonitor.jsp	(.../gradebookCourseMonitor.jsp)	(revision c81f6bc91f57ba94de5f9631d889176668abc5af)
+++ lams_gradebook/web/gradebookCourseMonitor.jsp	(.../gradebookCourseMonitor.jsp)	(revision 8a6afcdd450adc0cd87ea7dbc69cac9fb14a3fb9)
@@ -504,7 +504,7 @@
 				<table id="userView" class="scroll" ></table>
 				<div id="userViewPager" class="scroll" ></div>
 				
-				<div class="tooltip" id="tooltip"></div>
+				<div class="tooltip-lg" id="tooltip"></div>
 			</div>
 		
 		<div id="footer">
Index: lams_gradebook/web/gradebookMonitor.jsp
===================================================================
diff -u -ra6b6c417f3176619bd4c5605e1f3d485bd5634d5 -r8a6afcdd450adc0cd87ea7dbc69cac9fb14a3fb9
--- lams_gradebook/web/gradebookMonitor.jsp	(.../gradebookMonitor.jsp)	(revision a6b6c417f3176619bd4c5605e1f3d485bd5634d5)
+++ lams_gradebook/web/gradebookMonitor.jsp	(.../gradebookMonitor.jsp)	(revision 8a6afcdd450adc0cd87ea7dbc69cac9fb14a3fb9)
@@ -285,13 +285,13 @@
 						     	$.jgrid.info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="error.cellsave"/>", "<fmt:message key="label.ok"/>");
 						     },
 							 gridComplete: function(){
-							 	toolTip($(".jqgrow"));
+							 	toolTip($(".jqgrow"), "jqgridTooltip");
 							 }
 					  	}).navGrid("#"+subgrid_table_id+"_pager", {edit:false,add:false,del:false,search:false}); // applying refresh button
 					  
 					},
 					gridComplete: function(){
-						toolTip($(".jqgrow"));  // Allow tooltips for this grid	
+						toolTip($(".jqgrow"), "jqgridTooltip");  // Allow tooltips for this grid	
 						// Load dates shown but hide straight away as all columns needed initially so that subgrid is displayed properly LDEV-4289
 						processLessonDateFields( lessonDatesHidden );
 					}
@@ -455,7 +455,7 @@
 						     	$.jgrid.info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="error.cellsave"/>", "<fmt:message key="label.ok"/>");
 						     },
 							 gridComplete: function(){
-							 	toolTip($(".jqgrow"));	// applying tooltips for this grid
+							 	toolTip($(".jqgrow"), "jqgridTooltip");	// applying tooltips for this grid
 							 }
 						 }).navGrid("#"+subgrid_table_id+"_pager", {edit:false,add:false,del:false,search:false}) // applying refresh button
 						 
@@ -474,7 +474,7 @@
 						  
 					 },
 					 gridComplete: function(){
-					 	toolTip($(".jqgrow"));	// enable tooltips for grid
+					 	toolTip($(".jqgrow"), "jqgridTooltip");	// enable tooltips for grid
 					 }	 
 				}).navGrid("#activityViewPager", {edit:false,add:false,del:false,search:false}); // enable refresh button
 				
@@ -664,10 +664,9 @@
 				<table id="activityView" class="scroll" ></table>
 				<div id="activityViewPager" class="scroll" ></div>	
 				
-				<div class="tooltip" id="tooltip"></div>
-				
+				<%-- not #tooltip as it conflicts with the learner progress tooltip --%>
+				<div class="tooltip-lg" id="jqgridTooltip"></div> 
 			</div>
-				<div class="tooltip">blah</div>xxxxx
 	 
 	<c:if test="not isInTabs">
  		</div>
Index: lams_gradebook/web/includes/css/gradebook.scss
===================================================================
diff -u -ra83b0eec89979dce7415b02afdda324b14018dbb -r8a6afcdd450adc0cd87ea7dbc69cac9fb14a3fb9
--- lams_gradebook/web/includes/css/gradebook.scss	(.../gradebook.scss)	(revision a83b0eec89979dce7415b02afdda324b14018dbb)
+++ lams_gradebook/web/includes/css/gradebook.scss	(.../gradebook.scss)	(revision 8a6afcdd450adc0cd87ea7dbc69cac9fb14a3fb9)
@@ -48,15 +48,4 @@
 	margin-bottom: 10px;
 	width: 95%;
 	height: 500px;
-}
-
-.tooltip{
-    position:absolute;
-    z-index:999;
-    left:-9999px;
-    background-color:$gray-light-mid;
-    padding:5px;
-    border:$border-thin-body-bg;
-    width:250px;
-    font-size: 1.1em;
 }
\ No newline at end of file
Index: lams_gradebook/web/includes/jsp/jqGridIncludes.jsp
===================================================================
diff -u -ra83b0eec89979dce7415b02afdda324b14018dbb -r8a6afcdd450adc0cd87ea7dbc69cac9fb14a3fb9
--- lams_gradebook/web/includes/jsp/jqGridIncludes.jsp	(.../jqGridIncludes.jsp)	(revision a83b0eec89979dce7415b02afdda324b14018dbb)
+++ lams_gradebook/web/includes/jsp/jqGridIncludes.jsp	(.../jqGridIncludes.jsp)	(revision 8a6afcdd450adc0cd87ea7dbc69cac9fb14a3fb9)
@@ -69,8 +69,12 @@
 	
 	
 	// Applies tooltips to a jqgrid
-	function toolTip(gRowObject) {
-		var my_tooltip = $('#tooltip'); // Div created for tooltip
+	function toolTip(gRowObject, tooltipDiv) {
+		var my_tooltip = null; // Div created for tooltip
+		if ( tooltipDiv != undefined && tooltipDiv.length > 0 )
+			my_tooltip = $('#'+tooltipDiv);
+		else
+			my_tooltip = $('#tooltip'); 
 		gRowObject.css({ 
 			cursor: 'pointer' 
         }).mouseover(function(kmouse){ 
Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -r8714ac689fdad46746bbb7f28005ec080d1d4ba6 -r8a6afcdd450adc0cd87ea7dbc69cac9fb14a3fb9
--- lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 8714ac689fdad46746bbb7f28005ec080d1d4ba6)
+++ lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 8a6afcdd450adc0cd87ea7dbc69cac9fb14a3fb9)
@@ -848,6 +848,6 @@
 		</div>
 	</div>
 	
-	<div id="tooltip"></div>
+	<div class="tooltip" id="tooltip"></div>
 </body>
 </lams:html>