Index: lams_gradebook/web/gradebookCourseMonitor.jsp
===================================================================
diff -u -r5ec41d4ed4459b29690d8e575899f85cf0558460 -r62aaf160878735888d077bf28fac3c1989bb8fbd
--- lams_gradebook/web/gradebookCourseMonitor.jsp	(.../gradebookCourseMonitor.jsp)	(revision 5ec41d4ed4459b29690d8e575899f85cf0558460)
+++ lams_gradebook/web/gradebookCourseMonitor.jsp	(.../gradebookCourseMonitor.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
@@ -2,7 +2,6 @@
 
 <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
@@ -11,7 +10,7 @@
 	<title><fmt:message key="gradebook.title.window.courseMonitor"/></title>
 	
 	<lams:css />
-	<link type="text/css" href="includes/css/gradebook.css" rel="stylesheet" />
+	<link type="text/css" href="<lams:LAMSURL />gradebook/includes/css/gradebook.css" rel="stylesheet" />
 	
 	<jsp:include page="includes/jsp/jqGridIncludes.jsp"></jsp:include>
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.blockUI.js"></script>	
@@ -60,7 +59,7 @@
 				autoencode:false,
 				caption: "<fmt:message key="gradebook.gridtitle.lesson.view"/>",
 			    datatype: "xml",
-			    url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getCourseGridData&view=monCourse&organisationID=${organisationID}",
+			    url: "<lams:LAMSURL />gradebook/gradebook/getCourseGridData.do?view=monCourse&organisationID=${organisationID}",
 			    height: "100%",
 			    width: jqgridWidth,
 				shrinkToFit: false,
@@ -103,12 +102,12 @@
 						 iconSet: 'fontAwesome',
 						 autoencode:false,
 					     datatype: "xml",
-					     url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getUserGridData&view=monCourse&lessonID=" + lessonID,
+					     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.do?dispatch=updateUserLessonGradebookData&lessonID=" + lessonID,
+					     cellurl: "<lams:LAMSURL />gradebook/gradebookMonitoring/updateUserLessonGradebookData.do?lessonID=" + lessonID,
 					     sortorder: "asc", 
 						 sortname: "rowName", 
 						 pager: subgrid_table_id + "_pager",
@@ -159,7 +158,7 @@
 					     	// update the lesson average mark
 					     	if (cellname == "mark") {
 					     		// Update the average activity mark
-						     	$.get("<lams:LAMSURL/>/gradebook/gradebook.do", {dispatch:"getAverageMarkForLesson", lessonID:lessonID}, function(xml) {
+						     	$.get("<lams:LAMSURL/>gradebook/gradebook/getAverageMarkForLesson.do", {lessonID:lessonID}, function(xml) {
 							    	if (xml!=null) {
 							    		jQuery("#organisationGrid").setCell(row_id, "avgMark", xml, "", "");
 							    	} 
@@ -192,7 +191,7 @@
 				autoencode:false,
 				caption: "<fmt:message key="gradebook.gridtitle.learner.view"/>",
 			    datatype: "xml",
-			    url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getUserGridData&view=listView&organisationID=${organisationID}",
+			    url: "<lams:LAMSURL />gradebook/gradebook/getUserGridData.do?view=listView&organisationID=${organisationID}",
 			    height: "100%",
 			    width: jqgridWidth,
 			    shrinkToFit: false,
@@ -227,7 +226,7 @@
 							 iconSet: 'fontAwesome',
 							 autoencode:false,
 						     datatype: "xml",
-						     url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getCourseGridData&view=monUserView&organisationID=${organisationID}&userID=" + userID,
+						     url: "<lams:LAMSURL />gradebook/gradebook/getCourseGridData.do?view=monUserView&organisationID=${organisationID}&userID=" + userID,
 						     height: "100%",
 						     autowidth:true,
 						     cmTemplate: { title: false },
@@ -313,7 +312,7 @@
 					    	 	
 					    	 	//modify cellurl setting to include lessonid
 					    	 	var lessonID = jQuery("#"+subgrid_table_id).getRowData(rowid)["id"];
-					    	 	$("#"+subgrid_table_id).setGridParam({cellurl: "<lams:LAMSURL />/gradebook/gradebookMonitoring.do?dispatch=updateUserLessonGradebookData&lessonID=" + lessonID + "&id=" + userID});
+					    	 	$("#"+subgrid_table_id).setGridParam({cellurl: "<lams:LAMSURL />gradebook/gradebookMonitoring/updateUserLessonGradebookData.do?lessonID=" + lessonID + "&id=" + userID});
 					    	 },
 						     afterSaveCell: function(rowid, cellname,value, iRow, iCol) {
 						     	
@@ -350,7 +349,7 @@
 			
 			$("#export-course-button").click(function() {
 				var areaToBlock = "export-link-area";
-				var exportExcelUrl = "<lams:WebAppURL/>/gradebookMonitoring.do?dispatch=exportExcelCourseGradebook&organisationID=${organisationID}";
+				var exportExcelUrl = "<lams:WebAppURL/>gradebookMonitoring/exportExcelCourseGradebook.do?organisationID=${organisationID}";
 				blockExportButton(areaToBlock, exportExcelUrl, languageLabelWait);
 				
 				return false;
@@ -369,7 +368,7 @@
 					var areaToBlock = "select-lessons-area";
 					var simplified = jQuery("#export-selected-simplified").prop('checked');
 					simplified = "&simplified="+simplified;
-					var exportExcelUrl = "<lams:WebAppURL/>/gradebookMonitoring.do?dispatch=exportExcelSelectedLessons"+simplified+"&organisationID=${organisationID}" + lessonIds;
+					var exportExcelUrl = "<lams:WebAppURL/>gradebookMonitoring/exportExcelSelectedLessons"+simplified+".do?organisationID=${organisationID}" + lessonIds;
 					blockExportButton(areaToBlock, exportExcelUrl, languageLabelWait);
 				}