Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r8dc1d75924ecfcc0742ba8f8fff00b22f656a284 -r20f8f4f0d64597b2c74bab1335efd1cf88281da6
--- lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8dc1d75924ecfcc0742ba8f8fff00b22f656a284)
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 20f8f4f0d64597b2c74bab1335efd1cf88281da6)
@@ -309,11 +309,10 @@
 tour.intro.title  =Monitor Tour
 tour.intro.content  =This short tour will show you the features of the LAMS Monitoring screen. You can stop the tour at any time by clicking End Tour, and restart it again by clicking on the Tour button.
 tour.end.title  =End Of Tour
-tour.end.content  =Thank you for taking the tour. To restart the tour, click the Tour button again. Remember you can get more help on Monitoring by clicking the Help button on each tab.
+tour.end.content  =<p>Thank you for taking the tour. To restart the tour, click the Tour button again.</p><p>For further help, click on the <strong>More</strong> button below.</p>
 tour.tab.selection.title=Tab Selection
 tour.tab.selection.content=<p>Monitoring is broken into three areas, accessed by these titles at the top of the page.</p><p><strong>Lesson</strong> gives the overall lesson details.</p><p><strong>Sequence</strong> gives an overview of the lesson sequence and is used to access the activities within the lesson.</p><p><strong>Learners</strong> shows the details about each learner.</p>
 tour.tab.refresh.content=Updates the screen.
-tour.help.content=Additional help may be accessed using the Help button.
 tour.lesson.state.content=<p>Click on the current status to change the status. The lesson can be Started, Suspended, Archived or Removed.</p></p><strong>Started</strong> or Activated lessons are available for learners to participate in.</p></p><strong>Suspended</strong> or Disabled lessons are lessons that have been disabled by a monitor. Learners cannot see but not access disabled lessons. Learners currently in the lesson (with a learner window open) can progress through the lesson.</p><p><strong>Archived</strong> lessons do not appear on learner's main screen, but are available for Monitors to view.</p><p><strong>Removed</strong> lessons are removed altogether and cannot be retrieved.</p>
 tour.lesson.count.learners.content=<p>This area shows the number of learners who have started the sequence so far, and the total number of learners who are able to access the sequence.</p><p>Note that this does NOT indicate the number of learners online at this moment, but rather how many learners have joined the sequence since it was started.</p>
 tour.learner.in.class.content=<p>Display the learners in the class. From the resulting learner list you can email a particular learner.</p>
@@ -340,5 +339,8 @@
 tour.journal.entries.content=<p>View the entries in the learner's journal. These are entries are made in Learner, using the <strong>Save to Journal</strong> option in the <strong>Notebook</strong>.</p>
 tour.email.content=<p>Send an email to a particular learner.</p>
 tour.this.is.disabled=This function is disabled while the tour is running.
-
+tour.prev=Prev
+tour.next=Next
+tour.more.help=More
+tour.end.tour=End Tour
 #======= End labels: Exported 299 labels for en AU =====
Index: lams_monitoring/web/css/monitorLesson.css
===================================================================
diff -u -rcf50417b5cb818e1ae0fa9efcb0378e6104b17b8 -r20f8f4f0d64597b2c74bab1335efd1cf88281da6
--- lams_monitoring/web/css/monitorLesson.css	(.../monitorLesson.css)	(revision cf50417b5cb818e1ae0fa9efcb0378e6104b17b8)
+++ lams_monitoring/web/css/monitorLesson.css	(.../monitorLesson.css)	(revision 20f8f4f0d64597b2c74bab1335efd1cf88281da6)
@@ -163,6 +163,11 @@
 	margin: 5px 5px 5px 0;
 }
 
+.topButtonsContainer button {
+	float: right;
+	margin: 5px 5px 5px 0;
+}
+
 .lessonManageField {
 	margin-right: 5px;
 }
Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -r8dc1d75924ecfcc0742ba8f8fff00b22f656a284 -r20f8f4f0d64597b2c74bab1335efd1cf88281da6
--- lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 8dc1d75924ecfcc0742ba8f8fff00b22f656a284)
+++ lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 20f8f4f0d64597b2c74bab1335efd1cf88281da6)
@@ -240,13 +240,9 @@
 				<lams:TabBody id="1" titleKey="label.basic">
 					<div class="row">
 						<div class="col-xs-12">
-							<a id="tour-help-button" target="_blank" class="btn btn-sm btn-default pull-right" title="<fmt:message key='button.help.tooltip'/>"
-							   href="http://wiki.lamsfoundation.org/display/lamsdocs/monitoringlesson">
-							<i class="fa fa-question-circle"></i> <span class="hidden-xs"><fmt:message key="button.help"/></span></a>
+							<button onclick="javascript:startTour();return false;" class="btn btn-sm btn-default pull-right roffset10 tour-button"> 
+							<i class="fa fa-question-circle"></i> <span class="hidden-xs"><fmt:message key="label.tour"/></span></button>
 							
-							<a href="javascript:;" onclick="javascript:startTour();" class="btn btn-sm btn-default pull-right roffset10"> 
-							<i class="fa fa-question-circle"></i> <span class="hidden-xs"><fmt:message key="label.tour"/></span></a>
-							
 							<a id="tour-refresh-button" class="btn btn-sm btn-default pull-right roffset10" title="<fmt:message key='button.refresh.tooltip'/>"
 							   href="#" onClick="javascript:refreshMonitor('lesson')">
 							<i class="fa fa-refresh"></i> <span class="hidden-xs"><fmt:message key="button.refresh"/></span></a>				
@@ -441,10 +437,9 @@
 				</lams:TabBody>
 				<lams:TabBody id="2" titleKey="label.advanced">
 					<div id="sequenceTopButtonsContainer" class="topButtonsContainer">
-						<a id="helpButton" target="_blank" class="btn btn-sm btn-default" title="<fmt:message key='button.help.tooltip'/>"
-						   href="http://wiki.lamsfoundation.org/display/lamsdocs/monitoringsequence">
-							<i class="fa fa-question-circle"></i> <span class="hidden-xs"><fmt:message key="button.help"/></span>
-						</a>
+						<button onclick="javascript:startTour();return false;" class="btn btn-sm btn-default pull-right roffset10 tour-button"> 
+						<i class="fa fa-question-circle"></i> <span class="hidden-xs"><fmt:message key="label.tour"/></span></button>
+
 						<a id="refreshButton" class="btn btn-sm btn-default" title="<fmt:message key='button.refresh.tooltip'/>"
 						   href="#" onClick="javascript:refreshMonitor('sequence')">
 							<i class="fa fa-refresh"></i> <span class="hidden-xs"><fmt:message key="button.refresh"/></span>
@@ -511,9 +506,9 @@
 									   onChange="javascript:loadLearnerProgressPage()" />
 							</td>
 							<td class="topButtonsContainer">
-								<a target="_blank" class="btn btn-sm btn-default" title="<fmt:message key='button.help.tooltip'/>"
-						   		   href="http://wiki.lamsfoundation.org/display/lamsdocs/monitoringlearners">
-						   		   <i class="fa fa-question-circle"></i> <span class="hidden-xs"><fmt:message key="button.help"/></span></a>
+								<button onclick="javascript:startTour();return false;" class="btn btn-sm btn-default pull-right roffset10 tour-button"> 
+								<i class="fa fa-question-circle"></i> <span class="hidden-xs"><fmt:message key="label.tour"/></span></button>
+							
 								<a class="btn btn-sm btn-default" title="<fmt:message key='button.refresh.tooltip'/>"
 								   href="#" onClick="javascript:refreshMonitor('learners')">
 								   <i class="fa fa-refresh"></i> <span class="hidden-xs"><fmt:message key="button.refresh"/></span></a>
Index: lams_monitoring/web/monitorTour.jsp
===================================================================
diff -u -r8dc1d75924ecfcc0742ba8f8fff00b22f656a284 -r20f8f4f0d64597b2c74bab1335efd1cf88281da6
--- lams_monitoring/web/monitorTour.jsp	(.../monitorTour.jsp)	(revision 8dc1d75924ecfcc0742ba8f8fff00b22f656a284)
+++ lams_monitoring/web/monitorTour.jsp	(.../monitorTour.jsp)	(revision 20f8f4f0d64597b2c74bab1335efd1cf88281da6)
@@ -1,8 +1,18 @@
 	<%--  The definition of Bootstrap Tour for monitor.jsp. Use storage: false so that it always starts at the first step otherwise the multiple tabs confuses matters. --%>
 	var tour = null;
 	function startTour() {
-	debugger;
+
+		var selectedTabID = getCurrentTabID();
+		var startStep = 0;
+		if ( selectedTabID == 2 ) {
+			startStep = 10;
+		} else if ( selectedTabID == 3 ) {
+			startStep = 18;
+		}
+
 		tourInProgress = true;
+		$('.tour-button').prop('disabled', true);
+
 		if ( tour == null ) {
 			tour = new Tour({
 			  name: "LAMSMonitorTour",
@@ -20,11 +30,6 @@
 			      	element: "#tour-refresh-button",
 			        title: "<fmt:message key="button.refresh"/>",
 			        content: "<fmt:message key="tour.tab.refresh.content"/>",
-		        	placement: "bottom",
-			      }, {
-			      	element: "#tour-help-button",
-			        title: "<fmt:message key="button.help"/>",
-			        content: "<fmt:message key="tour.help.content"/>",
 		        	placement: "left",
 			      },{
 			        element: "#lessonStateLabel:first-child",
@@ -62,7 +67,7 @@
 			        element: "#chartDiv",
 			        title: "<fmt:message key="lesson.chart.title"/>",
 			        content: "<fmt:message key="tour.completion.chart.content"/>",
-			        placement: "bottom",
+			        placement: "left",
 			        onNext: switchToSequence
 			      },{
 			      	title: "<fmt:message key="tab.sequence"/>",
@@ -108,7 +113,7 @@
 			        element: "#liveEditButton",
 			        title: "<fmt:message key="tour.live.edit.title"/>",
 			        content: "<fmt:message key="tour.live.edit.content"/>",
-			        placement: "bottom",
+			        placement: "left",
 			        onNext: switchToLearners
 			      },{
 			        title: "<fmt:message key="tab.learners"/>",
@@ -149,9 +154,11 @@
 			      }		     
 			    ],
 			  onEnd: tourEnd,
-			  debug: true,
+			  debug: false,
 			  backdrop: false,
-			  storage: 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>'
+			  
 			});
 
 		    tour.init();
@@ -160,6 +167,7 @@
 		} else {
 			tour.restart();
 		}
+		tour.goTo(startStep);
 	}
 	
  	function revealIM(tour) { 
@@ -202,4 +210,16 @@
 	
 	function tourEnd() {
 		tourInProgress = false;
+		$('.tour-button').prop('disabled', false);
+	}
+	
+	function openWikiHelp() {
+		var selectedTabID = getCurrentTabID();
+		var url = "http://wiki.lamsfoundation.org/display/lamsdocs/monitoringlesson";
+		if ( selectedTabID == 2 ) {
+			url = "http://wiki.lamsfoundation.org/display/lamsdocs/monitoringsequence";
+		} else if ( selectedTabID == 3 ) {
+			url = "http://wiki.lamsfoundation.org/display/lamsdocs/monitoringlearners";
+		}
+		openPopUp(url,'<fmt:message key="button.help"/>', 648, 1152, false);
 	}
\ No newline at end of file