Index: lams_admin/web/toolcontent/learningLibraryGroup.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/toolcontent/learningLibraryGroup.jsp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_admin/web/toolcontent/learningLibraryGroup.jsp	10 Apr 2015 16:37:38 -0000	1.1.2.2
+++ lams_admin/web/toolcontent/learningLibraryGroup.jsp	28 Apr 2015 10:46:12 -0000	1.1.2.3
@@ -17,15 +17,17 @@
 			learningLibraries = ${learningLibraries},
 		
 			LAMS_URL = '<lams:LAMSURL/>',
+			
+			decoderDiv = $('<div />'),
 			LABELS = {
 					<fmt:message key="tool.groups.group.default.name" var="GROUP_DEFAULT_NAME_VAR"/>
 					GROUP_DEFAULT_NAME : '<c:out value="${GROUP_DEFAULT_NAME_VAR}" />',
 					<fmt:message key="tool.groups.remove.confirm" var="GROUP_REMOVE_CONFIRM_VAR"/>
-					GROUP_REMOVE_CONFIRM : '<c:out value="${GROUP_REMOVE_CONFIRM_VAR}" />',
+					GROUP_REMOVE_CONFIRM : decoderDiv.html('<c:out value="${GROUP_REMOVE_CONFIRM_VAR}" />').text(),
 					<fmt:message key="tool.groups.group.name.error" var="GROUP_NAME_VALIDATION_ERROR_VAR"/>
-					GROUP_NAME_VALIDATION_ERROR : '<c:out value="${GROUP_NAME_VALIDATION_ERROR_VAR}" />',
+					GROUP_NAME_VALIDATION_ERROR : decoderDiv.html('<c:out value="${GROUP_NAME_VALIDATION_ERROR_VAR}" />').text(),
 					<fmt:message key="tool.groups.save.error" var="SAVE_ERROR_VAR"/>
-					SAVE_ERROR : '<c:out value="${SAVE_ERROR_VAR}" />'
+					SAVE_ERROR : decoderDiv.html('<c:out value="${SAVE_ERROR_VAR}" />').text()
 			};
 	</script>
 </lams:head>
Index: lams_central/web/main.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/main.jsp,v
diff -u -r1.77.2.7 -r1.77.2.8
--- lams_central/web/main.jsp	19 Apr 2015 14:38:31 -0000	1.77.2.7
+++ lams_central/web/main.jsp	28 Apr 2015 10:46:09 -0000	1.77.2.8
@@ -1,4 +1,6 @@
 <%@ page contentType="text/html; charset=utf-8" language="java"%>
+<%@ page import="org.lamsfoundation.lams.security.JspRedirectStrategy"%>
+<%@ page import="org.lamsfoundation.lams.web.util.HttpSessionManager"%>
 <%@ page import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
@@ -7,6 +9,10 @@
 <%@ taglib uri="tags-function" prefix="fn"%>
 <%@ taglib uri="tags-tiles" prefix="tiles" %>
 
+<%-- If you change this file, remember to update the copy made for CNG-21 --%>
+
+<%JspRedirectStrategy.welcomePageStatusUpdate(request, response);%>
+<%HttpSessionManager.getInstance().updateHttpSessionByLogin(request.getSession(),request.getRemoteUser());%>
 <!DOCTYPE HTML>
 <lams:html>
 <lams:head>
@@ -35,13 +41,14 @@
 
 	<script type="text/javascript">
 			var LAMS_URL = '<lams:LAMSURL/>';
+			var decoderDiv = $('<div />');
 			var LABELS = {
 					<fmt:message key="index.emailnotifications" var="EMAIL_NOTIFICATIONS_TITLE_VAR"/>
 					EMAIL_NOTIFICATIONS_TITLE : '<c:out value="${EMAIL_NOTIFICATIONS_TITLE_VAR}" />',
 					<fmt:message key="index.remove.lesson.confirm1" var="REMOVE_LESSON_CONFIRM1_VAR"/>
-					REMOVE_LESSON_CONFIRM1 : '<c:out value="${REMOVE_LESSON_CONFIRM1_VAR}" />',
+					REMOVE_LESSON_CONFIRM1 : decoderDiv.html('<c:out value="${REMOVE_LESSON_CONFIRM1_VAR}" />').text(),
 					<fmt:message key="index.remove.lesson.confirm2" var="REMOVE_LESSON_CONFIRM2_VAR"/>
-					REMOVE_LESSON_CONFIRM2 : '<c:out value="${REMOVE_LESSON_CONFIRM2_VAR}" />',
+					REMOVE_LESSON_CONFIRM2 : decoderDiv.html('<c:out value="${REMOVE_LESSON_CONFIRM2_VAR}" />').text(),
 					<fmt:message key="label.enable.lesson.sorting" var="SORTING_ENABLE_VAR"/>
 					SORTING_ENABLE : '<c:out value="${SORTING_ENABLE_VAR}" />',
 					<fmt:message key="label.disable.lesson.sorting" var="SORTING_DISABLE_VAR"/>
Index: lams_central/web/orgGroup.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/orgGroup.jsp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- lams_central/web/orgGroup.jsp	10 Apr 2015 16:37:40 -0000	1.4.2.2
+++ lams_central/web/orgGroup.jsp	28 Apr 2015 10:46:08 -0000	1.4.2.3
@@ -29,17 +29,18 @@
 		var usedForBranching = ${usedForBranching eq true};
 		
 		var LAMS_URL = '<lams:LAMSURL/>';
+		var decoderDiv = $('<div />');
 		var LABELS = {
 			<fmt:message key="label.course.groups.prefix" var="GROUP_PREFIX_LABEL_VAR"/>
 			GROUP_PREFIX_LABEL : '<c:out value="${GROUP_PREFIX_LABEL_VAR}" />',
 			<fmt:message key="label.course.groups.remove.confirm" var="GROUP_REMOVE_LABEL_VAR"/>
-			GROUP_REMOVE_LABEL : '<c:out value="${GROUP_REMOVE_LABEL_VAR}" />',
+			GROUP_REMOVE_LABEL : decoderDiv.html('<c:out value="${GROUP_REMOVE_LABEL_VAR}" />').text(),
 			<fmt:message key="label.course.groups.remove.empty.confirm" var="EMPTY_GROUP_SAVE_LABEL_VAR"/>
-			EMPTY_GROUP_SAVE_LABEL : '<c:out value="${EMPTY_GROUP_SAVE_LABEL_VAR}" />',
+			EMPTY_GROUP_SAVE_LABEL : decoderDiv.html('<c:out value="${EMPTY_GROUP_SAVE_LABEL_VAR}" />').text(),
 			<fmt:message key="label.course.groups.locked" var="GROUP_LOCK_LABEL_VAR"/>
-			GROUP_LOCK_LABEL : '<c:out value="${GROUP_LOCK_LABEL_VAR}" />',
+			GROUP_LOCK_LABEL : decoderDiv.html('<c:out value="${GROUP_LOCK_LABEL_VAR}" />').text(),
 			<fmt:message key="label.course.groups.locked.transfer" var="TRANSFER_LOCKED_LABEL_VAR"/>
-			TRANSFER_LOCKED_LABEL : '<c:out value="${TRANSFER_LOCKED_LABEL_VAR}" />'
+			TRANSFER_LOCKED_LABEL : decoderDiv.html('<c:out value="${TRANSFER_LOCKED_LABEL_VAR}" />').text()
 		};
 	</script>
 </lams:head>
Index: lams_central/web/orgGrouping.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/orgGrouping.jsp,v
diff -u -r1.3.2.2 -r1.3.2.3
--- lams_central/web/orgGrouping.jsp	10 Apr 2015 16:37:40 -0000	1.3.2.2
+++ lams_central/web/orgGrouping.jsp	28 Apr 2015 10:46:08 -0000	1.3.2.3
@@ -23,11 +23,13 @@
 			lessonId = '${param.lessonID}',
 		
 			LAMS_URL = '<lams:LAMSURL/>',
+			
+			decoderDiv = $('<div />'),
 			LABELS = {
 				<fmt:message key="label.course.groups.grouping.remove.confirm" var="REMOVE_GROUPING_CONFIRM_LABEL_VAR"/>
-				REMOVE_GROUPING_CONFIRM_LABEL : '<c:out value="${REMOVE_GROUPING_CONFIRM_LABEL_VAR}" />',
+				REMOVE_GROUPING_CONFIRM_LABEL : decoderDiv.html('<c:out value="${REMOVE_GROUPING_CONFIRM_LABEL_VAR}" />').text(),
 				<fmt:message key="label.course.groups.grouping.use.confirm" var="USE_GROUPING_CONFIRM_LABEL_VAR"/>
-				USE_GROUPING_CONFIRM_LABEL : '<c:out value="${USE_GROUPING_CONFIRM_LABEL_VAR}" />'
+				USE_GROUPING_CONFIRM_LABEL : decoderDiv.html('<c:out value="${USE_GROUPING_CONFIRM_LABEL_VAR}" />').text()
 			};
 	</script>
 </lams:head>
Index: lams_central/web/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/authoring/authoring.jsp,v
diff -u -r1.6.2.8 -r1.6.2.9
--- lams_central/web/authoring/authoring.jsp	10 Apr 2015 16:37:40 -0000	1.6.2.8
+++ lams_central/web/authoring/authoring.jsp	28 Apr 2015 10:46:09 -0000	1.6.2.9
@@ -38,6 +38,8 @@
 	<script type="text/javascript">
 		var LAMS_URL = '<lams:LAMSURL/>',
 			LD_THUMBNAIL_URL_BASE = LAMS_URL + 'home.do?method=createLearningDesignThumbnail&ldId=',
+
+			decoderDiv = $('<div />'),
 			LABELS = {
 				// ActivityLib
 				<fmt:message key="authoring.fla.default.group.title" var="DEFAULT_GROUPING_TITLE_VAR"/>
@@ -59,15 +61,15 @@
 				<fmt:message key="authoring.fla.branching.end.suffix" var="BRANCHING_END_SUFFIX_VAR"/>
 				BRANCHING_END_SUFFIX : '<c:out value="${BRANCHING_END_SUFFIX_VAR}" />',
 				<fmt:message key="authoring.fla.remove.activity.confirm" var="REMOVE_ACTIVITY_CONFIRM_VAR"/>
-				REMOVE_ACTIVITY_CONFIRM : '<c:out value="${REMOVE_ACTIVITY_CONFIRM_VAR}" />',
+				REMOVE_ACTIVITY_CONFIRM : decoderDiv.html('<c:out value="${REMOVE_ACTIVITY_CONFIRM_VAR}" />').text(),
 				<fmt:message key="authoring.fla.branching.create.confirm" var="BRANCHING_CREATE_CONFIRM_VAR"/>
-				BRANCHING_CREATE_CONFIRM : '<c:out value="${BRANCHING_CREATE_CONFIRM_VAR}" />',
+				BRANCHING_CREATE_CONFIRM : decoderDiv.html('<c:out value="${BRANCHING_CREATE_CONFIRM_VAR}" />').text(),
 				<fmt:message key="authoring.fla.transition.to.exists.error" var="TRANSITION_TO_EXISTS_ERROR_VAR"/>
-				TRANSITION_TO_EXISTS_ERROR : '<c:out value="${TRANSITION_TO_EXISTS_ERROR_VAR}" />',
+				TRANSITION_TO_EXISTS_ERROR : decoderDiv.html('<c:out value="${TRANSITION_TO_EXISTS_ERROR_VAR}" />').text(),
 				<fmt:message key="authoring.fla.circular.sequence.error" var="CIRCULAR_SEQUENCE_ERROR_VAR"/>
-				CIRCULAR_SEQUENCE_ERROR : '<c:out value="${CIRCULAR_SEQUENCE_ERROR_VAR}" />',
+				CIRCULAR_SEQUENCE_ERROR : decoderDiv.html('<c:out value="${CIRCULAR_SEQUENCE_ERROR_VAR}" />').text(),
 				<fmt:message key="authoring.fla.activity.in.container.error" var="ACTIVITY_IN_CONTAINER_ERROR_VAR"/>
-				ACTIVITY_IN_CONTAINER_ERROR : '<c:out value="${ACTIVITY_IN_CONTAINER_ERROR_VAR}" />',
+				ACTIVITY_IN_CONTAINER_ERROR : decoderDiv.html('<c:out value="${ACTIVITY_IN_CONTAINER_ERROR_VAR}" />').text(),
 				
 				// DecorationLib
 				<fmt:message key="authoring.fla.default.annotation.label.title" var="DEFAULT_ANNOTATION_LABEL_TITLE_VAR"/>
@@ -101,39 +103,39 @@
 				<fmt:message key="authoring.fla.sequence.validation.issues" var="SEQUENCE_VALIDATION_ISSUES_VAR"/>
 				SEQUENCE_VALIDATION_ISSUES : '<c:out value="${SEQUENCE_VALIDATION_ISSUES_VAR}" />',
 				<fmt:message key="authoring.fla.save.successful" var="SAVE_SUCCESSFUL_VAR"/>
-				SAVE_SUCCESSFUL : '<c:out value="${SAVE_SUCCESSFUL_VAR}" />',
+				SAVE_SUCCESSFUL : decoderDiv.html('<c:out value="${SAVE_SUCCESSFUL_VAR}" />').text(),
 				<fmt:message key="authoring.fla.navigate.away.confirm" var="NAVIGATE_AWAY_CONFIRM_VAR"/>
-				NAVIGATE_AWAY_CONFIRM : '<c:out value="${NAVIGATE_AWAY_CONFIRM_VAR}" />',
+				NAVIGATE_AWAY_CONFIRM : decoderDiv.html('<c:out value="${NAVIGATE_AWAY_CONFIRM_VAR}" />').text(),
 				<fmt:message key="authoring.fla.delete.node.confirm" var="DELETE_NODE_CONFIRM_VAR"/>
-				DELETE_NODE_CONFIRM : '<c:out value="${DELETE_NODE_CONFIRM_VAR}" />',
+				DELETE_NODE_CONFIRM : decoderDiv.html('<c:out value="${DELETE_NODE_CONFIRM_VAR}" />').text(),
 				<fmt:message key="authoring.fla.sequence.overwrite.confirm" var="SEQUENCE_OVERWRITE_CONFIRM_VAR"/>
-				SEQUENCE_OVERWRITE_CONFIRM : '<c:out value="${SEQUENCE_OVERWRITE_CONFIRM_VAR}" />',
+				SEQUENCE_OVERWRITE_CONFIRM : decoderDiv.html('<c:out value="${SEQUENCE_OVERWRITE_CONFIRM_VAR}" />').text(),
 				<fmt:message key="authoring.fla.new.folder.title.prompt" var="NEW_FOLDER_TITLE_PROMPT_VAR"/>
-				NEW_FOLDER_TITLE_PROMPT : '<c:out value="${NEW_FOLDER_TITLE_PROMPT_VAR}" />',
+				NEW_FOLDER_TITLE_PROMPT : decoderDiv.html('<c:out value="${NEW_FOLDER_TITLE_PROMPT_VAR}" />').text(),
 				<fmt:message key="authoring.fla.rename.title.prompt" var="RENAME_TITLE_PROMPT_VAR"/>
-				RENAME_TITLE_PROMPT : '<c:out value="${RENAME_TITLE_PROMPT_VAR}" />',
+				RENAME_TITLE_PROMPT : decoderDiv.html('<c:out value="${RENAME_TITLE_PROMPT_VAR}" />').text(),
 				<fmt:message key="authoring.fla.save.sequence.title.prompt" var="SAVE_SEQUENCE_TITLE_PROMPT_VAR"/>
-				SAVE_SEQUENCE_TITLE_PROMPT : '<c:out value="${SAVE_SEQUENCE_TITLE_PROMPT_VAR}" />',
+				SAVE_SEQUENCE_TITLE_PROMPT : decoderDiv.html('<c:out value="${SAVE_SEQUENCE_TITLE_PROMPT_VAR}" />').text(),
 				<fmt:message key="authoring.fla.import.part.choose.prompt" var="IMPORT_PART_CHOOSE_PROMPT_VAR"/>
-				IMPORT_PART_CHOOSE_PROMPT : '<c:out value="${IMPORT_PART_CHOOSE_PROMPT_VAR}" />',
+				IMPORT_PART_CHOOSE_PROMPT : decoderDiv.html('<c:out value="${IMPORT_PART_CHOOSE_PROMPT_VAR}" />').text(),
 				<fmt:message key="authoring.fla.folder.not.selected.error" var="FOLDER_NOT_SELECTED_ERROR_VAR"/>
-				FOLDER_NOT_SELECTED_ERROR : '<c:out value="${FOLDER_NOT_SELECTED_ERROR_VAR}" />',
+				FOLDER_NOT_SELECTED_ERROR : decoderDiv.html('<c:out value="${FOLDER_NOT_SELECTED_ERROR_VAR}" />').text(),
 				<fmt:message key="authoring.fla.title.validation.error" var="TITLE_VALIDATION_ERROR_VAR"/>
-				TITLE_VALIDATION_ERROR : '<c:out value="${TITLE_VALIDATION_ERROR_VAR}" />',
+				TITLE_VALIDATION_ERROR : decoderDiv.html('<c:out value="${TITLE_VALIDATION_ERROR_VAR}" />').text(),
 				<fmt:message key="authoring.fla.folder.exists.error" var="FOLDER_EXISTS_ERROR_VAR"/>
-				FOLDER_EXISTS_ERROR : '<c:out value="${FOLDER_EXISTS_ERROR_VAR}" />',
+				FOLDER_EXISTS_ERROR : decoderDiv.html('<c:out value="${FOLDER_EXISTS_ERROR_VAR}" />').text(),
 				<fmt:message key="authoring.fla.sequence.exists.error" var="SEQUENCE_EXISTS_ERROR_VAR"/>
-				SEQUENCE_EXISTS_ERROR : '<c:out value="${SEQUENCE_EXISTS_ERROR_VAR}" />',
+				SEQUENCE_EXISTS_ERROR : decoderDiv.html('<c:out value="${SEQUENCE_EXISTS_ERROR_VAR}" />').text(),
 				<fmt:message key="authoring.fla.sequence.save.error" var="SEQUENCE_SAVE_ERROR_VAR"/>
-				SEQUENCE_SAVE_ERROR : '<c:out value="${SEQUENCE_SAVE_ERROR_VAR}" />',
+				SEQUENCE_SAVE_ERROR : decoderDiv.html('<c:out value="${SEQUENCE_SAVE_ERROR_VAR}" />').text(),
 				<fmt:message key="authoring.fla.sequence.not.selected.error" var="SEQUENCE_NOT_SELECTED_ERROR_VAR"/>
-				SEQUENCE_NOT_SELECTED_ERROR : '<c:out value="${SEQUENCE_NOT_SELECTED_ERROR_VAR}" />',
+				SEQUENCE_NOT_SELECTED_ERROR : decoderDiv.html('<c:out value="${SEQUENCE_NOT_SELECTED_ERROR_VAR}" />').text(),
 				<fmt:message key="authoring.fla.sequence.load.error" var="SEQUENCE_LOAD_ERROR_VAR"/>
-				SEQUENCE_LOAD_ERROR : '<c:out value="${SEQUENCE_LOAD_ERROR_VAR}" />',
+				SEQUENCE_LOAD_ERROR : decoderDiv.html('<c:out value="${SEQUENCE_LOAD_ERROR_VAR}" />').text(),
 				
 				// HandlerLib
 				<fmt:message key="authoring.fla.transition.from.exists.error" var="TRANSITION_FROM_EXISTS_ERROR_VAR"/>
-				TRANSITION_FROM_EXISTS_ERROR : '<c:out value="${TRANSITION_FROM_EXISTS_ERROR_VAR}" />',
+				TRANSITION_FROM_EXISTS_ERROR : decoderDiv.html('<c:out value="${TRANSITION_FROM_EXISTS_ERROR_VAR}" />').text(),
 				
 				// MenuLib
 				<fmt:message key="authoring.fla.export.image.dialog.title" var="EXPORT_IMAGE_DIALOG_TITLE_VAR"/>
@@ -153,31 +155,31 @@
 				<fmt:message key="label.tab.lesson.sequence.folder" var="RUN_SEQUENCES_FOLDER_VAR"/>
 				RUN_SEQUENCES_FOLDER : '<c:out value="${RUN_SEQUENCES_FOLDER_VAR}" />',
 				<fmt:message key="authoring.fla.arrange.confirm" var="ARRANGE_CONFIRM_VAR"/>
-				ARRANGE_CONFIRM : '<c:out value="${ARRANGE_CONFIRM_VAR}" />',
+				ARRANGE_CONFIRM : decoderDiv.html('<c:out value="${ARRANGE_CONFIRM_VAR}" />').text(),
 				<fmt:message key="authoring.fla.clear.canvas.confirm" var="CLEAR_CANVAS_CONFIRM_VAR"/>
-				CLEAR_CANVAS_CONFIRM : '<c:out value="${CLEAR_CANVAS_CONFIRM_VAR}" />',
+				CLEAR_CANVAS_CONFIRM : decoderDiv.html('<c:out value="${CLEAR_CANVAS_CONFIRM_VAR}" />').text(),
 				<fmt:message key="authoring.fla.branching.start.place.prompt" var="BRANCHING_START_PLACE_PROMPT_VAR"/>
-				BRANCHING_START_PLACE_PROMPT : '<c:out value="${BRANCHING_START_PLACE_PROMPT_VAR}" />',
+				BRANCHING_START_PLACE_PROMPT : decoderDiv.html('<c:out value="${BRANCHING_START_PLACE_PROMPT_VAR}" />').text(),
 				<fmt:message key="authoring.fla.branching.end.place.prompt" var="BRANCHING_END_PLACE_PROMPT_VAR"/>
-				BRANCHING_END_PLACE_PROMPT : '<c:out value="${BRANCHING_END_PLACE_PROMPT_VAR}" />',
+				BRANCHING_END_PLACE_PROMPT : decoderDiv.html('<c:out value="${BRANCHING_END_PLACE_PROMPT_VAR}" />').text(),
 				<fmt:message key="authoring.fla.annotation.region.place.prompt" var="ANNOTATION_REGION_PLACE_PROMPT_VAR"/>
-				ANNOTATION_REGION_PLACE_PROMPT : '<c:out value="${ANNOTATION_REGION_PLACE_PROMPT_VAR}" />',
+				ANNOTATION_REGION_PLACE_PROMPT : decoderDiv.html('<c:out value="${ANNOTATION_REGION_PLACE_PROMPT_VAR}" />').text(),
 				<fmt:message key="authoring.fla.annotation.label.place.prompt" var="ANNOTATION_LABEL_PLACE_PROMPT_VAR"/>
-				ANNOTATION_LABEL_PLACE_PROMPT : '<c:out value="${ANNOTATION_LABEL_PLACE_PROMPT_VAR}" />',
+				ANNOTATION_LABEL_PLACE_PROMPT : decoderDiv.html('<c:out value="${ANNOTATION_LABEL_PLACE_PROMPT_VAR}" />').text(),
 				<fmt:message key="authoring.fla.optional.activity.place.prompt" var="OPTIONAL_ACTIVITY_PLACE_PROMPT_VAR"/>
-				OPTIONAL_ACTIVITY_PLACE_PROMPT : '<c:out value="${OPTIONAL_ACTIVITY_PLACE_PROMPT_VAR}" />',
+				OPTIONAL_ACTIVITY_PLACE_PROMPT : decoderDiv.html('<c:out value="${OPTIONAL_ACTIVITY_PLACE_PROMPT_VAR}" />').text(),
 				<fmt:message key="authoring.fla.support.activity.place.prompt" var="SUPPORT_ACTIVITY_PLACE_PROMPT_VAR"/>
-				SUPPORT_ACTIVITY_PLACE_PROMPT : '<c:out value="${SUPPORT_ACTIVITY_PLACE_PROMPT_VAR}" />',
+				SUPPORT_ACTIVITY_PLACE_PROMPT : decoderDiv.html('<c:out value="${SUPPORT_ACTIVITY_PLACE_PROMPT_VAR}" />').text(),
 				<fmt:message key="authoring.fla.transition.place.prompt" var="TRANSITION_PLACE_PROMPT_VAR"/>
-				TRANSITION_PLACE_PROMPT : '<c:out value="${TRANSITION_PLACE_PROMPT_VAR}" />',
+				TRANSITION_PLACE_PROMPT : decoderDiv.html('<c:out value="${TRANSITION_PLACE_PROMPT_VAR}" />').text(),
 				<fmt:message key="authoring.fla.paste.error" var="PASTE_ERROR_VAR"/>
-				PASTE_ERROR : '<c:out value="${PASTE_ERROR_VAR}" />',
+				PASTE_ERROR : decoderDiv.html('<c:out value="${PASTE_ERROR_VAR}" />').text(),
 				<fmt:message key="authoring.fla.preview.error" var="PREVIEW_ERROR_VAR"/>
-				PREVIEW_ERROR : '<c:out value="${PREVIEW_ERROR_VAR}" />',
+				PREVIEW_ERROR : decoderDiv.html('<c:out value="${PREVIEW_ERROR_VAR}" />').text(),
 				<fmt:message key="authoring.fla.cross.branching.error" var="CROSS_BRANCHING_ERROR_VAR"/>
-				CROSS_BRANCHING_ERROR : '<c:out value="${CROSS_BRANCHING_ERROR_VAR}" />',
+				CROSS_BRANCHING_ERROR : decoderDiv.html('<c:out value="${CROSS_BRANCHING_ERROR_VAR}" />').text(),
 				<fmt:message key="authoring.fla.end.match.error" var="END_MATCH_ERROR_VAR"/>
-				END_MATCH_ERROR : '<c:out value="${END_MATCH_ERROR_VAR}" />',
+				END_MATCH_ERROR : decoderDiv.html('<c:out value="${END_MATCH_ERROR_VAR}" />').text(),
 				
 				
 				// PropertyLib
@@ -238,23 +240,23 @@
 				<fmt:message key="authoring.fla.default.range.condition.title.prefix" var="DEFAULT_RANGE_CONDITION_TITLE_PREFIX_VAR"/>
 				DEFAULT_RANGE_CONDITION_TITLE_PREFIX : '<c:out value="${DEFAULT_RANGE_CONDITION_TITLE_PREFIX_VAR}" />',
 				<fmt:message key="authoring.fla.clear.all.confirm" var="CLEAR_ALL_CONFIRM_VAR"/>
-				CLEAR_ALL_CONFIRM : '<c:out value="${CLEAR_ALL_CONFIRM_VAR}" />',
+				CLEAR_ALL_CONFIRM : decoderDiv.html('<c:out value="${CLEAR_ALL_CONFIRM_VAR}" />').text(),
 				<fmt:message key="authoring.fla.remove.condition.confirm" var="REMOVE_CONDITION_CONFIRM_VAR"/>
-				REMOVE_CONDITION_CONFIRM : '<c:out value="${REMOVE_CONDITION_CONFIRM_VAR}" />',
+				REMOVE_CONDITION_CONFIRM : decoderDiv.html('<c:out value="${REMOVE_CONDITION_CONFIRM_VAR}" />').text(),
 				<fmt:message key="authoring.fla.refresh.conditions.confirm" var="REFRESH_CONDITIONS_CONFIRM_VAR"/>
-				REFRESH_CONDITIONS_CONFIRM : '<c:out value="${REFRESH_CONDITIONS_CONFIRM_VAR}" />',
+				REFRESH_CONDITIONS_CONFIRM : decoderDiv.html('<c:out value="${REFRESH_CONDITIONS_CONFIRM_VAR}" />').text(),
 				<fmt:message key="authoring.fla.conditions.to.default.gate.state.confirm" var="CONDITIONS_TO_DEFAULT_GATE_STATE_CONFIRM_VAR"/>
-				CONDITIONS_TO_DEFAULT_GATE_STATE_CONFIRM : '<c:out value="${CONDITIONS_TO_DEFAULT_GATE_STATE_CONFIRM_VAR}" />',
+				CONDITIONS_TO_DEFAULT_GATE_STATE_CONFIRM : decoderDiv.html('<c:out value="${CONDITIONS_TO_DEFAULT_GATE_STATE_CONFIRM_VAR}" />').text(),
 				<fmt:message key="authoring.fla.conditions.to.default.branch.confirm" var="CONDITIONS_TO_DEFAULT_BRANCH_CONFIRM_VAR"/>
-				CONDITIONS_TO_DEFAULT_BRANCH_CONFIRM : '<c:out value="${CONDITIONS_TO_DEFAULT_BRANCH_CONFIRM_VAR}" />',
+				CONDITIONS_TO_DEFAULT_BRANCH_CONFIRM : decoderDiv.html('<c:out value="${CONDITIONS_TO_DEFAULT_BRANCH_CONFIRM_VAR}" />').text(),
 				<fmt:message key="authoring.fla.groups.to.default.branch.confirm" var="GROUPS_TO_DEFAULT_BRANCH_CONFIRM_VAR"/>
-				GROUPS_TO_DEFAULT_BRANCH_CONFIRM : '<c:out value="${GROUPS_TO_DEFAULT_BRANCH_CONFIRM_VAR}" />',
+				GROUPS_TO_DEFAULT_BRANCH_CONFIRM : decoderDiv.html('<c:out value="${GROUPS_TO_DEFAULT_BRANCH_CONFIRM_VAR}" />').text(),
 				<fmt:message key="authoring.fla.range.condition.add.start.error" var="RANGE_CONDITION_ADD_START_ERROR_VAR"/>
-				RANGE_CONDITION_ADD_START_ERROR : '<c:out value="${RANGE_CONDITION_ADD_START_ERROR_VAR}" />',
+				RANGE_CONDITION_ADD_START_ERROR : decoderDiv.html('<c:out value="${RANGE_CONDITION_ADD_START_ERROR_VAR}" />').text(),
 				<fmt:message key="authoring.fla.range.condition.add.end.error" var="RANGE_CONDITION_ADD_END_ERROR_VAR"/>
-				RANGE_CONDITION_ADD_END_ERROR : '<c:out value="${RANGE_CONDITION_ADD_END_ERROR_VAR}" />',
+				RANGE_CONDITION_ADD_END_ERROR : decoderDiv.html('<c:out value="${RANGE_CONDITION_ADD_END_ERROR_VAR}" />').text(),
 				<fmt:message key="authoring.fla.group.title.validation.erorr" var="GROUP_TITLE_VALIDATION_ERORR_VAR"/>
-				GROUP_TITLE_VALIDATION_ERORR : '<c:out value="${GROUP_TITLE_VALIDATION_ERORR_VAR}" />'
+				GROUP_TITLE_VALIDATION_ERORR : decoderDiv.html('<c:out value="${GROUP_TITLE_VALIDATION_ERORR_VAR}" />').text()
 			},
 			
 			isReadOnlyMode = false,
Index: lams_monitoring/web/monitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/monitor.jsp,v
diff -u -r1.27.2.7 -r1.27.2.8
--- lams_monitoring/web/monitor.jsp	28 Apr 2015 09:48:56 -0000	1.27.2.7
+++ lams_monitoring/web/monitor.jsp	28 Apr 2015 10:46:10 -0000	1.27.2.8
@@ -44,15 +44,16 @@
 			
 			LAMS_URL = '<lams:LAMSURL/>',
 			
+			decoderDiv = $('<div />'),
 			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 : decoderDiv.html('<c:out value="${FORCE_COMPLETE_CLICK_VAR}" />').text(),
 				<fmt:message key="button.force.complete" var="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 : decoderDiv.html('<c:out value="${FORCE_COMPLETE_END_LESSON_CONFIRM_VAR}" />').text(),
 				<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 : decoderDiv.html('<c:out value="${FORCE_COMPLETE_ACTIVITY_CONFIRM_VAR}" />').text(),
 				<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}" />',
 				<fmt:message key="force.complete.remove.content.yes" var="FORCE_COMPLETE_REMOVE_CONTENT_YES_VAR"/>
@@ -66,7 +67,7 @@
 				<fmt:message key="learner.group.show" var="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 : decoderDiv.html('<c:out value="${LEARNER_GROUP_REMOVE_PROGRESS_VAR}" />').text(),
 				<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}" />',
 				<fmt:message key="button.view.learner" var="VIEW_LEARNER_BUTTON_VAR"/>
@@ -86,17 +87,17 @@
 				<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}" />',
 				<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 : decoderDiv.html('<c:out value="${LESSON_PRESENCE_ENABLE_ALERT_VAR}" />').text(),
 				<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 : decoderDiv.html('<c:out value="${LESSON_PRESENCE_DISABLE_ALERT_VAR}" />').text(),
 				<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 : decoderDiv.html('<c:out value="${LESSON_IM_ENABLE_ALERT_VAR}" />').text(),
 				<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 : decoderDiv.html('<c:out value="${LESSON_IM_DISABLE_ALERT_VAR}" />').text(),
 				<fmt:message key="lesson.remove.alert" var="LESSON_REMOVE_ALERT_VAR"/>
-				LESSON_REMOVE_ALERT : '<c:out value="${LESSON_REMOVE_ALERT_VAR}" />',
+				LESSON_REMOVE_ALERT : decoderDiv.html('<c:out value="${LESSON_REMOVE_ALERT_VAR}" />').text(),
 				<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 : decoderDiv.html('<c:out value="${LESSON_REMOVE_DOUBLECHECK_ALERT_VAR}" />').text(),
 				<fmt:message key="lesson.state.created" var="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"/>
@@ -120,7 +121,7 @@
 				<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}" />',
 				<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 : decoderDiv.html('<c:out value="${LESSON_ERROR_SCHEDULE_DATE_VAR}" />').text(),
 				<fmt:message key="button.edit.class" var="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"/>
@@ -144,7 +145,7 @@
 			    <fmt:message key="button.timechart.tooltip" var="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 : decoderDiv.html('<c:out value="${LIVE_EDIT_CONFIRM_VAR}" />').text(),
 				<fmt:message key="lesson.task.gate" var="CONTRIBUTE_GATE_VAR"/>
 				CONTRIBUTE_GATE : '<c:out value="${CONTRIBUTE_GATE_VAR}" />',
 				<fmt:message key="lesson.task.grouping" var="CONTRIBUTE_GROUPING_VAR"/>
