Index: lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r39949b071c2cd7626b680c32af35559acdbd5c49 -rfc2765358dd2ee073be452d5c1e265a3b7e404a1
--- lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 39949b071c2cd7626b680c32af35559acdbd5c49)
+++ lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision fc2765358dd2ee073be452d5c1e265a3b7e404a1)
@@ -86,6 +86,16 @@
 gradebook.exportcourse.current.activity  =Current activity: {0}
 gradebook.gridtitle.lesson.view  =Lesson View
 gradebook.gridtitle.learner.view  =Learner View
+label.select  =Select
+label.lessons.to.export  =lessons to export.
+label.button.export  =Export
+label.lessons  =Lessons
+label.group  =Group
+label.max.possible  =Max Possible
+label.total.actuals  =Total Actuals
+label.max.mark  =Max mark
+label.actuals  =Actuals
+label.max  =Max
+label.overall.totals  =Overall Totals
 
-
 #======= End labels: Exported 80 labels for en AU =====
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
diff -u -r2fb529d1dd3dae1d2a106eb701e3594e686da8c5 -rfc2765358dd2ee073be452d5c1e265a3b7e404a1
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision 2fb529d1dd3dae1d2a106eb701e3594e686da8c5)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision fc2765358dd2ee073be452d5c1e265a3b7e404a1)
@@ -775,10 +775,10 @@
 	// Dont include lesson in list if the user doesnt have permission
 	Integer organisationToCheckPermission = (organisation.getOrganisationType().getOrganisationTypeId().equals(OrganisationType.COURSE_TYPE)) 
 		? organisation.getOrganisationId() : organisation.getParentOrganisation().getOrganisationId();
+	boolean isGroupManager = userService.isUserInRole(userId, organisationToCheckPermission, Role.GROUP_MANAGER);
 	List<Lesson> lessons = new LinkedList<Lesson>();
 	for (Lesson lesson : lessonsFromDB) {
-	    if (!(lesson.getLessonClass().isStaffMember(user) || userService.isUserInRole(userId, organisationToCheckPermission,
-		    Role.GROUP_MANAGER))) {
+	    if (!(lesson.getLessonClass().isStaffMember(user) || isGroupManager)) {
 		continue;
 	    }
 
@@ -846,7 +846,179 @@
 	dataToExport.put(getMessage("gradebook.exportcourse.course.summary"), summaryData);
 	return dataToExport;
     }
+    
+    @Override
+    public LinkedHashMap<String, ExcelCell[][]> exportSelectedLessonsGradebook(Integer userId, Integer organisationId, String[]  lessonIds) {
+	LinkedHashMap<String, ExcelCell[][]> dataToExport = new LinkedHashMap<String, ExcelCell[][]>();
+	
+	Organisation organisation = (Organisation) userService.findById(Organisation.class, organisationId);
+	
+	// The entire data list
+	List<ExcelCell[]> rowList = new LinkedList<ExcelCell[]>();
 
+	User user = (User) userService.findById(User.class, userId);
+	Set<Lesson> selectedLessons = new TreeSet<Lesson>(new LessonComparator());
+
+	// Don't include lesson in list if the user doesnt have permission
+	Integer organisationToCheckPermission = (organisation.getOrganisationType().getOrganisationTypeId().equals(OrganisationType.COURSE_TYPE)) 
+		? organisation.getOrganisationId() : organisation.getParentOrganisation().getOrganisationId();
+	boolean isGroupManager = userService.isUserInRole(userId, organisationToCheckPermission, Role.GROUP_MANAGER);
+	
+	// collect users from all lessons
+	Set<User> allLearners = new LinkedHashSet<User>();
+	Map<Long, Set<ToolActivity>> lessonActivitiesMap = new HashMap<Long, Set<ToolActivity>>();
+	List<ToolActivity> allActivities = new ArrayList<ToolActivity>();
+	
+	for (String lessonIdStr : lessonIds) {
+	    Long lessonId = Long.parseLong(lessonIdStr);
+	    Lesson lesson = lessonService.getLesson(lessonId);
+	    
+	    if (!(lesson.getLessonClass().isStaffMember(user) || isGroupManager)) {
+		continue;
+	    }
+	    
+	    selectedLessons.add(lesson);
+	    
+	    allLearners.addAll(lesson.getAllLearners());
+	    
+	    Set<ToolActivity> lessonActivities = getLessonActivities(lesson);
+	    lessonActivitiesMap.put(lesson.getLessonId(), lessonActivities);
+	    allActivities.addAll(lessonActivities);
+	}
+	
+	if (!selectedLessons.isEmpty()) {
+	    
+	    Map<Long, Long> activityToTotalMarkMap = getActivityToTotalMarkMap(allActivities);
+	    
+	    Map<Long, Map<Integer, GradebookUserActivity>> activityTouserToGradebookUserActivityMap = new HashMap<Long, Map<Integer, GradebookUserActivity>>();
+	    for (ToolActivity activity : allActivities) {
+		Map<Integer, GradebookUserActivity> userToGradebookUserActivityMap = getUserToGradebookUserActivityMap(activity);
+		activityTouserToGradebookUserActivityMap.put(activity.getActivityId(), userToGradebookUserActivityMap);
+	    }
+
+	    int numberCellsPerRow = selectedLessons.size() * 6 + allActivities.size() * 2 + 5;
+
+	    // Lesson names row----------------------
+	    ExcelCell[] lessonsNames = new ExcelCell[numberCellsPerRow];
+	    int i = 4;
+	    for (Lesson lesson : selectedLessons) {
+		Set<ToolActivity> lessonActivities = lessonActivitiesMap.get(lesson.getLessonId());
+		int numberActivities = lessonActivities.size();
+		lessonsNames[i + numberActivities] = new ExcelCell(lesson.getLessonName(), true);
+		i += 6 + numberActivities * 2;
+	    }
+	    i -= 2;
+	    lessonsNames[i++] = new ExcelCell("", ExcelCell.BORDER_STYLE_LEFT_THIN);
+	    lessonsNames[i++] = new ExcelCell(getMessage("label.overall.totals"), true);
+	    lessonsNames[i++] = new ExcelCell("", ExcelCell.BORDER_STYLE_RIGHT_THICK);
+	    
+	    rowList.add(lessonsNames);
+
+	    // Headers row----------------------
+	    ExcelCell[] headerRow = new ExcelCell[numberCellsPerRow];
+	    i = 0;
+
+	    for (Lesson lesson : selectedLessons) {
+		headerRow[i++] = new ExcelCell(getMessage("gradebook.export.last.name"), false);
+		headerRow[i++] = new ExcelCell(getMessage("gradebook.export.first.name"), false);
+		headerRow[i++] = new ExcelCell(getMessage("label.group"), false);
+
+		Set<ToolActivity> activities = lessonActivitiesMap.get(lesson.getLessonId());
+		for (Activity activity : activities) {
+		    headerRow[i++] = new ExcelCell(activity.getTitle(), true);
+		    headerRow[i++] = new ExcelCell(getMessage("label.max.possible"), false);
+		}
+		
+		headerRow[i++] = new ExcelCell(getMessage("label.total.actuals"), true, ExcelCell.BORDER_STYLE_LEFT_THIN);
+		headerRow[i++] = new ExcelCell(getMessage("label.max.mark"), false);
+		headerRow[i++] = new ExcelCell("%", ExcelCell.BORDER_STYLE_RIGHT_THICK);
+	    }
+	    i += 2;
+	    headerRow[i++] = new ExcelCell(getMessage("label.actuals"), true, ExcelCell.BORDER_STYLE_LEFT_THIN);
+	    headerRow[i++] = new ExcelCell(getMessage("label.max"), true);
+	    headerRow[i++] = new ExcelCell("%", true, ExcelCell.BORDER_STYLE_RIGHT_THICK);
+	    rowList.add(headerRow);
+
+	    // Actual data rows----------------------
+	    for (User learner : allLearners) {
+		
+		Double overallTotal = 0d;
+		Double overallMaxMark = 0d;
+		ExcelCell[] userRow = new ExcelCell[numberCellsPerRow];
+		i = 0;
+		
+		
+		for (Lesson lesson : selectedLessons) {
+
+		    Double lessonTotal = 0d;
+		    Double lessonMaxMark = 0d;
+		    Set<ToolActivity> activities = lessonActivitiesMap.get(lesson.getLessonId());
+		    
+		    userRow[i++] = new ExcelCell(learner.getFirstName().toUpperCase(), false);
+		    userRow[i++] = new ExcelCell(learner.getLastName().toUpperCase(), false);
+		    
+		    //check if learner is participating in this lesson
+		    if (!lesson.getAllLearners().contains(learner)) {
+			i += 1 + activities.size() * 2;
+			userRow[i++] = new ExcelCell("", ExcelCell.BORDER_STYLE_LEFT_THIN);
+			userRow[i++] = new ExcelCell("", false);
+			userRow[i++] = new ExcelCell("", ExcelCell.BORDER_STYLE_RIGHT_THICK);
+			continue;
+		    }
+		    
+		    //getUserGroupName
+		    String groupName = "";
+		    for (Group group : (Set<Group>)lesson.getLessonClass().getGroups()) {
+			if (group.hasLearner(learner)) {
+			    groupName = group.getGroupName();
+			    break;
+			}
+		    }
+		    userRow[i++] = new ExcelCell(groupName, false);
+
+		    for (ToolActivity activity : activities) {
+			Map<Integer, GradebookUserActivity> userToGradebookUserActivityMap = activityTouserToGradebookUserActivityMap.get(activity.getActivityId());
+			GradebookUserActivity gradebookUserActivity = userToGradebookUserActivityMap.get(learner.getUserId());
+			Double mark = 0d;
+			if (gradebookUserActivity != null) {
+			    mark = gradebookUserActivity.getMark();
+			    userRow[i++] = new ExcelCell(mark, false);
+			} else {
+			    userRow[i++] = new ExcelCell("", false);
+			}
+			
+			Long activityTotalMarks = (activityToTotalMarkMap.get(activity.getActivityId()) != null) ? activityToTotalMarkMap
+				.get(activity.getActivityId()) : 0l;
+			userRow[i++] = new ExcelCell(activityTotalMarks, false);
+		
+			lessonTotal += mark;
+			overallTotal += mark;
+			lessonMaxMark += activityTotalMarks;
+			overallMaxMark += activityTotalMarks;
+		    }
+		    
+		    userRow[i++] = new ExcelCell(lessonTotal, ExcelCell.BORDER_STYLE_LEFT_THIN);
+		    userRow[i++] = new ExcelCell(lessonMaxMark, false);
+		    Double percentage = (lessonMaxMark != 0) ? lessonTotal/lessonMaxMark : 0d;
+		    userRow[i++] = new ExcelCell(percentage, ExcelCell.BORDER_STYLE_RIGHT_THICK);
+
+		}
+		
+		i += 2;
+		userRow[i++] = new ExcelCell(overallTotal, ExcelCell.BORDER_STYLE_LEFT_THIN);
+		userRow[i++] = new ExcelCell(overallMaxMark, false);
+		Double percentage = (overallMaxMark != 0) ? overallTotal/overallMaxMark : 0d;
+		userRow[i++] = new ExcelCell(percentage, true, ExcelCell.BORDER_STYLE_RIGHT_THICK);
+
+		rowList.add(userRow);
+	    }
+	}
+	
+	ExcelCell[][] summaryData = rowList.toArray(new ExcelCell[][] {});
+	dataToExport.put(getMessage("gradebook.exportcourse.course.summary"), summaryData);
+	return dataToExport;
+    }
+
     public void updateActivityMark(Double mark, String feedback, Integer userID, Long toolSessionID,
 	    Boolean markedInGradebook) {
 	ToolSession toolSession = toolService.getToolSessionById(toolSessionID);
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
===================================================================
diff -u -r246994a59d7c4ff0dfd17290461e112bedfc6545 -rfc2765358dd2ee073be452d5c1e265a3b7e404a1
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java	(.../IGradebookService.java)	(revision 246994a59d7c4ff0dfd17290461e112bedfc6545)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java	(.../IGradebookService.java)	(revision fc2765358dd2ee073be452d5c1e265a3b7e404a1)
@@ -207,12 +207,23 @@
     LinkedHashMap<String, ExcelCell[][]> exportLessonGradebook(Lesson lesson);
     
     /**
-     * Get the summary data for course for an excel export
+     * Get the summary data for course in order to create excel export
      * 
      * @param userId
      * @param organisationId
      * @return
      */
     LinkedHashMap<String, ExcelCell[][]> exportCourseGradebook(Integer userId, Integer organisationId);
+    
+
+    /**
+     * Get the summary data for selected lessons in order to create excel export
+     * 
+     * @param userId
+     * @param organisationId
+     * @return
+     */
+    LinkedHashMap<String, ExcelCell[][]> exportSelectedLessonsGradebook(Integer userId, Integer organisationId, String[]  lessonIds);
+    
 }
  
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java
===================================================================
diff -u -r5a5f3640c4d5fdf0c302347e7d6b502a972fd9cc -rfc2765358dd2ee073be452d5c1e265a3b7e404a1
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java	(.../GradebookMonitoringAction.java)	(revision 5a5f3640c4d5fdf0c302347e7d6b502a972fd9cc)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java	(.../GradebookMonitoringAction.java)	(revision fc2765358dd2ee073be452d5c1e265a3b7e404a1)
@@ -55,6 +55,7 @@
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.springframework.util.Assert;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -369,7 +370,51 @@
 
 	return null;
     }
+    
+    /**
+     * Exports selected lessons Gradebook into excel.
+     */
+    public ActionForward exportExcelSelectedLessons(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws Exception {
 
+	initServices();
+	Integer oranisationID = WebUtil.readIntParam(request, AttributeNames.PARAM_ORGANISATION_ID);
+	User user = getRealUser(getUser());
+
+	Organisation organisation = (Organisation) userService.findById(Organisation.class, oranisationID);
+	if (organisation == null || user == null) {
+	    String errorMsg = "Organisation " + oranisationID + " does not exist or user is null. Unable to load gradebook";
+	    logger.error(errorMsg);
+	    throw new Exception(errorMsg);
+	}
+	
+	Integer organisationId = organisation.getOrganisationId();
+	logger.debug("Exporting to a spreadsheet course: " + organisationId);
+
+	String[] lessonIds = request.getParameterValues(AttributeNames.PARAM_LESSON_ID);
+	Assert.notNull(lessonIds);
+
+	LinkedHashMap<String, ExcelCell[][]> dataToExport = gradebookService.exportSelectedLessonsGradebook(user.getUserId(), organisationId, lessonIds);
+
+	String fileName = organisation.getName().replaceAll(" ", "_") + ".xlsx";
+	fileName  = FileUtil.encodeFilenameForDownload(request, fileName);
+	
+	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); 
+	
+	//Code to generate file and write file contents to response
+	ServletOutputStream out = response.getOutputStream();
+	ExcelUtil.createExcel(out, dataToExport, null, false);
+
+	return null;
+    }
+
 	private UserDTO getUser() {
 		HttpSession ss = SessionManager.getSession();
 		return (UserDTO) ss.getAttribute(AttributeNames.USER);
Index: lams_gradebook/web/gradebookCourseMonitor.jsp
===================================================================
diff -u -r5be5ad6c1aa644c0fe88023e5014b7b06e426d11 -rfc2765358dd2ee073be452d5c1e265a3b7e404a1
--- lams_gradebook/web/gradebookCourseMonitor.jsp	(.../gradebookCourseMonitor.jsp)	(revision 5be5ad6c1aa644c0fe88023e5014b7b06e426d11)
+++ lams_gradebook/web/gradebookCourseMonitor.jsp	(.../gradebookCourseMonitor.jsp)	(revision fc2765358dd2ee073be452d5c1e265a3b7e404a1)
@@ -17,10 +17,6 @@
 	<jsp:include page="includes/jsp/jqGridIncludes.jsp"></jsp:include>
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.blockUI.js"></script>	
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.cookie.js"></script>
-	<script type="text/javascript">
-		var exportExcelUrl = "<lams:WebAppURL/>/gradebookMonitoring.do?dispatch=exportExcelCourseGradebook&organisationID=${organisationID}";
-		var languageLabelWait = "<fmt:message key='gradebook.coursemonitor.wait'/>";
-	</script>
 	<script type="text/javascript" src="includes/javascript/blockexportbutton.js"></script>
 
 	<script type="text/javascript">
@@ -151,7 +147,7 @@
 					gridComplete: function(){
 						toolTip($(".jqgrow"));	// enable tooltips for grid
 					}	
-				}).navGrid("#organisationGridPager", {edit:false,add:false,del:false,search:false})
+			}).navGrid("#organisationGridPager", {edit:false,add:false,del:false,search:false})
 				
 			jQuery("#organisationGrid").navButtonAdd("#organisationGridPager",{
 				caption: "",
@@ -342,31 +338,87 @@
 					gridComplete: function(){
 						toolTip($(".jqgrow"));  // allowing tooltips for this grid	
 					}
-				}).navGrid("#userViewPager", {edit:false,add:false,del:false,search:false}); // applying refresh button
+			}).navGrid("#userViewPager", {edit:false,add:false,del:false,search:false}); // applying refresh button
 				
-				// Allowing search for this grid
-				jQuery("#userView").navButtonAdd('#userViewPager',{
-					caption: "",
-					title: "Search Names",
-					buttonimg:"<lams:LAMSURL />images/find.png", 
-					onClickButton: function(){
-						jQuery("#userView").searchGrid({
-								top:10, 
-								left:10,
-								sopt:['cn','bw','eq','ne','ew']
-							});
-						}
-				});
+			// Allowing search for this grid
+			jQuery("#userView").navButtonAdd('#userViewPager',{
+				caption: "",
+				title: "Search Names",
+				buttonimg:"<lams:LAMSURL />images/find.png", 
+				onClickButton: function(){
+					jQuery("#userView").searchGrid({
+						top:10, 
+						left:10,
+						sopt:['cn','bw','eq','ne','ew']
+					});
+				}
+			});
 				
-				// Allowing column editing for this grid
-				jQuery("#userView").navButtonAdd('#userViewPager',{
-					caption: "",
-					buttonimg:"<lams:LAMSURL />images/table_edit.png", 
-					onClickButton: function(){
-						jQuery("#userView").setColumns();
-					}
-				});
+			// Allowing column editing for this grid
+			jQuery("#userView").navButtonAdd('#userViewPager',{
+				caption: "",
+				buttonimg:"<lams:LAMSURL />images/table_edit.png", 
+				onClickButton: function(){
+					jQuery("#userView").setColumns();
+				}
+			});
+			
+			//initialize lesson list 
+			jQuery("#lessons-jqgrid").jqGrid({
+				datatype: "xml",
+			    url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getCourseGridData&view=monCourse&organisationID=${organisationID}",
+				colNames:['Id', '<fmt:message key="gradebook.columntitle.lessonName"/>'],
+				colModel:[
+					{name:'id',index:'id', width:35, sorttype:"int", hidden:true},
+				   	{name:'rowName',index:'rowName', width:225, firstsortorder:'desc', sorttype: 'text'}
+				],
+				sortname: 'id',
+				multiselect: true,
+				sortorder: "asc",
+				height:'auto',
+				ignoreCase: true
+			});
+			jQuery("#lessons-jqgrid").jqGrid('filterToolbar',{stringResult: true, searchOnEnter: true, defaultSearch: 'cn'});
+				
+			<c:forEach var="lesson" items="${lessons}" varStatus="i">
+				jQuery("#lessons-jqgrid").jqGrid('addRowData',${lesson.lessonId}, {id2:'${lesson.lessonId}',name:'${lesson.lessonName}'});
+			</c:forEach>
+
+			var languageLabelWait = "<fmt:message key='gradebook.coursemonitor.wait'/>";
+			
+			$("#export-course-button").click(function() {
+				var areaToBlock = "export-link-area";
+				var exportExcelUrl = "<lams:WebAppURL/>/gradebookMonitoring.do?dispatch=exportExcelCourseGradebook&organisationID=${organisationID}";
+				blockExportButton(areaToBlock, exportExcelUrl, languageLabelWait);
+				
+				return false;
+			});
+			
+			$("#export-selected-lessons-button").click(function() {
+				
+				var ids = jQuery("#lessons-jqgrid").getGridParam('selarrrow');
+				// if at least one lesson selceted do export
+				if(ids.length) {
+					var lessonIds = "";
+				    for (var i=0; i<ids.length; i++) {
+				    	lessonIds += "&lessonID=" + ids[i];
+				    }
+					
+					var areaToBlock = "select-lessons-area";
+					var exportExcelUrl = "<lams:WebAppURL/>/gradebookMonitoring.do?dispatch=exportExcelSelectedLessons&organisationID=${organisationID}" + lessonIds;
+					blockExportButton(areaToBlock, exportExcelUrl, languageLabelWait);
+				}
+				
+				return false;
+			});
+			
 		});
+		
+		function openSelectLessonsArea() {
+			$("#select-lessons-area").toggle("slow");
+			return false;
+		}
+
 	</script>
 
 </lams:head>
@@ -388,12 +440,25 @@
 			<br />
 			
 			<div id="export-link-area">
-				<a href="#nogo" onclick="JavaScript:blockExportButton();" >
+				<a href="#nogo" id="export-course-button">
 					<fmt:message key="gradebook.export.excel.1" />
 				</a> 
 				<fmt:message key="gradebook.export.excel.2" />
 			</div>
 			
+			<div>
+				<a href="#nogo" onclick="return openSelectLessonsArea();" >
+					<fmt:message key="label.select" />
+				</a>
+				<fmt:message key="label.lessons.to.export" />
+			</div>
+			
+			<div id="select-lessons-area" >
+				<table id="lessons-jqgrid" style="text-align: center;"></table>
+				
+				<input class="button" type="button" value="<fmt:message key="label.button.export"/>" id="export-selected-lessons-button" />			
+			</div>
+			
 			<div class="grid-holder">
 				<table id="organisationGrid" class="scroll"></table>
 				<div id="organisationGridPager" class="scroll"></div>
Index: lams_gradebook/web/gradebookMonitor.jsp
===================================================================
diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -rfc2765358dd2ee073be452d5c1e265a3b7e404a1
--- lams_gradebook/web/gradebookMonitor.jsp	(.../gradebookMonitor.jsp)	(revision 35a0e719d061c08b52e705135bb2f2126079ed21)
+++ lams_gradebook/web/gradebookMonitor.jsp	(.../gradebookMonitor.jsp)	(revision fc2765358dd2ee073be452d5c1e265a3b7e404a1)
@@ -16,10 +16,6 @@
 	<jsp:include page="includes/jsp/jqGridIncludes.jsp"></jsp:include>
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.blockUI.js"></script>	
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.cookie.js"></script>
-	<script type="text/javascript">
-		var exportExcelUrl = "<lams:WebAppURL/>/gradebookMonitoring.do?dispatch=exportExcelLessonGradebook&lessonID=${lessonDetails.lessonID}";
-		var languageLabelWait = "<fmt:message key='gradebook.coursemonitor.wait'/>";
-	</script>
 	<script type="text/javascript" src="includes/javascript/blockexportbutton.js"></script>
 	
 	<script type="text/javascript">
@@ -441,6 +437,16 @@
 						jQuery("#activityView").setColumns();
 					}
 				});
+				
+				$("#export-grades-button").click(function() {
+					
+					var areaToBlock = "export-link-area";
+					var exportExcelUrl = "<lams:WebAppURL/>/gradebookMonitoring.do?dispatch=exportExcelLessonGradebook&lessonID=${lessonDetails.lessonID}";
+					var languageLabelWait = "<fmt:message key='gradebook.coursemonitor.wait'/>";
+					blockExportButton(areaToBlock, exportExcelUrl, languageLabelWait);
+					
+					return false;
+				});
 		});
 	</script>
 	
@@ -472,7 +478,7 @@
 			</div>
 			
 			<div id="export-link-area">
-				<a href="#nogo" onclick="JavaScript:blockExportButton();" >
+				<a href="#nogo" id="export-grades-button">
 					<fmt:message key="gradebook.export.excel.1" />
 				</a> 
 				<fmt:message key="gradebook.export.excel.2" />
Index: lams_gradebook/web/includes/css/gradebook.css
===================================================================
diff -u -rd9a8907ef60b47f5dbe1c024a93cb44c3e0a4174 -rfc2765358dd2ee073be452d5c1e265a3b7e404a1
--- lams_gradebook/web/includes/css/gradebook.css	(.../gradebook.css)	(revision d9a8907ef60b47f5dbe1c024a93cb44c3e0a4174)
+++ lams_gradebook/web/includes/css/gradebook.css	(.../gradebook.css)	(revision fc2765358dd2ee073be452d5c1e265a3b7e404a1)
@@ -10,6 +10,27 @@
 	padding:20px 25px;
 }
 		
-#export-link-area {padding-bottom: 20px;}
+#export-link-area {
+	padding-bottom: 20px;
+}
 
-.grid-holder {width: 700px; margin-left: 10px; margin-right: 10px;}
\ No newline at end of file
+#select-lessons-area {
+	display: none;
+	padding-top: 10px;
+}
+
+#export-selected-lessons-button {
+	margin-left: 200px;
+	margin-bottom: 10px;
+}
+
+.grid-holder {
+	width: 700px; 
+	margin-left: 10px; 
+	margin-right: 10px; 
+	margin-top: 20px;
+}
+
+#gbox_lessons-jqgrid {
+    margin: 15px auto 25px auto;
+}
\ No newline at end of file
Index: lams_gradebook/web/includes/javascript/blockexportbutton.js
===================================================================
diff -u -rd9a8907ef60b47f5dbe1c024a93cb44c3e0a4174 -rfc2765358dd2ee073be452d5c1e265a3b7e404a1
--- lams_gradebook/web/includes/javascript/blockexportbutton.js	(.../blockexportbutton.js)	(revision d9a8907ef60b47f5dbe1c024a93cb44c3e0a4174)
+++ lams_gradebook/web/includes/javascript/blockexportbutton.js	(.../blockexportbutton.js)	(revision fc2765358dd2ee073be452d5c1e265a3b7e404a1)
@@ -1,40 +1,37 @@
-//In order to use this script define exportExcelUrl and languageLabelWait variables first.
+//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;
 
-//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
+function blockExportButton(areaToBlock, exportExcelUrl, labelWait) {
+	var token = new Date().getTime(); //use the current timestamp as the token value
 		    
-			$('#export-link-area').block({
-		    	message: '<h1 style="color:#fff";>' + languageLabelWait + '</h1>',
-		    	baseZ: 1000000,
-		    	fadeIn:  0, 
-			    css: { 
-		        	border: 'none', 
-		        	padding: '3px', 
-		        	backgroundColor: '#000', 
-		        	'-webkit-border-radius': '10px', 
-		        	'-moz-border-radius': '10px', 
-		        	opacity: .8 
-		    	},
-		    	overlayCSS: {
-			    	opacity: 0
-		    	}
-	        });
-		    
-		    fileDownloadCheckTimer = window.setInterval(function () {
-		    	var cookieValue = $.cookie('fileDownloadToken');
-		    	if (cookieValue == token) {
-		    		unBlockExportButton();
-		    	}
-		    }, 1000);
-			
-		    document.location.href = exportExcelUrl + "&downloadTokenValue=" + token;
-			return false;
+	$('#' + areaToBlock).block({
+		message: '<h1 style="color:#fff";>' + labelWait + '</h1>',
+		baseZ: 1000000,
+		fadeIn:  0, 
+		css: { 
+			border: 'none', 
+		    padding: $('#' + areaToBlock).height()/2 + 'px', 
+		    backgroundColor: '#000', 
+		    '-webkit-border-radius': '10px', 
+		    '-moz-border-radius': '10px', 
+		    opacity: .98 
+		},
+		overlayCSS: {
+			opacity: 0
 		}
-		
-		function unBlockExportButton() {
+	});
+		    
+	fileDownloadCheckTimer = window.setInterval(function () {
+		var cookieValue = $.cookie('fileDownloadToken');
+		if (cookieValue == token) {
+		    //unBlock export button
 			window.clearInterval(fileDownloadCheckTimer);
 			$.cookie('fileDownloadToken', null); //clears this cookie value
-			$('#export-link-area').unblock();
-		}
\ No newline at end of file
+			$('#' + areaToBlock).unblock();
+		}
+	}, 1000);
+			
+	document.location.href = exportExcelUrl + "&downloadTokenValue=" + token;
+	return false;
+}
\ No newline at end of file
Index: lams_gradebook/web/includes/jsp/jqGridIncludes.jsp
===================================================================
diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -rfc2765358dd2ee073be452d5c1e265a3b7e404a1
--- lams_gradebook/web/includes/jsp/jqGridIncludes.jsp	(.../jqGridIncludes.jsp)	(revision 35a0e719d061c08b52e705135bb2f2126079ed21)
+++ lams_gradebook/web/includes/jsp/jqGridIncludes.jsp	(.../jqGridIncludes.jsp)	(revision fc2765358dd2ee073be452d5c1e265a3b7e404a1)
@@ -66,7 +66,7 @@
 	};
 	
 	// setcolumns module
-	$.jgrid.col ={
+	$.jgrid.col = {
 	    caption: "<fmt:message key="gradebook.function.window.showColumns"/>",
 	    bSubmit: "<fmt:message key="label.ok"/>",
 	    bCancel: "<fmt:message key="label.cancel"/>"
@@ -163,8 +163,7 @@
 	 	return strTagStrippedText;
 	}
 	
-	function trim(str)
-	{
+	function trim(str) {
 		str = str.replace(/^\s+|\s+$/g, '');
 		return str;
 	}