Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -rf36ca18dbc07d2d7cdf0b08cb67cb8af44d30855 -r9f4a11b9b353f720012a957d066663945f0ac70b
--- lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision f36ca18dbc07d2d7cdf0b08cb67cb8af44d30855)
+++ lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 9f4a11b9b353f720012a957d066663945f0ac70b)
@@ -46,119 +46,119 @@
 			
 			LABELS = {
 				<fmt:message key="force.complete.click" var="FORCE_COMPLETE_CLICK_VAR"/>
-				FORCE_COMPLETE_CLICK : '<c:out value="FORCE_COMPLETE_CLICK_VAR" />',
+				FORCE_COMPLETE_CLICK : '<c:out value="${FORCE_COMPLETE_CLICK_VAR}" />',
 				<fmt:message key="button.force.complete" var="FORCE_COMPLETE_BUTTON_VAR"/>
-				FORCE_COMPLETE_BUTTON : '<c:out value="FORCE_COMPLETE_BUTTON_VAR" />',
+				FORCE_COMPLETE_BUTTON : '<c:out value="${FORCE_COMPLETE_BUTTON_VAR}" />',
 				<fmt:message key="force.complete.end.lesson.confirm" var="FORCE_COMPLETE_END_LESSON_CONFIRM_VAR"/>
-				FORCE_COMPLETE_END_LESSON_CONFIRM : '<c:out value="FORCE_COMPLETE_END_LESSON_CONFIRM_VAR" />',
+				FORCE_COMPLETE_END_LESSON_CONFIRM : '<c:out value="${FORCE_COMPLETE_END_LESSON_CONFIRM_VAR}" />',
 				<fmt:message key="force.complete.activity.confirm" var="FORCE_COMPLETE_ACTIVITY_CONFIRM_VAR"/>
-				FORCE_COMPLETE_ACTIVITY_CONFIRM : '<c:out value="FORCE_COMPLETE_ACTIVITY_CONFIRM_VAR" />',
+				FORCE_COMPLETE_ACTIVITY_CONFIRM : '<c:out value="${FORCE_COMPLETE_ACTIVITY_CONFIRM_VAR}" />',
 				<fmt:message key="force.complete.remove.content" var="FORCE_COMPLETE_REMOVE_CONTENT_VAR"/>
-				FORCE_COMPLETE_REMOVE_CONTENT : '<c:out value="FORCE_COMPLETE_REMOVE_CONTENT_VAR" />',
+				FORCE_COMPLETE_REMOVE_CONTENT : '<c:out value="${FORCE_COMPLETE_REMOVE_CONTENT_VAR}" />',
 				<fmt:message key="force.complete.remove.content.yes" var="FORCE_COMPLETE_REMOVE_CONTENT_YES_VAR"/>
-				FORCE_COMPLETE_REMOVE_CONTENT_YES : '<c:out value="FORCE_COMPLETE_REMOVE_CONTENT_YES_VAR" />',
+				FORCE_COMPLETE_REMOVE_CONTENT_YES : '<c:out value="${FORCE_COMPLETE_REMOVE_CONTENT_YES_VAR}" />',
 				<fmt:message key="force.complete.remove.content.no" var="FORCE_COMPLETE_REMOVE_CONTENT_NO_VAR"/>
-				FORCE_COMPLETE_REMOVE_CONTENT_NO : '<c:out value="FORCE_COMPLETE_REMOVE_CONTENT_NO_VAR" />',
+				FORCE_COMPLETE_REMOVE_CONTENT_NO : '<c:out value="${FORCE_COMPLETE_REMOVE_CONTENT_NO_VAR}" />',
 				<fmt:message key="force.complete.drop.fail" var="FORCE_COMPLETE_DROP_FAIL_VAR"/>
-				FORCE_COMPLETE_DROP_FAIL : '<c:out value="FORCE_COMPLETE_DROP_FAIL_VAR" />',
+				FORCE_COMPLETE_DROP_FAIL : '<c:out value="${FORCE_COMPLETE_DROP_FAIL_VAR}" />',
 				<fmt:message key="learner.group.count" var="LEARNER_GROUP_COUNT_VAR"/>
-				LEARNER_GROUP_COUNT : '<c:out value="LEARNER_GROUP_COUNT_VAR" />',
+				LEARNER_GROUP_COUNT : '<c:out value="${LEARNER_GROUP_COUNT_VAR}" />',
 				<fmt:message key="learner.group.show" var="LEARNER_GROUP_SHOW_VAR"/>
-				LEARNER_GROUP_SHOW : '<c:out value="LEARNER_GROUP_SHOW_VAR" />',
+				LEARNER_GROUP_SHOW : '<c:out value="${LEARNER_GROUP_SHOW_VAR}" />',
 				<fmt:message key="learner.group.remove.progress" var="LEARNER_GROUP_REMOVE_PROGRESS_VAR"/>
-				LEARNER_GROUP_REMOVE_PROGRESS : '<c:out value="LEARNER_GROUP_REMOVE_PROGRESS_VAR" />',
+				LEARNER_GROUP_REMOVE_PROGRESS : '<c:out value="${LEARNER_GROUP_REMOVE_PROGRESS_VAR}" />',
 				<fmt:message key="learner.group.list.title" var="LEARNER_GROUP_LIST_TITLE_VAR"/>
-				LEARNER_GROUP_LIST_TITLE : '<c:out value="LEARNER_GROUP_LIST_TITLE_VAR" />',
+				LEARNER_GROUP_LIST_TITLE : '<c:out value="${LEARNER_GROUP_LIST_TITLE_VAR}" />',
 				<fmt:message key="button.view.learner" var="VIEW_LEARNER_BUTTON_VAR"/>
-				VIEW_LEARNER_BUTTON : '<c:out value="VIEW_LEARNER_BUTTON_VAR" />',
+				VIEW_LEARNER_BUTTON : '<c:out value="${VIEW_LEARNER_BUTTON_VAR}" />',
 				<fmt:message key="button.email" var="EMAIL_BUTTON_VAR"/>
-				EMAIL_BUTTON : '<c:out value="EMAIL_BUTTON_VAR" />',
+				EMAIL_BUTTON : '<c:out value="${EMAIL_BUTTON_VAR}" />',
 				<fmt:message key="button.close" var="CLOSE_BUTTON_VAR"/>
-				CLOSE_BUTTON : '<c:out value="CLOSE_BUTTON_VAR" />',
+				CLOSE_BUTTON : '<c:out value="${CLOSE_BUTTON_VAR}" />',
 				<fmt:message key="email.notifications" var="NOTIFCATIONS_VAR"/>
-				NOTIFCATIONS : '<c:out value="NOTIFCATIONS_VAR" />',
+				NOTIFCATIONS : '<c:out value="${NOTIFCATIONS_VAR}" />',
 				<fmt:message key="button.save" var="SAVE_BUTTON_VAR"/>
-				SAVE_BUTTON : '<c:out value="SAVE_BUTTON_VAR" />',
+				SAVE_BUTTON : '<c:out value="${SAVE_BUTTON_VAR}" />',
 				<fmt:message key="button.cancel" var="CANCEL_BUTTON_VAR"/>
-				CANCEL_BUTTON : '<c:out value="CANCEL_BUTTON_VAR" />',
+				CANCEL_BUTTON : '<c:out value="${CANCEL_BUTTON_VAR}" />',
 				<fmt:message key="learner.finished.count" var="LEARNER_FINISHED_COUNT_VAR"/>
-				LEARNER_FINISHED_COUNT : '<c:out value="LEARNER_FINISHED_COUNT_VAR" />',
+				LEARNER_FINISHED_COUNT : '<c:out value="${LEARNER_FINISHED_COUNT_VAR}" />',
 				<fmt:message key="learner.finished.dialog.title" var="LEARNER_FINISHED_DIALOG_TITLE_VAR"/>
-				LEARNER_FINISHED_DIALOG_TITLE : '<c:out value="LEARNER_FINISHED_DIALOG_TITLE_VAR" />',
+				LEARNER_FINISHED_DIALOG_TITLE : '<c:out value="${LEARNER_FINISHED_DIALOG_TITLE_VAR}" />',
 				<fmt:message key="lesson.enable.presence.alert" var="LESSON_PRESENCE_ENABLE_ALERT_VAR"/>
-				LESSON_PRESENCE_ENABLE_ALERT : '<c:out value="LESSON_PRESENCE_ENABLE_ALERT_VAR" />',
+				LESSON_PRESENCE_ENABLE_ALERT : '<c:out value="${LESSON_PRESENCE_ENABLE_ALERT_VAR}" />',
 				<fmt:message key="lesson.disable.presence.alert" var="LESSON_PRESENCE_DISABLE_ALERT_VAR"/>
-				LESSON_PRESENCE_DISABLE_ALERT : '<c:out value="LESSON_PRESENCE_DISABLE_ALERT_VAR" />',
+				LESSON_PRESENCE_DISABLE_ALERT : '<c:out value="${LESSON_PRESENCE_DISABLE_ALERT_VAR}" />',
 				<fmt:message key="lesson.enable.im.alert" var="LESSON_IM_ENABLE_ALERT_VAR"/>
-				LESSON_IM_ENABLE_ALERT : '<c:out value="LESSON_IM_ENABLE_ALERT_VAR" />',
+				LESSON_IM_ENABLE_ALERT : '<c:out value="${LESSON_IM_ENABLE_ALERT_VAR}" />',
 				<fmt:message key="lesson.disable.im.alert" var="LESSON_IM_DISABLE_ALERT_VAR"/>
-				LESSON_IM_DISABLE_ALERT : '<c:out value="LESSON_IM_DISABLE_ALERT_VAR" />',
+				LESSON_IM_DISABLE_ALERT : '<c:out value="${LESSON_IM_DISABLE_ALERT_VAR}" />',
 				<fmt:message key="lesson.remove.alert" var="LESSON_REMOVE_ALERT_VAR"/>
-				LESSON_REMOVE_ALERT : '<c:out value="LESSON_REMOVE_ALERT_VAR" />',
+				LESSON_REMOVE_ALERT : '<c:out value="${LESSON_REMOVE_ALERT_VAR}" />',
 				<fmt:message key="lesson.remove.doublecheck.alert" var="LESSON_REMOVE_DOUBLECHECK_ALERT_VAR"/>
-				LESSON_REMOVE_DOUBLECHECK_ALERT : '<c:out value="LESSON_REMOVE_DOUBLECHECK_ALERT_VAR" />',
+				LESSON_REMOVE_DOUBLECHECK_ALERT : '<c:out value="${LESSON_REMOVE_DOUBLECHECK_ALERT_VAR}" />',
 				<fmt:message key="lesson.state.created" var="LESSON_STATE_CREATED_VAR"/>
-				LESSON_STATE_CREATED : '<c:out value="LESSON_STATE_CREATED_VAR" />',
+				LESSON_STATE_CREATED : '<c:out value="${LESSON_STATE_CREATED_VAR}" />',
 				<fmt:message key="lesson.state.scheduled" var="LESSON_STATE_SCHEDULED_VAR"/>
-				LESSON_STATE_SCHEDULED : '<c:out value="LESSON_STATE_SCHEDULED_VAR" />',
+				LESSON_STATE_SCHEDULED : '<c:out value="${LESSON_STATE_SCHEDULED_VAR}" />',
 				<fmt:message key="lesson.state.started" var="LESSON_STATE_STARTED_VAR"/>
-				LESSON_STATE_STARTED : '<c:out value="LESSON_STATE_STARTED_VAR" />',
+				LESSON_STATE_STARTED : '<c:out value="${LESSON_STATE_STARTED_VAR}" />',
 				<fmt:message key="lesson.state.suspended" var="LESSON_STATE_SUSPENDED_VAR"/>
-				LESSON_STATE_SUSPENDED : '<c:out value="LESSON_STATE_SUSPENDED_VAR" />',
+				LESSON_STATE_SUSPENDED : '<c:out value="${LESSON_STATE_SUSPENDED_VAR}" />',
 				<fmt:message key="lesson.state.finished" var="LESSON_STATE_FINISHED_VAR"/>
-				LESSON_STATE_FINISHED : '<c:out value="LESSON_STATE_FINISHED_VAR" />',
+				LESSON_STATE_FINISHED : '<c:out value="${LESSON_STATE_FINISHED_VAR}" />',
 				<fmt:message key="lesson.state.archived" var="LESSON_STATE_ARCHIVED_VAR"/>
-				LESSON_STATE_ARCHIVED : '<c:out value="LESSON_STATE_ARCHIVED_VAR" />',
+				LESSON_STATE_ARCHIVED : '<c:out value="${LESSON_STATE_ARCHIVED_VAR}" />',
 				<fmt:message key="lesson.state.removed" var="LESSON_STATE_REMOVED_VAR"/>
-				LESSON_STATE_REMOVED : '<c:out value="LESSON_STATE_REMOVED_VAR" />',
+				LESSON_STATE_REMOVED : '<c:out value="${LESSON_STATE_REMOVED_VAR}" />',
 				<fmt:message key="lesson.state.action.disable" var="LESSON_STATE_ACTION_DISABLE_VAR"/>
-				LESSON_STATE_ACTION_DISABLE : '<c:out value="LESSON_STATE_ACTION_DISABLE_VAR" />',
+				LESSON_STATE_ACTION_DISABLE : '<c:out value="${LESSON_STATE_ACTION_DISABLE_VAR}" />',
 				<fmt:message key="lesson.state.action.activate" var="LESSON_STATE_ACTION_ACTIVATE_VAR"/>
-				LESSON_STATE_ACTION_ACTIVATE : '<c:out value="LESSON_STATE_ACTION_ACTIVATE_VAR" />',
+				LESSON_STATE_ACTION_ACTIVATE : '<c:out value="${LESSON_STATE_ACTION_ACTIVATE_VAR}" />',
 				<fmt:message key="lesson.state.action.remove" var="LESSON_STATE_ACTION_REMOVE_VAR"/>
-				LESSON_STATE_ACTION_REMOVE : '<c:out value="LESSON_STATE_ACTION_REMOVE_VAR" />',
+				LESSON_STATE_ACTION_REMOVE : '<c:out value="${LESSON_STATE_ACTION_REMOVE_VAR}" />',
 				<fmt:message key="lesson.state.action.archive" var="LESSON_STATE_ACTION_ARCHIVE_VAR"/>
-				LESSON_STATE_ACTION_ARCHIVE : '<c:out value="LESSON_STATE_ACTION_ARCHIVE_VAR" />',
+				LESSON_STATE_ACTION_ARCHIVE : '<c:out value="${LESSON_STATE_ACTION_ARCHIVE_VAR}" />',
 				<fmt:message key="error.lesson.schedule.date" var="LESSON_ERROR_SCHEDULE_DATE_VAR"/>
-				LESSON_ERROR_SCHEDULE_DATE : '<c:out value="LESSON_ERROR_SCHEDULE_DATE_VAR" />',
+				LESSON_ERROR_SCHEDULE_DATE : '<c:out value="${LESSON_ERROR_SCHEDULE_DATE_VAR}" />',
 				<fmt:message key="button.edit.class" var="LESSON_EDIT_CLASS_VAR"/>
-				LESSON_EDIT_CLASS : '<c:out value="LESSON_EDIT_CLASS_VAR" />',
+				LESSON_EDIT_CLASS : '<c:out value="${LESSON_EDIT_CLASS_VAR}" />',
 				<fmt:message key="lesson.group.dialog.class" var="LESSON_GROUP_DIALOG_CLASS_VAR"/>
-				LESSON_GROUP_DIALOG_CLASS : '<c:out value="LESSON_GROUP_DIALOG_CLASS_VAR" />',
+				LESSON_GROUP_DIALOG_CLASS : '<c:out value="${LESSON_GROUP_DIALOG_CLASS_VAR}" />',
 				<fmt:message key="label.learner.progress.activity.current.tooltip" var="CURRENT_ACTIVITY_VAR"/>
-				CURRENT_ACTIVITY : '<c:out value="CURRENT_ACTIVITY_VAR" />',
+				CURRENT_ACTIVITY : '<c:out value="${CURRENT_ACTIVITY_VAR}" />',
 				<fmt:message key="label.learner.progress.activity.completed.tooltip" var="COMPLETED_ACTIVITY_VAR"/>
-				COMPLETED_ACTIVITY : '<c:out value="COMPLETED_ACTIVITY_VAR" />',
+				COMPLETED_ACTIVITY : '<c:out value="${COMPLETED_ACTIVITY_VAR}" />',
 				<fmt:message key="label.learner.progress.activity.attempted.tooltip" var="ATTEMPTED_ACTIVITY_VAR"/>
-				ATTEMPTED_ACTIVITY : '<c:out value="ATTEMPTED_ACTIVITY_VAR" />',
+				ATTEMPTED_ACTIVITY : '<c:out value="${ATTEMPTED_ACTIVITY_VAR}" />',
 				<fmt:message key="label.learner.progress.activity.tostart.tooltip" var="TOSTART_ACTIVITY_VAR"/>
-				TOSTART_ACTIVITY : '<c:out value="TOSTART_ACTIVITY_VAR" />',
+				TOSTART_ACTIVITY : '<c:out value="${TOSTART_ACTIVITY_VAR}" />',
 				<fmt:message key="label.learner.progress.activity.support.tooltip" var="SUPPORT_ACTIVITY_VAR"/>
-				SUPPORT_ACTIVITY : '<c:out value="SUPPORT_ACTIVITY_VAR" />',
+				SUPPORT_ACTIVITY : '<c:out value="${SUPPORT_ACTIVITY_VAR}" />',
 				<fmt:message key="button.export" var="EXPORT_PORTFOLIO_VAR"/>
-				EXPORT_PORTFOLIO : '<c:out value="EXPORT_PORTFOLIO_VAR" />',
+				EXPORT_PORTFOLIO : '<c:out value="${EXPORT_PORTFOLIO_VAR}" />',
 				<fmt:message key="button.export.learner.tooltip" var="EXPORT_PORTFOLIO_LEARNER_TOOLTIP_VAR"/>
-				EXPORT_PORTFOLIO_LEARNER_TOOLTIP : '<c:out value="EXPORT_PORTFOLIO_LEARNER_TOOLTIP_VAR" />',
+				EXPORT_PORTFOLIO_LEARNER_TOOLTIP : '<c:out value="${EXPORT_PORTFOLIO_LEARNER_TOOLTIP_VAR}" />',
 			    <fmt:message key="button.timechart" var="TIME_CHART_VAR"/>
-			    TIME_CHART : '<c:out value="TIME_CHART_VAR" />',
+			    TIME_CHART : '<c:out value="${TIME_CHART_VAR}" />',
 			    <fmt:message key="button.timechart.tooltip" var="TIME_CHART_TOOLTIP_VAR"/>
-			    TIME_CHART_TOOLTIP : '<c:out value="TIME_CHART_TOOLTIP_VAR" />',
+			    TIME_CHART_TOOLTIP : '<c:out value="${TIME_CHART_TOOLTIP_VAR}" />',
 				<fmt:message key="button.live.edit.confirm" var="LIVE_EDIT_CONFIRM_VAR"/>
-				LIVE_EDIT_CONFIRM : '<c:out value="LIVE_EDIT_CONFIRM_VAR" />',
+				LIVE_EDIT_CONFIRM : '<c:out value="${LIVE_EDIT_CONFIRM_VAR}" />',
 				<fmt:message key="lesson.task.gate" var="CONTRIBUTE_GATE_VAR"/>
-				CONTRIBUTE_GATE : '<c:out value="CONTRIBUTE_GATE_VAR" />',
+				CONTRIBUTE_GATE : '<c:out value="${CONTRIBUTE_GATE_VAR}" />',
 				<fmt:message key="lesson.task.grouping" var="CONTRIBUTE_GROUPING_VAR"/>
-				CONTRIBUTE_GROUPING : '<c:out value="CONTRIBUTE_GROUPING_VAR" />',
+				CONTRIBUTE_GROUPING : '<c:out value="${CONTRIBUTE_GROUPING_VAR}" />',
 				<fmt:message key="lesson.task.branching" var="CONTRIBUTE_BRANCHING_VAR"/>
-				CONTRIBUTE_BRANCHING : '<c:out value="CONTRIBUTE_BRANCHING_VAR" />',
+				CONTRIBUTE_BRANCHING : '<c:out value="${CONTRIBUTE_BRANCHING_VAR}" />',
 				<fmt:message key="lesson.task.content.edited" var="CONTRIBUTE_CONTENT_EDITED_VAR"/>
-				CONTRIBUTE_CONTENT_EDITED : '<c:out value="CONTRIBUTE_CONTENT_EDITED_VAR" />',
+				CONTRIBUTE_CONTENT_EDITED : '<c:out value="${CONTRIBUTE_CONTENT_EDITED_VAR}" />',
 				<fmt:message key="button.task.go.tooltip" var="CONTRIBUTE_TOOLTIP_VAR"/>
-				CONTRIBUTE_TOOLTIP : '<c:out value="CONTRIBUTE_TOOLTIP_VAR" />',
+				CONTRIBUTE_TOOLTIP : '<c:out value="${CONTRIBUTE_TOOLTIP_VAR}" />',
 				<fmt:message key="button.task.go" var="CONTRIBUTE_BUTTON_VAR"/>
-				CONTRIBUTE_BUTTON : '<c:out value="CONTRIBUTE_BUTTON_VAR" />',
+				CONTRIBUTE_BUTTON : '<c:out value="${CONTRIBUTE_BUTTON_VAR}" />',
 				<fmt:message key="lesson.task.attention" var="CONTRIBUTE_ATTENTION_VAR"/>
-				CONTRIBUTE_ATTENTION : '<c:out value="CONTRIBUTE_ATTENTION_VAR" />'
+				CONTRIBUTE_ATTENTION : '<c:out value="${CONTRIBUTE_ATTENTION_VAR}" />'
 			}
 	    
 		$(document).ready(function(){