Index: lams_tool_doku/web/common/taglibs.jsp
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -ree80ff0990f0cd62c18b96ac0b46c60670627da2
--- lams_tool_doku/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_doku/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision ee80ff0990f0cd62c18b96ac0b46c60670627da2)
@@ -5,4 +5,5 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-xml" prefix="x" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
\ No newline at end of file
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
\ No newline at end of file
Index: lams_tool_doku/web/pages/learning/galleryWalk.jsp
===================================================================
diff -u -r66aaa15469871d9f71cafcfc4222ffa90f2d9bb2 -ree80ff0990f0cd62c18b96ac0b46c60670627da2
--- lams_tool_doku/web/pages/learning/galleryWalk.jsp	(.../galleryWalk.jsp)	(revision 66aaa15469871d9f71cafcfc4222ffa90f2d9bb2)
+++ lams_tool_doku/web/pages/learning/galleryWalk.jsp	(.../galleryWalk.jsp)	(revision ee80ff0990f0cd62c18b96ac0b46c60670627da2)
@@ -51,12 +51,12 @@
 			//var for jquery.jRating.js
 		var pathToImageFolder = "${lams}images/css/",
 			//vars for rating.js
-			AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
-			YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
+			AVG_RATING_LABEL = '<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message></spring:escapeBody>',
+			YOUR_RATING_LABEL = '<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message></spring:escapeBody>',
 			MAX_RATES = 0,
 			MIN_RATES = 0,
 			COMMENTS_MIN_WORDS_LIMIT = 0,
-			COMMENT_TEXTAREA_TIP_LABEL = '<fmt:message key="label.comment.textarea.tip" />',
+			COMMENT_TEXTAREA_TIP_LABEL = '<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.comment.textarea.tip" /></spring:escapeBody>',
 			WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="warning.comment.blank"/>',
 			LAMS_URL = '${lams}',
 			COUNT_RATED_ITEMS = true,
Index: lams_tool_doku/web/pages/learning/learning.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -ree80ff0990f0cd62c18b96ac0b46c60670627da2
--- lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision ee80ff0990f0cd62c18b96ac0b46c60670627da2)
@@ -204,13 +204,13 @@
 					}
 				},
 				onExpiry: function(periods) {
-			        $.blockUI({ message: '<h1 id="timelimit-expired"><i class="fa fa-refresh fa-spin fa-1x fa-fw"></i> <fmt:message key="label.time.is.over" /></h1>' }); 
+			        $.blockUI({ message: '<h1 id="timelimit-expired"><i class="fa fa-refresh fa-spin fa-1x fa-fw"></i> <spring:escapeBody javaScriptEscape='true'><fmt:message key="label.time.is.over" /></spring:escapeBody></h1>' });
 			        
 			        setTimeout(function() { 
 			        	location.reload();
 			        }, 4000); 
 				},
-				description: "<div id='countdown-label'><fmt:message key='label.time.left' /></div>"
+				description: "<div id='countdown-label'><spring:escapeBody javaScriptEscape='true'><fmt:message key='label.time.left' /></spring:escapeBody></div>"
 			});
 		}
 	</script>
Index: lams_tool_doku/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r305246a229ea020cd0677daa6fc7953772f7ed54 -ree80ff0990f0cd62c18b96ac0b46c60670627da2
--- lams_tool_doku/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 305246a229ea020cd0677daa6fc7953772f7ed54)
+++ lams_tool_doku/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision ee80ff0990f0cd62c18b96ac0b46c60670627da2)
@@ -119,9 +119,9 @@
 		submissionDateString: '${submissionDateString}',
 		setSubmissionDeadlineUrl: '<c:url value="/monitoring/setSubmissionDeadline.do"/>?<csrf:token/>',
 		toolContentID: '<c:out value="${param.toolContentID}" />',
-		messageNotification: '<fmt:message key="monitor.summary.notification" />',
-		messageRestrictionSet: '<fmt:message key="monitor.summary.date.restriction.set" />',
-		messageRestrictionRemoved: '<fmt:message key="monitor.summary.date.restriction.removed" />'
+		messageNotification: '<spring:escapeBody javaScriptEscape='true'><fmt:message key="monitor.summary.notification" /></spring:escapeBody>',
+		messageRestrictionSet: '<spring:escapeBody javaScriptEscape='true'><fmt:message key="monitor.summary.date.restriction.set" /></spring:escapeBody>',
+		messageRestrictionRemoved: '<spring:escapeBody javaScriptEscape='true'><fmt:message key="monitor.summary.date.restriction.removed" /></spring:escapeBody>'
 	};
 </script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
@@ -140,8 +140,8 @@
 	//var for jquery.jRating.js
 	var pathToImageFolder = "${lams}images/css/",
 			//vars for rating.js
-			AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
-			YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
+			AVG_RATING_LABEL = '<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message></spring:escapeBody>',
+			YOUR_RATING_LABEL = '<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message></spring:escapeBody>',
 			MAX_RATES = 0,
 			MIN_RATES = 0,
 			LAMS_URL = '${lams}',
@@ -165,7 +165,7 @@
 
 			//block #buttons
 			$(this).block({
-				message: '<h4 style="color:#fff";><fmt:message key="label.pad.started.fixing" /></h4>',
+				message: '<h4 style="color:#fff";><spring:escapeBody javaScriptEscape='true'><fmt:message key="label.pad.started.fixing" /></spring:escapeBody></h4>',
 				baseZ: 1000000,
 				fadeIn: 0,
 				css: {
@@ -189,8 +189,8 @@
 				data : 'toolSessionID=' + toolSessionId,
 				type: 'post',
 				success: function (response) {
-					button.parent().html('<fmt:message key="label.pad.fixed" />');
-					alert('<fmt:message key="label.pad.fixed" />');
+					button.parent().html('<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.pad.fixed" /></spring:escapeBody>');
+					alert('<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.pad.fixed" /></spring:escapeBody>');
 				},
 				error: function (request, status, error) {
 					button.unblock();
@@ -267,7 +267,7 @@
 								.find('.copy-mark-value').text(mark);
 					},
 					error: function (request, status, error) {
-						alert('<fmt:message key="messsage.monitoring.learner.marks.update.fail" />');
+						alert('<spring:escapeBody javaScriptEscape='true'><fmt:message key="messsage.monitoring.learner.marks.update.fail" /></spring:escapeBody>');
 					}
 				});
 
@@ -349,7 +349,7 @@
 	}
 
 	function startGalleryWalk(){
-		if (!confirm('<fmt:message key="monitoring.summary.gallery.walk.start.confirm" />')) {
+		if (!confirm('<spring:escapeBody javaScriptEscape='true'><fmt:message key="monitoring.summary.gallery.walk.start.confirm" /></spring:escapeBody>')) {
 			return;
 		}
 
@@ -373,7 +373,7 @@
 	}
 
 	function finishGalleryWalk(){
-		if (!confirm('<fmt:message key="monitoring.summary.gallery.walk.finish.confirm" />')) {
+		if (!confirm('<spring:escapeBody javaScriptEscape='true'><fmt:message key="monitoring.summary.gallery.walk.finish.confirm" /></spring:escapeBody>')) {
 			return;
 		}
 
@@ -401,7 +401,7 @@
 	}
 
 	function enableGalleryWalkLearnerEdit(){
-		if (!confirm('<fmt:message key="monitoring.summary.gallery.walk.learner.edit.confirm" />')) {
+		if (!confirm('<spring:escapeBody javaScriptEscape='true'><fmt:message key="monitoring.summary.gallery.walk.learner.edit.confirm" /></spring:escapeBody>')) {
 			return;
 		}
 
Index: lams_tool_doku/web/pages/monitoring/summary5.jsp
===================================================================
diff -u -r305246a229ea020cd0677daa6fc7953772f7ed54 -ree80ff0990f0cd62c18b96ac0b46c60670627da2
--- lams_tool_doku/web/pages/monitoring/summary5.jsp	(.../summary5.jsp)	(revision 305246a229ea020cd0677daa6fc7953772f7ed54)
+++ lams_tool_doku/web/pages/monitoring/summary5.jsp	(.../summary5.jsp)	(revision ee80ff0990f0cd62c18b96ac0b46c60670627da2)
@@ -109,8 +109,8 @@
 	//var for jquery.jRating.js
 	var pathToImageFolder = "${lams}images/css/",
 			//vars for rating.js
-			AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
-			YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
+			AVG_RATING_LABEL = '<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message></spring:escapeBody>',
+			YOUR_RATING_LABEL = '<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message></spring:escapeBody>',
 			MAX_RATES = 0,
 			MIN_RATES = 0,
 			LAMS_URL = '${lams}',
@@ -134,7 +134,7 @@
 
 			//block #buttons
 			$(this).block({
-				message: '<h4 style="color:#fff";><fmt:message key="label.pad.started.fixing" /></h4>',
+				message: '<h4 style="color:#fff";><spring:escapeBody javaScriptEscape='true'><fmt:message key="label.pad.started.fixing" /></spring:escapeBody></h4>',
 				baseZ: 1000000,
 				fadeIn: 0,
 				css: {
@@ -158,8 +158,8 @@
 				data : 'toolSessionID=' + toolSessionId,
 				type: 'post',
 				success: function (response) {
-					button.parent().html('<fmt:message key="label.pad.fixed" />');
-					alert('<fmt:message key="label.pad.fixed" />');
+					button.parent().html('<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.pad.fixed" /></spring:escapeBody>');
+					alert('<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.pad.fixed" /></spring:escapeBody>');
 				},
 				error: function (request, status, error) {
 					button.unblock();
@@ -231,7 +231,7 @@
 					},
 					type: 'post',
 					error: function (request, status, error) {
-						alert('<fmt:message key="messsage.monitoring.learner.marks.update.fail" />');
+						alert('<spring:escapeBody javaScriptEscape='true'><fmt:message key="messsage.monitoring.learner.marks.update.fail" /></spring:escapeBody>');
 					}
 				});
 
@@ -311,7 +311,7 @@
 	});
 
 	function startGalleryWalk(){
-		if (!confirm('<fmt:message key="monitoring.summary.gallery.walk.start.confirm" />')) {
+		if (!confirm('<spring:escapeBody javaScriptEscape='true'><fmt:message key="monitoring.summary.gallery.walk.start.confirm" /></spring:escapeBody>')) {
 			return;
 		}
 
@@ -328,7 +328,7 @@
 	}
 
 	function finishGalleryWalk(){
-		if (!confirm('<fmt:message key="monitoring.summary.gallery.walk.finish.confirm" />')) {
+		if (!confirm('<spring:escapeBody javaScriptEscape='true'><fmt:message key="monitoring.summary.gallery.walk.finish.confirm" /></spring:escapeBody>')) {
 			return;
 		}
 
@@ -350,7 +350,7 @@
 
 
 	function enableGalleryWalkLearnerEdit(){
-		if (!confirm('<fmt:message key="monitoring.summary.gallery.walk.learner.edit.confirm" />')) {
+		if (!confirm('<spring:escapeBody javaScriptEscape='true'><fmt:message key="monitoring.summary.gallery.walk.learner.edit.confirm" /></spring:escapeBody>')) {
 			return;
 		}