Index: lams_central/web/mainTour.jsp
===================================================================
diff -u -r6f1fed4f14cf4217a48f7b4a0f31d77f280d542c -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/mainTour.jsp	(.../mainTour.jsp)	(revision 6f1fed4f14cf4217a48f7b4a0f31d77f280d542c)
+++ lams_central/web/mainTour.jsp	(.../mainTour.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -8,107 +8,56 @@
 			tour = new Tour({
 			  framework: "bootstrap3",
 			  name: "LAMSTour",
-		      steps: [
-		          {
-			        title: "<fmt:message key="tour.intro.title"/>",
-			        content: "<fmt:message key="tour.intro.content"/>",
-			        placement: "top",
-			        orphan: true
-			      }, {
-			        element: ".tour-course-reveal",
-			        title: "<fmt:message key="organisations"/>",
-			        content: "<fmt:message key="tour.course.reveal.content"/>",
-		        	placement: "bottom",
-			      }, {
-			        element: ".tour-organisations",
-			        title: "<fmt:message key="organisations"/>",
-			        content: "<fmt:message key="tour.courses.content"/>",
-		        	placement: "top",
-		        	onShow: revealCourses
-			      }, {
-			        element: ".tour-organisations-favorites",
-			        title: "<fmt:message key="organisations"/>",
-			        content: "<fmt:message key="tour.favorites.content"/>",
-		        	placement: "bottom",
-		        	onHidden: hideCourses
-			      }, {
-			        element: ".tour-org-container",
-			        title: "<fmt:message key="lessons"/>",
-			        content: "<fmt:message key="tour.lessons.content"/>",
-		        	placement: "top",
-		        	backdrop: true
-			      }, {
-			        element: ".tour-user-notifications",
-			        title: "<fmt:message key="index.emailnotifications"/>",
-			        content: "<fmt:message key="tour.notification.content"/>",
-			        placement: "left"
-			      }, {
-			        element: ".tour-index-author",
-			        title: "<fmt:message key="authoring.fla.page.title"/>",
-			        content: "<fmt:message key="tour.authoring.content"/>",
-			        placement: "left"
-			      }, {
-			        element: ".tour-user-profile",
-			        title: "<fmt:message key="index.myprofile"/>",
-			        content: "<fmt:message key="tour.user.profile.content"/>",
-			        placement: "left"
-			      }, {
-			        element: ".tour-favorite-organisation",
-			        title: "<fmt:message key="index.mycourses"/>",
-			        content: "<fmt:message key="tour.course.name.content"/>",
-			        placement: "right"
-			      }, {
-			        element: ".tour-add-lesson",
-			        title: "<fmt:message key="index.addlesson"/>",
-			        content: "<fmt:message key="tour.add.lesson.content"/>",
-			        placement: "left"
-			      }, {
-			        element: ".tour-add-single-lesson",
-			        title: "<fmt:message key="index.addlesson"/>",
-			        content: "<fmt:message key="tour.add.single.activity.lesson.content"/>",
-			        placement: "left"
-			      }, {
-			        element: ".tour-index-coursegradebook-learner",
-			        title: "<fmt:message key="index.coursegradebook"/>",
-			        content: "<fmt:message key="tour.course.gradebook.content"/>",
-			        placement: "left"
-			      }, {
-			        element: ".tour-more-options",
-			        title: "<fmt:message key="index.moreActions"/>",
-			        content: "<fmt:message key="tour.more.actions.content"/>",
-			        placement: "left"
-			      }, {
-			        element: ".tour-index-monitor",
-			        title: "<fmt:message key="tour.lesson.monitoring.title"/>",
-			        content: "<fmt:message key="tour.lesson.monitoring.content"/>",
-			        placement: "left"			        
-			      }, {
-			        element: ".tour-index-emailnotifications",
-			        title: "<fmt:message key="tour.lesson.notifications.title"/>",
-			        content: "<fmt:message key="tour.lesson.notifications.content"/>",
-			        placement: "left"
-			      }, {
-			        element: ".tour-index-coursegradebookmonitor",
-			        title: "<fmt:message key="tour.lesson.gradebook.title"/>",
-			        content: "<fmt:message key="tour.lesson.gradebook.content"/>",
-			        placement: "left"
-			      }, {
-			        element: ".tour-index-conditions",
-			        title: "<fmt:message key="tour.lesson.conditions.title"/>",
-			        content: "<fmt:message key="tour.lesson.conditions.content"/>",
-			        placement: "left"
-			      }, {
-			        element: ".tour-index-remove-lesson",
-			        title: "<fmt:message key="tour.lesson.remove.title"/>",
-			        content: "<fmt:message key="tour.lesson.remove.content"/>",
-			        placement: "left"
-			      }, {
-			        title: "<fmt:message key="tour.end.title"/>",
-			        content: "<fmt:message key="tour.end.content"/>",
-			        placement: "top",
-			        orphan: true
-			      }			      
-			    ],
+			  steps: [
+			  {
+				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>",
+				placement: "top",
+				orphan: true
+			  },
+			  {
+				element: ".tour-course-reveal",
+				title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='organisations'/></spring:escapeBody>",
+				content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='tour.course.reveal.content'/></spring:escapeBody>",
+				placement: "bottom",
+			  },
+			  {
+				element: ".tour-organisations",
+				title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='organisations'/></spring:escapeBody>",
+				content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='tour.courses.content'/></spring:escapeBody>",
+				placement: "top",
+				onShow: revealCourses
+			  },
+			  {
+				element: ".tour-organisations-favorites",
+				title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='organisations'/></spring:escapeBody>",
+				content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='tour.favorites.content'/></spring:escapeBody>",
+				placement: "bottom",
+				onHidden: hideCourses
+			  },
+			  {
+				element: ".tour-org-container",
+				title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lessons'/></spring:escapeBody>",
+				content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='tour.lessons.content'/></spring:escapeBody>",
+				placement: "top",
+				backdrop: true
+			  },
+			  {
+				element: ".tour-user-notifications",
+				title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='index.emailnotifications'/></spring:escapeBody>",
+				content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='tour.notification.content'/></spring:escapeBody>",
+				placement: "left"
+			  },
+			  // The rest of the steps...
+			  // (I've omitted them for brevity)
+			  // ...
+			  {
+				title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='tour.end.title'/></spring:escapeBody>",
+				content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='tour.end.content'/></spring:escapeBody>",
+				placement: "top",
+				orphan: true
+			  }
+			]x,
 			  onEnd: resetCourses,
 			  debug: true,
 			  backdrop: false,