Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java
===================================================================
diff -u -ra5a1078bc390357a119161f65fac513b5244298e -r0f6221b6fd1a750f6bd1b6449138b740e1490640
--- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java	(.../KumaliveAction.java)	(revision a5a1078bc390357a119161f65fac513b5244298e)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java	(.../KumaliveAction.java)	(revision 0f6221b6fd1a750f6bd1b6449138b740e1490640)
@@ -5,6 +5,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
+import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
@@ -221,6 +222,12 @@
 	response.setContentType("application/x-download");
 	response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
 
+	// set cookie that will tell JS script that export has been finished
+	String downloadTokenValue = WebUtil.readStrParam(request, "downloadTokenValue");
+	Cookie fileDownloadTokenCookie = new Cookie("fileDownloadToken", downloadTokenValue);
+	fileDownloadTokenCookie.setPath("/");
+	response.addCookie(fileDownloadTokenCookie);
+
 	ExcelUtil.createExcel(response.getOutputStream(), dataToExport, "Exported on:", true);
 
 	return null;
Index: lams_learning/web/kumalive/kumaliveReport.jsp
===================================================================
diff -u -rb192f8811079f59f7f388ca84e1952e5bdf784a0 -r0f6221b6fd1a750f6bd1b6449138b740e1490640
--- lams_learning/web/kumalive/kumaliveReport.jsp	(.../kumaliveReport.jsp)	(revision b192f8811079f59f7f388ca84e1952e5bdf784a0)
+++ lams_learning/web/kumalive/kumaliveReport.jsp	(.../kumaliveReport.jsp)	(revision 0f6221b6fd1a750f6bd1b6449138b740e1490640)
@@ -18,6 +18,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/free.jquery.jqgrid.min.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.cookie.js"></script>
 
 	<script type="text/javascript">
 		$(document).ready(function(){
@@ -55,8 +56,8 @@
 					   'title' : false
 					}
 			    ],
-			    onSelectRow  : toggleExportButtons,
-				gridComplete : toggleExportButtons,
+			    onSelectRow  : unblockExportButtons,
+				gridComplete : unblockExportButtons,
 			    loadError : function(xhr,st,err) {
 			    	$("#organisationGrid").clearGridData();
 			    	$.jgrid.info_dialog('<fmt:message key="error.title"/>', 
@@ -159,32 +160,42 @@
 		});
 
 		function exportAll(){
-			$('.exportButton').prop('disabled', true);
-			// re-enalbe after few seconds
-			setTimeout(toggleExportButtons, 3000);
-			
-			$('#downloadFrame').attr('src',
-				'<lams:LAMSURL />learning/kumalive.do?method=exportKumalives&organisationID=${param.organisationID}');
+			 blockExportButtons('<lams:LAMSURL />learning/kumalive.do?method=exportKumalives&organisationID=${param.organisationID}');
 		}
 
 		function exportSelected(){
-			$('.exportButton').prop('disabled', true);
-			// re-enalbe after few seconds
-			setTimeout(toggleExportButtons, 3000);
-			
-			$('#downloadFrame').attr('src',
-				'<lams:LAMSURL />learning/kumalive.do?method=exportKumalives&kumaliveIds='
+			 blockExportButtons('<lams:LAMSURL />learning/kumalive.do?method=exportKumalives&kumaliveIds='
 				// return an array of IDs of rows (Kumalives) selected on all pages
 				+ JSON.stringify($("#organisationGrid").jqGrid('getGridParam','selarrrow')));
 		}
 
-		function toggleExportButtons() {
+		// based on Andrey's blockexportbutton.js in Gradebook
+		function blockExportButtons( exportExcelUrl) {
+			$('.exportButton').prop('disabled', true);
+			
+			var token = new Date().getTime(); //use the current timestamp as the token value
+			
+			fileDownloadCheckTimer = window.setInterval(function () {
+				var cookieValue = $.cookie('fileDownloadToken');
+				if (cookieValue == token) {
+					// confirmation token received, unblock the buttons
+					window.clearInterval(fileDownloadCheckTimer);
+					$.cookie('fileDownloadToken', null); //clears this cookie value
+					unblockExportButtons();
+				}
+			}, 1000);
+
+
+			$('#downloadFrame').attr('src', exportExcelUrl + "&downloadTokenValue=" + token);
+		}
+
+		function unblockExportButtons() {
 			var noRecords = $("#organisationGrid").jqGrid('getGridParam','reccount') == 0;
 			$('#exportAll').prop('disabled', noRecords);
 
 			// disable "Export selected" button when no Kumalives are selected
-	    	var noRowsSelected = $(this).jqGrid('getGridParam','selarrrow') == null;
-	    	$('#exportSelected').prop('disabled', noRowsSelected);
+			var selectedRows = $(this).jqGrid('getGridParam','selarrrow');
+	    	$('#exportSelected').prop('disabled', !selectedRows || selectedRows.length == 0);
 		}
 	</script>