Index: lams_monitoring/web/monitorTour.jsp
===================================================================
diff -u -r6f1fed4f14cf4217a48f7b4a0f31d77f280d542c -r87c236112358ed9c229876a63816b5e14b17f2af
--- lams_monitoring/web/monitorTour.jsp	(.../monitorTour.jsp)	(revision 6f1fed4f14cf4217a48f7b4a0f31d77f280d542c)
+++ lams_monitoring/web/monitorTour.jsp	(.../monitorTour.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
@@ -21,214 +21,214 @@
 			  name: "LAMSMonitorTour",
 		      steps: [
 		          {  // 0
-			        title: "<fmt:message key="tour.intro.title"/>",
-			        content: "<fmt:message key="tour.intro.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.intro.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.intro.content"/></spring:escapeBody>",
 			        orphan: true
 			      }, {
 			        element: "#page-tabs",
-			        title: "<fmt:message key="tour.tab.selection.title"/>",
-			        content: "<p><fmt:message key="tour.tab.selection.content.1"/></p><p><fmt:message key="tour.tab.selection.content.2"/></p><p><fmt:message key="tour.tab.selection.content.3"/></p><p><fmt:message key="tour.tab.selection.content.4"/></p><p><fmt:message key="tour.tab.selection.content.5"/></p>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.tab.selection.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><p><fmt:message key="tour.tab.selection.content.1"/></p><p><fmt:message key="tour.tab.selection.content.2"/></p><p><fmt:message key="tour.tab.selection.content.3"/></p><p><fmt:message key="tour.tab.selection.content.4"/></p><p><fmt:message key="tour.tab.selection.content.5"/></p></spring:escapeBody>",
 		        	placement: "bottom",
 			      },{
 			      	element: "#tour-refresh-button",
-			        title: "<fmt:message key="button.refresh"/>",
-			        content: "<fmt:message key="tour.tab.refresh.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="button.refresh"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.tab.refresh.content"/></spring:escapeBody>",
 		        	placement: "left",
 			      },{
 			        element: "#description",
-			        title: "<fmt:message key="summery.desc.lbl"/>",
-			        content: "<fmt:message key="tour.lesson.description"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="summery.desc.lbl"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.lesson.description"/></spring:escapeBody>",
 			        placement: "bottom",
 			      },{ 
 			        element: "#lessonStateLabel:first-child",
-			        title: "<fmt:message key="lesson.state"/>",
-			        content: "<p><fmt:message key="tour.lesson.state.content.1"/></p><p><fmt:message key="tour.lesson.state.content.2"/></p><p><fmt:message key="tour.lesson.state.content.3"/></p><p><fmt:message key="tour.lesson.state.content.4"/></p><p><fmt:message key="tour.lesson.state.content.5"/></p>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="lesson.state"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><p><fmt:message key="tour.lesson.state.content.1"/></p><p><fmt:message key="tour.lesson.state.content.2"/></p><p><fmt:message key="tour.lesson.state.content.3"/></p><p><fmt:message key="tour.lesson.state.content.4"/></p><p><fmt:message key="tour.lesson.state.content.5"/></p></spring:escapeBody>",
 			        placement: "right",
 			      },{  // 5
 			        element: "#tour-learner-count",
-			        title: "<fmt:message key="lesson.learners"/>",
-			        content: "<p><fmt:message key="tour.lesson.count.learners.content.1"/></p><p><fmt:message key="tour.lesson.count.learners.content.2"/></p>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="lesson.learners"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><p><fmt:message key="tour.lesson.count.learners.content.1"/></p><p><fmt:message key="tour.lesson.count.learners.content.2"/></p></spring:escapeBody>",
 			        placement: "right",
 			      },{
 			        element: "#viewLearnersButton",
-			        title: "<fmt:message key="button.view.learners"/>",
-			        content: "<fmt:message key="tour.learner.in.class.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="button.view.learners"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.learner.in.class.content"/></spring:escapeBody>",
 			        placement: "top",
 			      },{
 			        element: "#editClassButton",
-			        title: "<fmt:message key="button.edit.class"/>",
-			        content: "<fmt:message key="tour.edit.class.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="button.edit.class"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.edit.class.content"/></spring:escapeBody>",
 			        placement: "top",
 			      },{
 			        element: "#notificationButton",
-			        title: "<fmt:message key="email.notifications"/>",
-			        content: "<fmt:message key="tour.email.notifications.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="email.notifications"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.email.notifications.content"/></spring:escapeBody>",
 			        placement: "top",
 			      },{   
 			        element: "#editIntroButton",
-			        title: "<fmt:message key="label.lesson.introduction"/>",
-			        content: "<fmt:message key="tour.edit.lesson.introduction"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.lesson.introduction"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.edit.lesson.introduction"/></spring:escapeBody>",
 			        placement: "top",
 			      },{  // 10
 			        element: "#gradebookOnCompleteButton",
-			        title: "<fmt:message key="label.display.activity.scores"/>",
-			        content: "<fmt:message key="tour.display.activity.scores.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.display.activity.scores"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.display.activity.scores.content"/></spring:escapeBody>",
 			        placement: "top",
 			      },{
 			        element: "#tour-lesson-im",
-			        title: "<fmt:message key="lesson.im"/>",
-			        content: "<p><fmt:message key="tour.lesson.im.content.1"/></p><p><fmt:message key="tour.lesson.im.content.2"/></p><p><fmt:message key="tour.lesson.im.content.3"/></p><p><fmt:message key="tour.lesson.im.content.4"/></p>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="lesson.im"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><p><fmt:message key="tour.lesson.im.content.1"/></p><p><fmt:message key="tour.lesson.im.content.2"/></p><p><fmt:message key="tour.lesson.im.content.3"/></p><p><fmt:message key="tour.lesson.im.content.4"/></p></spring:escapeBody>",
 			        placement: "bottom",
 			        onShow: revealIM,
 			        onHide: hideIM
 			      },{
 			        element: "#sendProgressEmail", 
-			        title: "<fmt:message key="tour.progress.email.send.title"/>",
-			        content: "<fmt:message key="tour.progress.email.send.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.progress.email.send.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.progress.email.send.content"/></spring:escapeBody>",
 			        placement: "bottom"
 			      },{
 			        element: "#configureProgressEmail", 
-			        title: "<fmt:message key="tour.progress.email.configure.title"/>",
-			        content: "<fmt:message key="tour.progress.email.confure.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.progress.email.configure.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.progress.email.confure.content"/></spring:escapeBody>",
 			        placement: "bottom"
 			      },{ 
 			        element: "#chartDiv",
-			        title: "<fmt:message key="lesson.chart.title"/>",
-			        content: "<fmt:message key="tour.completion.chart.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="lesson.chart.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.completion.chart.content"/></spring:escapeBody>",
 			        placement: "left",
 			        onNext: switchToSequence
 			      },{   // 15
-			      	title: "<fmt:message key="tab.sequence"/>",
-			        content: "<fmt:message key="tour.tab.sequence.content"/>",
+			      	title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tab.sequence"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.tab.sequence.content"/></spring:escapeBody>",
 			        orphan: true,
 					delayOnElement:	{ delayElement: "#sequenceTopButtonsContainer", maxDelay: 2000 },
 			        onPrev: switchToLesson
 			      },{
 			        element: "#sequenceCanvas",
-			        title: "<fmt:message key="tab.sequence"/>",
-			        content: "<fmt:message key="tour.activity.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tab.sequence"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.activity.content"/></spring:escapeBody>",
 			        placement: "top",
 			        backdrop: true
 			      },{
 			        element: "#sequenceCanvas",
-			        title: "<fmt:message key="tour.move.learners.title"/>",
-			        content: "<fmt:message key="tour.move.learners.small.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.move.learners.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.move.learners.small.content"/></spring:escapeBody>",
 			        placement: "top",
 					backdrop: true
 			      },{
 			        element: "#sequenceCanvas",
-			        title: "<fmt:message key="tour.move.learners.title"/>",
-			        content: "<fmt:message key="tour.move.learners.affect.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.move.learners.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.move.learners.affect.content"/></spring:escapeBody>",
 			        placement: "top",
 			        backdrop: true
 			      },{ 
 			        element: "#sequenceCanvas",
-			        title: "<fmt:message key="tour.move.learners.title"/>",
-			        content: "<fmt:message key="tour.move.learners.large.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.move.learners.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.move.learners.large.content"/></spring:escapeBody>",
 			        placement: "top",
 			        backdrop: true
 			      },{ // 20
 			        element: "#completedLearnersContainer",
-			        title: "<fmt:message key="tour.completed.learners.title"/>",
-			        content: "<fmt:message key="tour.completed.learners.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.completed.learners.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.completed.learners.content"/></spring:escapeBody>",
 			        placement: "top",
 			        backdrop: true
 			      },{
 			        element: "#liveEditButton",
-			        title: "<fmt:message key="tour.live.edit.title"/>",
-			        content: "<fmt:message key="tour.live.edit.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.live.edit.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.live.edit.content"/></spring:escapeBody>",
 			        placement: "left"
 			      },{
 			        element: "#sequenceSearchPhrase",
-			        title: "<fmt:message key="tour.learner.search.title"/>",
-			        content: "<fmt:message key="tour.learner.search.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.learner.search.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.learner.search.content"/></spring:escapeBody>",
 					delayOnElement:	{ delayElement: "element", maxDelay: 2000 },
 			        onNext: switchToLearners,
 			        placement: "bottom"
 			      },{
-			        title: "<fmt:message key="tab.learners"/>",
-			        content: "<fmt:message key="tour.tab.learners.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tab.learners"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.tab.learners.content"/></spring:escapeBody>",
 			        orphan: true,
 					delayOnElement:	{ delayElement: "#tabLearnerControlTable", maxDelay: 2000 },
 			        onPrev: switchToSequence
 			      },{ 
 			        element: "#tabLearnersContainer",
-			        title: "<fmt:message key="tab.learners"/>",
-			        content: "<p><fmt:message key="tour.learners.progress.content.1"/></p><p><fmt:message key="tour.learners.progress.content.2"/></p><p><fmt:message key="tour.learners.progress.content.3"/></p>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tab.learners"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><p><fmt:message key="tour.learners.progress.content.1"/></p><p><fmt:message key="tour.learners.progress.content.2"/></p><p><fmt:message key="tour.learners.progress.content.3"/></p></spring:escapeBody>",
 			        placement: "top",
 			        backdrop: true,
 			      },{  // 25
 			        element: "#learnersSearchPhrase",
-			        title: "<fmt:message key="tour.learner.search.title"/>",
-			        content: "<fmt:message key="tour.learner.search.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.learner.search.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.learner.search.content"/></spring:escapeBody>",
 			        placement: "bottom",
 			      },{
 			        element: "#orderByCompletionCheckbox",
-			        title: "<fmt:message key="tour.completion.sorting.title"/>",
-			        content: "<fmt:message key="tour.completion.sorting.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.completion.sorting.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.completion.sorting.content"/></spring:escapeBody>",
 			        placement: "bottom",
 			      },{
 			        element: "#journalButton", 
-			        title: "<fmt:message key="button.journal.entries"/>",
-			        content: "<fmt:message key="tour.journal.entries.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="button.journal.entries"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.journal.entries.content"/></spring:escapeBody>",
 			        placement: "bottom",
 			      },{
 			        element: ".tour-email-button:first", 
-			        title: "<fmt:message key="label.email"/>",
-			        content: "<fmt:message key="tour.email.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.email"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.email.content"/></spring:escapeBody>",
 			        placement: "left",
 			        delayOnElement:	{ delayElement: "element", maxDelay: 2000 },
 			        onNext: switchToGradebook
 			      },{ 
 			        element: "#userView",
-			        title: "<fmt:message key="tour.gradebook.learner.grades"/>",
-			        content: "<fmt:message key="tour.gradebook.learner.grades.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.learner.grades"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.learner.grades.content"/></spring:escapeBody>",
 			        placement: "top",
 			        delayOnElement:	{ delayElement: "#gradebookTopButtonsContainer", maxDelay: 2000 },
 			        onPrev: switchToLearners
 			      },{ // 30
 			        element: "#activityView",
-			        title: "<fmt:message key="tour.gradebook.activity.grades"/>",
-			        content: "<fmt:message key="tour.gradebook.activity.grades.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.activity.grades"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.activity.grades.content"/></spring:escapeBody>",
 			        placement: "top"
 			      },{
 			        element: "#export-grades-button",
-			        title: "<fmt:message key="tour.gradebook.export.grades"/>",
-			        content: "<fmt:message key="tour.gradebook.export.grades.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.export.grades"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.export.grades.content"/></spring:escapeBody>",
 			        placement: "bottom"
 			      },{
 			        element: "#tour-release-marks",
-			        title: "<fmt:message key="tour.gradebook.release.marks"/>",
-			        content: "<fmt:message key="tour.gradebook.release.marks.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.release.marks"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.release.marks.content"/></spring:escapeBody>",
 			        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"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.show.marks.chart"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.show.marks.chart.content"/></spring:escapeBody>",
 			        placement: "bottom",
 			        onNext: showMarkChart
 			      },{  
 			        element: "#markChartDiv",
-			        title: "<fmt:message key="tour.gradebook.marks.chart"/>",
-			        content: "<fmt:message key="tour.histogram.help.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.marks.chart"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.histogram.help.content"/></spring:escapeBody>",
 			        backdrop: true,
 			        placement: "top",
 			        onNext: hideMarkChart
 			      },{ // 35
 			        element: "#tour-weight-button",
-			        title: "<fmt:message key="tour.gradebook.show.weight"/>",
-			        content: "<fmt:message key="tour.gradebook.show.weight.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.show.weight"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.show.weight.content"/></spring:escapeBody>",
 			        placement: "bottom",
 			        onPrev: showMarkChart
 			      },{
 			        element: "#tour-dates",
-			        title: "<fmt:message key="tour.gradebook.show.dates"/>",
-			        content: "<fmt:message key="tour.gradebook.show.dates.content"/>",
+			        title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.show.dates"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.gradebook.show.dates.content"/></spring:escapeBody>",
 			        placement: "bottom",
 			        onPrev: showMarkChart
 			      },{  // 37
-					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>",
+					title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key="tour.end.title"/></spring:escapeBody>",
+			        content: "<spring:escapeBody javaScriptEscape='true'><p><fmt:message key="tour.end.content.1"/></p><p><fmt:message key="tour.end.content.2"/></p></spring:escapeBody>",
 			        placement: "top",
 			        orphan: true
 			      }