Index: lams_gradebook/web/gradebookMonitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/web/gradebookMonitor.jsp,v
diff -u -r1.12.2.13 -r1.12.2.14
--- lams_gradebook/web/gradebookMonitor.jsp	8 May 2017 01:28:33 -0000	1.12.2.13
+++ lams_gradebook/web/gradebookMonitor.jsp	10 May 2017 07:14:33 -0000	1.12.2.14
@@ -28,25 +28,34 @@
 		var graphLoaded = false;
 
 		function toggleMarkChart() {
+			// the two methods showMarkChart and hideMarkChart are used in the Monitoring tour
 			if ( $("#markChartDiv").css("display") == "none" ) {
-				$("#markChartDiv").css("display", "block");
-				$("#markChartHidden").css("display", "none");
-				if ( ! graphLoaded ) {
-					$("#markChartBusy").css("display", "block");
-					drawHistogram('markChartDiv',
-							'<lams:LAMSURL/>/gradebook/gradebookMonitoring.do?dispatch=getMarkChartData&lessonID=${lessonDetails.lessonID}',
-							'<fmt:message key="label.marks"/>', '<fmt:message key="label.number.learners.in.mark.range"/>');
-					graphLoaded = true;
-					$("#markChartBusy").css("display", "none");
-				}
-				$("#markChartShown").css("display", "inline");
+				showMarkChart();
 			} else {
-				$("#markChartDiv").css("display", "none");
-				$("#markChartShown").css("display", "none");
-				$("#markChartHidden").css("display", "inline");
+				hideMarkChart();
 			}
 		}
 
+		function showMarkChart() {
+			$("#markChartDiv").css("display", "block");
+			$("#markChartHidden").css("display", "none");
+			if ( ! graphLoaded ) {
+				$("#markChartBusy").css("display", "block");
+				drawHistogram('markChartDiv',
+						'<lams:LAMSURL/>/gradebook/gradebookMonitoring.do?dispatch=getMarkChartData&lessonID=${lessonDetails.lessonID}',
+						'<fmt:message key="label.marks"/>', '<fmt:message key="label.number.learners.in.mark.range"/>');
+				graphLoaded = true;
+				$("#markChartBusy").css("display", "none");
+			}
+			$("#markChartShown").css("display", "inline");
+		}
+		
+		function hideMarkChart() {
+			$("#markChartDiv").css("display", "none");
+			$("#markChartShown").css("display", "none");
+			$("#markChartHidden").css("display", "inline");
+		}
+		
 		function toggleRelease() {
 			
 			var conf;
@@ -538,17 +547,20 @@
 				</a> 
 			</div>
 	 
+	 		<div id="tour-release-marks">
 			<div id="marksNotReleased" style="display:none">
 				<a href="javascript:toggleRelease()" class="${btnclass}">
 					<fmt:message key="gradebook.monitor.releasemarks.1" />&nbsp;<fmt:message key="gradebook.monitor.releasemarks.3" />
 				</a>
 			</div>
-			<div id="marksReleased" style="display:none">
+			<div id="marksReleased" style="display:none" class="tour-release-marks">
 				<a href="javascript:toggleRelease()" class="${btnclass}">
 					<fmt:message key="gradebook.monitor.releasemarks.2" />&nbsp;<fmt:message key="gradebook.monitor.releasemarks.3" />
 				</a> 
 			</div>
+			</div>
 	 	
+ 			<div id="tour-mark-chart-button">
  			<div id="markChartShown" style="display:none">
 				<a href="javascript:toggleMarkChart()" class="${btnclass}">
 					<fmt:message key="label.hide.marks.chart"/>
@@ -559,26 +571,31 @@
 					<fmt:message key="label.show.marks.chart"/>
 				</a> 
 			</div>
-
+			</div>
+			
 		<c:if test="${isInTabs}">
+			<div id="tour-dates">
 	 		<div id="datesNotShown">
 				<a class="${btnclass}" href="javascript:toggleLessonDates()"><fmt:message key="gradebook.monitor.show.dates" /></a>
 			</div>
 			<div id="datesShown" style="display:none">
 				<a class="${btnclass}" href="javascript:toggleLessonDates()"><fmt:message key="gradebook.monitor.hide.dates" /></a>
 			</div>
+			</div>
 		</c:if>
 		
 		</div> <!-- Closes buttons -->
 
 		<!-- not in tabs? go next to the help button -->
 		<c:if test="${!isInTabs}">
-	 		<div id="datesNotShown">
+			<div class="tour-dates">
+	 		<div id="datesNotShown" class="tour-dates">
 				<a class="${btnclass} pull-right btn-primary" href="javascript:toggleLessonDates()"><fmt:message key="gradebook.monitor.show.dates" /></a>
 			</div>
-			<div id="datesShown" style="display:none">
+			<div id="datesShown" style="display:none" class="tour-dates">
 				<a class="${btnclass} pull-right btn-primary" href="javascript:toggleLessonDates()"><fmt:message key="gradebook.monitor.hide.dates" /></a>
 			</div>
+			</div>
 		</c:if>
 					
 			<div class="row">
Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.66.2.32 -r1.66.2.33
--- lams_monitoring/conf/language/lams/ApplicationResources.properties	4 May 2017 04:17:54 -0000	1.66.2.32
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties	10 May 2017 07:14:23 -0000	1.66.2.33
@@ -361,6 +361,19 @@
 tour.end.tour  =End Tour
 label.tour  =Tour
 tab.gradebook = Gradebook
+tour.gradebook.learner.grades=Grades By Learner
+tour.gradebook.learner.grades.content=View each learner in the lesson and their overall mark. Click on the + to see the details for individual activities.
+tour.gradebook.activity.grades=Grades By Activity
+tour.gradebook.activity.grades.content=View the average marks for each activity. Click on the + to see the details for learners.
+tour.gradebook.export.grades=Export Grades
+tour.gradebook.export.grades.content=Download the grades in an Excel (.xlsx) spreadsheet. 
+tour.gradebook.release.marks=Release Marks
+tour.gradebook.release.marks.content=Enable/Disable the marks being shown to Learners
+tour.gradebook.show.marks.chart=Show Marks Chart
+tour.gradebook.show.marks.chart.content=Show/Hide a graph of the marks.
+tour.gradebook.show.dates=Show Dates
+tour.gradebook.show.dates.content=Show/Hide some of the date columns in the grids to make it easier to read.
+tour.gradebook.marks.chart=Marks Chart
+tour.histogram.help.content=Click on a bar in the graph and then use your mouse wheel to zoom in and out of the graph. Once you zoom in, the grey selection in the bottom graph can be dragged left or right to show a different set of marks.
 
-
 #======= End labels: Exported 352 labels for en AU =====
Index: lams_monitoring/web/monitorTour.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/monitorTour.jsp,v
diff -u -r1.1.2.4 -r1.1.2.5
--- lams_monitoring/web/monitorTour.jsp	4 May 2017 04:17:54 -0000	1.1.2.4
+++ lams_monitoring/web/monitorTour.jsp	10 May 2017 07:14:23 -0000	1.1.2.5
@@ -8,6 +8,8 @@
 			startStep = 10;
 		} else if ( selectedTabID == 3 ) {
 			startStep = 18;
+		}  else if ( selectedTabID == 4 ) {
+			startStep = 24;
 		}
 
 		tourInProgress = true;
@@ -146,15 +148,56 @@
 			        title: "<fmt:message key="label.email"/>",
 			        content: "<fmt:message key="tour.email.content"/>",
 			        placement: "left",
+			        onNext: switchToGradebook
 			      },{
+			        element: "#userView",
+			        title: "<fmt:message key="tour.gradebook.learner.grades"/>",
+			        content: "<fmt:message key="tour.gradebook.learner.grades.content"/>",
+			        placement: "top",
+			        onPrev: switchToLearners
+			      },{
+			        element: "#activityView",
+			        title: "<fmt:message key="tour.gradebook.activity.grades"/>",
+			        content: "<fmt:message key="tour.gradebook.activity.grades.content"/>",
+			        placement: "top"
+			      },{
+			        element: "#export-grades-button",
+			        title: "<fmt:message key="tour.gradebook.export.grades"/>",
+			        content: "<fmt:message key="tour.gradebook.export.grades.content"/>",
+			        placement: "bottom"
+			      },{
+			        element: "#tour-release-marks",
+			        title: "<fmt:message key="tour.gradebook.release.marks"/>",
+			        content: "<fmt:message key="tour.gradebook.release.marks.content"/>",
+			        placement: "bottom"
+			      },{
+			        element: "#tour-mark-chart-button",
+			        title: "<fmt:message key="tour.gradebook.show.marks.chart"/>",
+			        content: "<fmt:message key="tour.gradebook.show.marks.chart.content"/>",
+			        placement: "bottom",
+			        onNext: showMarkChart
+			      },{
+			        element: "#markChartDiv",
+			        title: "<fmt:message key="tour.gradebook.marks.chart"/>",
+			        content: "<fmt:message key="tour.histogram.help.content"/>",
+			        backdrop: true,
+			        placement: "top",
+			        onNext: hideMarkChart
+			      },{
+			        element: "#tour-dates",
+			        title: "<fmt:message key="tour.gradebook.show.dates"/>",
+			        content: "<fmt:message key="tour.gradebook.show.dates.content"/>",
+			        placement: "bottom",
+			        onPrev: showMarkChart
+			      },{
 					title: "<fmt:message key="tour.end.title"/>",
 			        content: "<p><fmt:message key="tour.end.content.1"/></p><p><fmt:message key="tour.end.content.2"/></p>",
 			        placement: "top",
 			        orphan: true
 			      }		     
 			    ],
 			  onEnd: tourEnd,
-			  debug: false,
+			  debug: true,
 			  backdrop: false,
 			  storage: false,
 			  template: '<div class="popover" role="tooltip"> <div class="arrow"></div> <h3 class="popover-title"></h3> <div class="popover-content"></div> <div class="popover-navigation"> <div class="btn-group"> <button class="btn btn-sm btn-default" data-role="prev">&laquo; <fmt:message key="tour.prev"/></button> <button class="btn btn-sm btn-default" data-role="next"><fmt:message key="tour.next"/> &raquo;</button> </div> <button class="btn btn-sm btn-default loffset5" onclick="openWikiHelp()"><fmt:message key="tour.more.help"/></button>  <button class="btn btn-sm btn-default" data-role="end"><fmt:message key="tour.end.tour"/></button> </div>'
@@ -195,6 +238,19 @@
 			$("#openImButton").css('display', 'none');
 		}				
 	}
+
+	// These two functions call functions from gradebook page so do not risk breaking tour if they are missing or broken
+	function showMarkChart() {
+		try{
+			showMarkChart();
+ 		} catch(e){};
+	}
+
+	function hideMarkChart() {
+		try{
+			hideMarkChart();
+ 		} catch(e){};
+	}
 	
 	function switchToLesson() {
 		actualDoSelectTab(1);
@@ -207,6 +263,13 @@
 	function switchToLearners() {
 		actualDoSelectTab(3);
 	}
+
+	function switchToGradebook() {
+		actualDoSelectTab(4);
+		var check = 0;
+		
+		"#gradebookLoading"
+	}
 	
 	function tourEnd() {
 		tourInProgress = false;