Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java,v
diff -u -r1.1.2.2.4.1 -r1.1.2.2.4.2
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java	5 Jul 2011 16:33:13 -0000	1.1.2.2.4.1
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java	7 Jul 2011 17:21:01 -0000	1.1.2.2.4.2
@@ -39,8 +39,8 @@
     // For excel export
     String firstName;
     String lastName;
+    String currentActivity;
     
-    
     public GBUserGridRowDTO() {
     }
 
@@ -134,5 +134,13 @@
     public void setLastName(String lastName) {
 	this.lastName = lastName;
     }
+    
+    public String getCurrentActivity() {
+	return currentActivity;
+    }
 
+    public void setCurrentActivity(String currentActivity) {
+	this.currentActivity = currentActivity;
+    }
+
 }
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java,v
diff -u -r1.1.2.14.2.3 -r1.1.2.14.2.4
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	5 Jul 2011 16:33:13 -0000	1.1.2.14.2.3
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	7 Jul 2011 17:21:01 -0000	1.1.2.14.2.4
@@ -315,6 +315,13 @@
 		    // Setting the status and time taken for the user's lesson
 		    LearnerProgress learnerProgress = getLearnerProgress(lesson, learner);
 		    gradebookUserDTO.setStatus(getLessonStatusStr(learnerProgress));
+		    
+		    //set current activity if available
+		    if ((learnerProgress != null) && (learnerProgress.getCurrentActivity() != null)) {
+			gradebookUserDTO.setCurrentActivity(learnerProgress.getCurrentActivity().getTitle());
+		    }
+		    
+		    //calculate time taken
 		    if (learnerProgress != null) {
 			if (learnerProgress.getStartDate() != null && learnerProgress.getFinishDate() != null) {
 			    gradebookUserDTO.setTimeTaken(learnerProgress.getFinishDate().getTime()
@@ -778,7 +785,7 @@
 		if (userRow.getStatus().contains("tick.png")) {
 		    status = getMessage("gradebook.exportcourse.ok");
 		} else if (userRow.getStatus().contains("cog.png")) {
-		    status = getMessage("gradebook.exportcourse.attempted");
+		    status = getMessage("gradebook.exportcourse.current.activity", new String[] { userRow.getCurrentActivity()});
 		} else {
 		    status = "-";
 		}
@@ -1029,7 +1036,7 @@
 		status = "<img src='" + IMAGES_DIR + "/tick.png' />";
 	    } else if (learnerProgress.getAttemptedActivities() != null
 		    && learnerProgress.getAttemptedActivities().size() > 0) {
-		status = "<img src='" + IMAGES_DIR + "/cog.png' />";
+		status = "<img src='" + IMAGES_DIR + "/cog.png' title='" + learnerProgress.getCurrentActivity().getTitle() + "' />";
 	    }
 	}
 	return status;
@@ -1048,7 +1055,7 @@
 	if (learnerProgress != null) {
 	    byte statusByte = learnerProgress.getProgressState(activity);
 	    if (statusByte == LearnerProgress.ACTIVITY_ATTEMPTED) {
-		return "<img src='" + IMAGES_DIR + "/cog.png' />";
+		return "<img src='" + IMAGES_DIR + "/cog.png' title='" + learnerProgress.getCurrentActivity().getTitle() + "' />";
 	    } else if (statusByte == LearnerProgress.ACTIVITY_COMPLETED) {
 		return "<img src='" + IMAGES_DIR + "/tick.png' />";
 	    }
@@ -1173,6 +1180,10 @@
     public String getMessage(String key) {
 	return messageService.getMessage(key);
     }
+    
+    public String getMessage(String key, Object[] args) {
+	return messageService.getMessage(key, args);
+    }
 
     // Getter and setter methods -----------------------------------------------
 
Index: lams_gradebook/web/gradebookCourseMonitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/web/gradebookCourseMonitor.jsp,v
diff -u -r1.1.2.7.4.3 -r1.1.2.7.4.4
--- lams_gradebook/web/gradebookCourseMonitor.jsp	6 Jul 2011 14:54:40 -0000	1.1.2.7.4.3
+++ lams_gradebook/web/gradebookCourseMonitor.jsp	7 Jul 2011 17:21:01 -0000	1.1.2.7.4.4
@@ -32,7 +32,7 @@
 
 	<script type="text/javascript">
 	
-		//hack found here: http://geekswithblogs.net/GruffCode/archive/2010/10/28/detecting-the-file-download-dialog-in-the-browser.aspx
+		//Detecting-the-file-download-dialog-in-the-browser: http://geekswithblogs.net/GruffCode/archive/2010/10/28/detecting-the-file-download-dialog-in-the-browser.aspx
 		var fileDownloadCheckTimer;
 		function blockExportButton() {
 		    var token = new Date().getTime(); //use the current timestamp as the token value
@@ -135,7 +135,7 @@
 					     colModel:[
 					     	{name:'id', index:'id', sortable:false, editable:false, hidden:true, search:false, hidedlg:true},
 					     	{name:'rowName',index:'rowName', sortable:true, editable:false},
-					      	{name:'status', index:'status', sortable:false, editable:false, search:false, width:50, align:"center"},
+					      	{name:'status', index:'status', sortable:false, editable:false, search:false, title:false, width:50, align:"center"},
 					      	{name:'timeTaken', index:'timeTaken', sortable:true, editable:false, search:false, width:80, align:"center"},
 					     	{name:'feedback',index:'feedback', sortable:false, editable:true, edittype:'textarea', editoptions:{rows:'4',cols:'20'} , search:false},
 					     	{name:'mark',index:'mark', sortable:true, editable:true, editrules:{number:true}, search:false, width:50, align:"center"}