Index: lams_admin/web/ldap.jsp
===================================================================
diff -u -r7b9b1931a178ac9bac070531b53731383df0a187 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_admin/web/ldap.jsp	(.../ldap.jsp)	(revision 7b9b1931a178ac9bac070531b53731383df0a187)
+++ lams_admin/web/ldap.jsp	(.../ldap.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -43,7 +43,7 @@
 	<input 
 		class="button" 
 		type="button" 
-		value='<fmt:message key="label.synchronise" />' 
+		value="<fmt:message key="label.synchronise" />" 
 		onclick='startSync();'
 	/>
 </p>
Index: lams_admin/web/organisation/list.jsp
===================================================================
diff -u -r6273b07b83ea6e3bebcdef62af37b990a8fe02e4 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_admin/web/organisation/list.jsp	(.../list.jsp)	(revision 6273b07b83ea6e3bebcdef62af37b990a8fe02e4)
+++ lams_admin/web/organisation/list.jsp	(.../list.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -36,10 +36,10 @@
 	<form>
 	
 	<div class="floatRight">
-		<input class="button" type="button" value='<fmt:message key="admin.user.create"/>' onclick=javascript:document.location='user.do?method=edit' />
-		<input class="button" type="button" value='<fmt:message key="admin.user.find"/>' onclick=javascript:document.location='usersearch.do' />
+		<input class="button" type="button" value="<fmt:message key="admin.user.create"/>" onclick=javascript:document.location='user.do?method=edit' />
+		<input class="button" type="button" value="<fmt:message key="admin.user.find"/>" onclick=javascript:document.location='usersearch.do' />
 		<logic:equal name="manageGlobalRoles" value="true">
-			<input class="button" type="button" value='<fmt:message key="admin.global.roles.manage" />' onclick=javascript:document.location='usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>' />
+			<input class="button" type="button" value="<fmt:message key="admin.global.roles.manage" />" onclick=javascript:document.location='usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>' />
 		</logic:equal>
 	</div>
 	<p style="padding-top:10px;"><c:out value="${numUsers}"/></p>
@@ -50,7 +50,7 @@
 				<c:param name="typeId" value="2" />
 				<c:param name="parentId" value="${OrgManageForm.parentId}" />
 			</c:url>
-			<input class="button" type="button" value='<fmt:message key="admin.course.add"/>' onclick=javascript:document.location='<c:out value="${editaction}"/>' />
+			<input class="button" type="button" value="<fmt:message key="admin.course.add"/>" onclick=javascript:document.location='<c:out value="${editaction}"/>' />
 		</logic:equal>
 	</div>
 	</form>
@@ -102,12 +102,12 @@
 	
 	<p>
 	<logic:equal name="editGroup" value="true">
-		<input class="button" type="button" value='<fmt:message key="admin.edit" /> <bean:write name="OrgManageForm" property="parentName"/>' onclick=javascript:document.location='organisation.do?method=edit&orgId=<c:out value="${OrgManageForm.parentId}"/>' />
+		<input class="button" type="button" value="<fmt:message key="admin.edit" /> <bean:write name="OrgManageForm" property="parentName"/>" onclick=javascript:document.location='organisation.do?method=edit&orgId=<c:out value="${OrgManageForm.parentId}"/>' />
 	</logic:equal>
 	</p>
 	
 	<div class="floatRight">
-		<input class="button" type="button" value='<fmt:message key="admin.user.manage" />' onclick=javascript:document.location='usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>' />
+		<input class="button" type="button" value="<fmt:message key="admin.user.manage" />" onclick=javascript:document.location='usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>' />
 	</div>
 	<p style="padding-top:10px;"><c:out value="${numUsers}"/></p>
 	
@@ -117,7 +117,7 @@
 			<c:param name="typeId" value="3" />
 			<c:param name="parentId" value="${OrgManageForm.parentId}" />
 		</c:url>
-		<input class="button" type="button" value='<fmt:message key="admin.class.add"/>' onclick=javascript:document.location='<c:out value="${createSubgroupLink}"/>' />
+		<input class="button" type="button" value="<fmt:message key="admin.class.add"/>" onclick=javascript:document.location='<c:out value="${createSubgroupLink}"/>' />
 	</div>
 	</form>
 	<html:form styleClass="indentPad" action="orgmanage.do" method="post">
@@ -169,12 +169,12 @@
 	
 	<p>
 	<logic:equal name="editGroup" value="true">
-		<input class="button" type="button" value='<fmt:message key="admin.edit" /> <bean:write name="OrgManageForm" property="parentName"/>' onclick=javascript:document.location='organisation.do?method=edit&orgId=<c:out value="${OrgManageForm.parentId}"/>' />
+		<input class="button" type="button" value="<fmt:message key="admin.edit" /> <bean:write name="OrgManageForm" property="parentName"/>" onclick=javascript:document.location='organisation.do?method=edit&orgId=<c:out value="${OrgManageForm.parentId}"/>' />
 	</logic:equal>
 	</p>
 	
 	<div class="floatRight">
-		<input class="button" type="button" value='<fmt:message key="admin.user.manage" />' onclick=javascript:document.location='usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>' />
+		<input class="button" type="button" value="<fmt:message key="admin.user.manage" />" onclick=javascript:document.location='usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>' />
 	</div>
 	<p style="padding-top:10px;"><c:out value="${numUsers}"/></p>
 	
Index: lams_admin/web/themeManagement.jsp
===================================================================
diff -u -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_admin/web/themeManagement.jsp	(.../themeManagement.jsp)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
+++ lams_admin/web/themeManagement.jsp	(.../themeManagement.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -32,7 +32,7 @@
 	}
 
 	function removeTheme(id, name, type) {
-		var answer = confirm('<fmt:message key="admin.themes.deleteConfirm" />')
+		var answer = confirm("<fmt:message key="admin.themes.deleteConfirm" />")
 		if (answer) {
 			document.getElementById("name").value = name;
 			document.getElementById("id").value = id;
@@ -52,13 +52,13 @@
 		var name = document.getElementById("name").value;
 
 		if (name == null || name == "") {
-			alert('<fmt:message key="admin.themes.nameAlreadyExists" />');
+			alert("<fmt:message key="admin.themes.nameAlreadyExists" />");
 			return;
 		}
 		
 		<c:forEach var="theme" items="${themes}" >
 			if (name == '${theme.name}') {
-				alert('<fmt:message key="admin.themes.nameAlreadyExists" />');
+				alert("<fmt:message key="admin.themes.nameAlreadyExists" />");
 				return;
 			}
 
@@ -130,16 +130,16 @@
 				<c:choose>
 					<c:when test="${not theme.notEditable}">
 						<img src="<lams:LAMSURL/>/images/edit.gif" 
-							title='<fmt:message key="admin.themes.edit" />'
+							title="<fmt:message key="admin.themes.edit" />"
 							onclick="editTheme('${theme.name}', '${theme.description}', '${theme.imageDirectory}', '${theme.themeId}', '${theme.currentDefaultTheme}', '${theme.type}')"
 						>
 						<img src="<lams:LAMSURL/>/images/cross.gif" 
-							title='<fmt:message key="admin.themes.remove" />'
+							title="<fmt:message key="admin.themes.remove" />"
 							onclick="removeTheme('${theme.themeId}', '${theme.name}', '${theme.type}')"
 						>
 					</c:when>
 					<c:otherwise>
-						<a href="javascript:setAsDefault('${theme.name}')" class="button" title='<fmt:message key="admin.themes.makeThemeDefault"/>'>
+						<a href="javascript:setAsDefault('${theme.name}')" class="button" title="<fmt:message key="admin.themes.makeThemeDefault"/>">
 							<fmt:message key="admin.themes.makeDefault" />
 						</a>
 					</c:otherwise>
Index: lams_admin/web/userlist.jsp
===================================================================
diff -u -r395688ee7ba729fee50566d7ef27348a3591404d -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 395688ee7ba729fee50566d7ef27348a3591404d)
+++ lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -87,12 +87,12 @@
 <form>
 	
 <p>
-	<input class="button" type="button" value='<fmt:message key="admin.user.add"/>' onclick=javascript:document.location='userorg.do?orgId=<bean:write name="UserManageForm" property="orgId"/>' />
+	<input class="button" type="button" value="<fmt:message key="admin.user.add"/>" onclick=javascript:document.location='userorg.do?orgId=<bean:write name="UserManageForm" property="orgId"/>' />
 </p>
 
 <div class="floatRight">
 	<logic:equal name="UserManageForm" property="courseAdminCanAddNewUsers" value="true">
-		<input class="button" type="button" value='<fmt:message key="admin.user.create"/>' onclick=javascript:document.location='user.do?method=edit&orgId=<bean:write name="UserManageForm" property="orgId"/>' />
+		<input class="button" type="button" value="<fmt:message key="admin.user.create"/>" onclick=javascript:document.location='user.do?method=edit&orgId=<bean:write name="UserManageForm" property="orgId"/>' />
 	</logic:equal>
 </div>
 <p style="padding-top:10px;">
Index: lams_admin/web/userorg.jsp
===================================================================
diff -u -ra28f5536eff37032e8f8977f9ee43dee3f515887 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision a28f5536eff37032e8f8977f9ee43dee3f515887)
+++ lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -23,12 +23,12 @@
 	
 	function updateExistingTotal() {
 		var size = jQuery("li", "#existing").size();
-		jQuery("span#totalUsers").text('<fmt:message key="label.number.of.users"><fmt:param>'+size+'</fmt:param></fmt:message>');
+		jQuery("span#totalUsers").text("<fmt:message key="label.number.of.users"><fmt:param>"+size+"</fmt:param></fmt:message>");
 	}
 	
 	function updatePotentialTotal() {
 		var size = jQuery("li", "#potential").size();
-		jQuery("span#potentialUsers").text('<fmt:message key="label.number.of.potential.users"><fmt:param>'+size+'</fmt:param></fmt:message>');
+		jQuery("span#potentialUsers").text("<fmt:message key="label.number.of.potential.users"><fmt:param>"+size+"</fmt:param></fmt:message>");
 	}
 	
 	function bindRemoveLink() {
Index: lams_admin/web/usersearchlist.jsp
===================================================================
diff -u -r6dade094470f5df866a43be6245686e225a7c4ef -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 6dade094470f5df866a43be6245686e225a7c4ef)
+++ lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -27,7 +27,7 @@
 </div>
 
 <p align="right">
-	<input class="button" type="button" value='<fmt:message key="admin.user.create"/>' onclick=javascript:document.location='user.do?method=edit' />
+	<input class="button" type="button" value="<fmt:message key="admin.user.create"/>" onclick=javascript:document.location='user.do?method=edit' />
 </p>
 
 <p align="right">
Index: lams_central/web/forgotPassword.jsp
===================================================================
diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_central/web/forgotPassword.jsp	(.../forgotPassword.jsp)	(revision acc8d2acf5b6b0002e0c8129947040a779ab4077)
+++ lams_central/web/forgotPassword.jsp	(.../forgotPassword.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -28,7 +28,7 @@
                 var login = document.forgotForm.login.value;
                 if (login == null || login=="")
 	            {
-	                alert('<fmt:message key="error.forgot.password.username" />');
+	                alert("<fmt:message key="error.forgot.password.username" />");
 	                return false;
 	            }
 	            else
@@ -44,12 +44,12 @@
                
                 if (email == null || email=="")
                 {
-                    alert('<fmt:message key="error.forgot.password.email" />');
+                    alert("<fmt:message key="error.forgot.password.email" />");
                     return false;
                 }
                 else if (!filter.test(email)) 
                 {
-                    alert('<fmt:message key="error.valid.email.required" />');
+                    alert("<fmt:message key="error.valid.email.required" />");
                     return false;
                 }
                 else
Index: lams_central/web/forgotPasswordChange.jsp
===================================================================
diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_central/web/forgotPasswordChange.jsp	(.../forgotPasswordChange.jsp)	(revision acc8d2acf5b6b0002e0c8129947040a779ab4077)
+++ lams_central/web/forgotPasswordChange.jsp	(.../forgotPasswordChange.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -32,11 +32,11 @@
             
             if (pass == null || pass=="" || passConfirm == null || passConfirm =="")
             {
-                alert('<fmt:message key="error.forgot.password.fields" />');
+                alert("<fmt:message key="error.forgot.password.fields" />");
             }
             else if (pass != passConfirm)
             {
-                alert('<fmt:message key="error.newpassword.mismatch" />');
+                alert("<fmt:message key="error.newpassword.mismatch" />");
             }
             else
             {
Index: lams_central/web/main.jsp
===================================================================
diff -u -rb576ec837a4c8f685d38140ac52362fe98acf89e -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_central/web/main.jsp	(.../main.jsp)	(revision b576ec837a4c8f685d38140ac52362fe98acf89e)
+++ lams_central/web/main.jsp	(.../main.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -61,11 +61,11 @@
 			});
 		
 			function getEnableSortingText() {
-				return '<fmt:message key="label.enable.lesson.sorting"/>';
+				return "<fmt:message key="label.enable.lesson.sorting"/>";
 			}
 			
 			function getSortingEnabledText() {
-				return '<fmt:message key="label.lesson.sorting.enabled"/>';
+				return "<fmt:message key="label.lesson.sorting.enabled"/>";
 			}
 			
 			function refresh(){
@@ -165,7 +165,7 @@
 								<div class="float-right">
 									<c:if test="${not empty adminLinks}">
 										<c:forEach var="adminlink" items="${adminLinks}">
-											<a title='<fmt:message key="${adminlink.name}"/>' href='<c:out value="${adminlink.url}"/>'><fmt:message key="${adminlink.name}"/></a> | 
+											<a title="<fmt:message key="${adminlink.name}"/>" href='<c:out value="${adminlink.url}"/>'><fmt:message key="${adminlink.name}"/></a> | 
 										</c:forEach>
 									</c:if>
 									<a title="<fmt:message key="index.refresh.hint"/>" href="javascript:refresh()">
Index: lams_central/web/tutorialVideo.jsp
===================================================================
diff -u -r2f5473044ec01bd94a2ea8e5262b2a200f1e6da6 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_central/web/tutorialVideo.jsp	(.../tutorialVideo.jsp)	(revision 2f5473044ec01bd94a2ea8e5262b2a200f1e6da6)
+++ lams_central/web/tutorialVideo.jsp	(.../tutorialVideo.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -30,7 +30,7 @@
 			 	}
 			 	else {
 			 		if ($("#doNotShowAgain").attr("checked")){
-			 			alert('<fmt:message key="label.tutorial.disable.single" />');
+			 			alert("<fmt:message key="label.tutorial.disable.single" />");
 			 			
 				 		$.ajax({		
 							type: "GET",
Index: lams_gradebook/web/gradebookCourseLearner.jsp
===================================================================
diff -u -rea79f29aed5c764a223234e456442bc1e49fcf85 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_gradebook/web/gradebookCourseLearner.jsp	(.../gradebookCourseLearner.jsp)	(revision ea79f29aed5c764a223234e456442bc1e49fcf85)
+++ lams_gradebook/web/gradebookCourseLearner.jsp	(.../gradebookCourseLearner.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -47,16 +47,16 @@
 			    rowNum:10,
 			    colNames:[
 			    	'', 
-			    	'<fmt:message key="gradebook.columntitle.lessonName"/>', 
-			    	'<fmt:message key="gradebook.columntitle.subGroup"/>', 
-			    	'<fmt:message key="gradebook.columntitle.progress"/>', 
-			    	'<fmt:message key="gradebook.columntitle.lessonFeedback"/>', 
-			    	'<fmt:message key="gradebook.columntitle.startDate"/>', 
-			    	'<fmt:message key="gradebook.columntitle.completeDate"/>', 
-			    	'<fmt:message key="gradebook.columntitle.averageTimeTaken"/>', 
-			    	'<fmt:message key="gradebook.columntitle.timeTaken"/>', 
-			    	'<fmt:message key="gradebook.columntitle.averageMark"/>', 
-			    	'<fmt:message key="gradebook.columntitle.mark"/>'],
+			    	"<fmt:message key="gradebook.columntitle.lessonName"/>", 
+			    	"<fmt:message key="gradebook.columntitle.subGroup"/>", 
+			    	"<fmt:message key="gradebook.columntitle.progress"/>", 
+			    	"<fmt:message key="gradebook.columntitle.lessonFeedback"/>", 
+			    	"<fmt:message key="gradebook.columntitle.startDate"/>", 
+			    	"<fmt:message key="gradebook.columntitle.completeDate"/>", 
+			    	"<fmt:message key="gradebook.columntitle.averageTimeTaken"/>", 
+			    	"<fmt:message key="gradebook.columntitle.timeTaken"/>", 
+			    	"<fmt:message key="gradebook.columntitle.averageMark"/>", 
+			    	"<fmt:message key="gradebook.columntitle.mark"/>"],
 			    colModel:[
 			      {name:'id', index:'id', sortable:false, editable:false, hidden:true, search:false, hidedlg:true},
 			      {name:'rowName',index:'rowName', sortable:true, editable:false},
@@ -72,7 +72,7 @@
 			    ],
 			    loadError: function(xhr,st,err) {
 			    	jQuery("#organisationGrid").clearGridData();
-			    	info_dialog('<fmt:message key="label.error"/>', '<fmt:message key="gradebook.error.loaderror"/>', '<fmt:message key="label.ok"/>');
+			    	info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="gradebook.error.loaderror"/>", "<fmt:message key="label.ok"/>");
 			    },
 			    subGrid: true,
 				subGridRowExpanded: function(subgrid_id, row_id) {
@@ -91,13 +91,13 @@
 							 rowNum:10,
 						     colNames: [
 						     	'',
-						     	'<fmt:message key="gradebook.columntitle.activity"/>',
-						     	'<fmt:message key="gradebook.columntitle.progress"/>', 
-						     	'<fmt:message key="gradebook.columntitle.activityFeedback"/>', 
-						     	'<fmt:message key="gradebook.columntitle.averageTimeTaken"/>', 
-						     	'<fmt:message key="gradebook.columntitle.timeTaken"/>', 
-						     	'<fmt:message key="gradebook.columntitle.averageMark"/>', 
-						     	'<fmt:message key="gradebook.columntitle.mark"/>'
+						     	"<fmt:message key="gradebook.columntitle.activity"/>",
+						     	"<fmt:message key="gradebook.columntitle.progress"/>", 
+						     	"<fmt:message key="gradebook.columntitle.activityFeedback"/>", 
+						     	"<fmt:message key="gradebook.columntitle.averageTimeTaken"/>", 
+						     	"<fmt:message key="gradebook.columntitle.timeTaken"/>", 
+						     	"<fmt:message key="gradebook.columntitle.averageMark"/>", 
+						     	"<fmt:message key="gradebook.columntitle.mark"/>"
 						     ],
 						     colModel: [
 						       	{name:'id', index:'id', sortable:false, hidden:true, hidedlg:true},
@@ -111,7 +111,7 @@
 						     ],
 						     loadError: function(xhr,st,err) {
 						    	jQuery("#"+subgrid_table_id).clearGridData();
-						    	info_dialog('<fmt:message key="label.error"/>', '<fmt:message key="gradebook.error.loaderror"/>', '<fmt:message key="label.ok"/>');
+						    	info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="gradebook.error.loaderror"/>", "<fmt:message key="label.ok"/>");
 						     },
 							 gridComplete: function(){
 							 	toolTip($(".jqgrow"));
Index: lams_gradebook/web/gradebookCourseMonitor.jsp
===================================================================
diff -u -rea79f29aed5c764a223234e456442bc1e49fcf85 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_gradebook/web/gradebookCourseMonitor.jsp	(.../gradebookCourseMonitor.jsp)	(revision ea79f29aed5c764a223234e456442bc1e49fcf85)
+++ lams_gradebook/web/gradebookCourseMonitor.jsp	(.../gradebookCourseMonitor.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -46,11 +46,11 @@
 			    rowNum:10,
 				colNames:[
 					'', 
-					'<fmt:message key="gradebook.columntitle.lessonName"/>', 
-					'<fmt:message key="gradebook.columntitle.subGroup"/>', 
-					'<fmt:message key="gradebook.columntitle.startDate"/>', 
-					'<fmt:message key="gradebook.columntitle.averageTimeTaken"/>', 
-			    	'<fmt:message key="gradebook.columntitle.averageMark"/>'
+					"<fmt:message key="gradebook.columntitle.lessonName"/>", 
+					"<fmt:message key="gradebook.columntitle.subGroup"/>", 
+					"<fmt:message key="gradebook.columntitle.startDate"/>", 
+					"<fmt:message key="gradebook.columntitle.averageTimeTaken"/>", 
+			    	"<fmt:message key="gradebook.columntitle.averageMark"/>"
 				],
 			    colModel:[
 			      {name:'id', index:'id', sortable:false, editable:false, hidden:true, search:false, hidedlg:true},
@@ -62,7 +62,7 @@
 			    ],
 			    loadError: function(xhr,st,err) {
 			    	jQuery("#organisationGrid").clearGridData();
-			    	info_dialog('<fmt:message key="label.error"/>', '<fmt:message key="gradebook.error.loaderror"/>', '<fmt:message key="label.ok"/>');
+			    	info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="gradebook.error.loaderror"/>", "<fmt:message key="label.ok"/>");
 			    },
 			    subGrid: true,
 				subGridRowExpanded: function(subgrid_id, row_id) {
@@ -85,11 +85,11 @@
 						 rowNum:10,
 					     colNames: [
 					     	'',
-					     	'<fmt:message key="gradebook.columntitle.learnerName"/>',
-					     	'<fmt:message key="gradebook.columntitle.progress"/>', 
-					     	'<fmt:message key="gradebook.columntitle.timeTaken"/>', 
-					     	'<fmt:message key="gradebook.columntitle.lessonFeedback"/>', 
-			    			'<fmt:message key="gradebook.columntitle.mark"/>'
+					     	"<fmt:message key="gradebook.columntitle.learnerName"/>",
+					     	"<fmt:message key="gradebook.columntitle.progress"/>", 
+					     	"<fmt:message key="gradebook.columntitle.timeTaken"/>", 
+					     	"<fmt:message key="gradebook.columntitle.lessonFeedback"/>", 
+			    			"<fmt:message key="gradebook.columntitle.mark"/>"
 					     ],
 					     colModel:[
 					     	{name:'id', index:'id', sortable:false, editable:false, hidden:true, search:false, hidedlg:true},
@@ -101,7 +101,7 @@
 					     ],
 					     loadError: function(xhr,st,err) {
 				    		jQuery("#"+subgrid_table_id).clearGridData();
-				    		info_dialog('<fmt:message key="label.error"/>', '<fmt:message key="gradebook.error.loaderror"/>', '<fmt:message key="label.ok"/>');
+				    		info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="gradebook.error.loaderror"/>", "<fmt:message key="label.ok"/>");
 				    	 },
 					     afterSaveCell: function(rowid, cellname,value, iRow, iCol) {
 					     	
Index: lams_gradebook/web/gradebookMonitor.jsp
===================================================================
diff -u -r2f21856ec2ab85b47c93cfcc3fa2c8769be65077 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_gradebook/web/gradebookMonitor.jsp	(.../gradebookMonitor.jsp)	(revision 2f21856ec2ab85b47c93cfcc3fa2c8769be65077)
+++ lams_gradebook/web/gradebookMonitor.jsp	(.../gradebookMonitor.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -37,9 +37,9 @@
 			
 			var conf;
 			if (marksReleased) {
-				conf = confirm('<fmt:message key="gradebook.monitor.releasemarks.check2"/>');
+				conf = confirm("<fmt:message key="gradebook.monitor.releasemarks.check2"/>");
 			} else {
-				conf = confirm('<fmt:message key="gradebook.monitor.releasemarks.check"/>');
+				conf = confirm("<fmt:message key="gradebook.monitor.releasemarks.check"/>");
 			}
 			
 			if (conf) {
@@ -55,7 +55,7 @@
 			    		displayReleaseOption();
 			    	} else {
 			    		
-			    		info_dialog('<fmt:message key="label.error"/>', '<fmt:message key="error.releasemarks.fail"/>', '<fmt:message key="label.ok"/>');
+			    		info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="error.releasemarks.fail"/>", "<fmt:message key="label.ok"/>");
 			    	}
 			    });
 		    }
@@ -77,7 +77,7 @@
 			
 			// Create the user view grid with sub grid for activities	
 			jQuery("#userView").jqGrid({
-				caption: '<fmt:message key="gradebook.gridtitle.usergrid"/>',
+				caption: "<fmt:message key="gradebook.gridtitle.usergrid"/>",
 			    datatype: "xml",
 			    url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getUserGridData&view=monUserView&lessonID=${lessonDetails.lessonID}",
 			    height: "100%",
@@ -92,11 +92,11 @@
 			    rowNum:10,
 				cellurl: "<lams:LAMSURL />/gradebook/gradebookMonitoring.do?dispatch=updateUserLessonGradebookData&lessonID=${lessonDetails.lessonID}",
 			    colNames:["", 
-			    	'<fmt:message key="gradebook.columntitle.name"/>', 
-			    	'<fmt:message key="gradebook.columntitle.progress"/>', 
-			    	'<fmt:message key="gradebook.columntitle.timeTaken"/>', 
-			    	'<fmt:message key="gradebook.columntitle.lessonFeedback"/>', 
-			    	'<fmt:message key="gradebook.columntitle.mark"/>'
+			    	"<fmt:message key="gradebook.columntitle.name"/>", 
+			    	"<fmt:message key="gradebook.columntitle.progress"/>", 
+			    	"<fmt:message key="gradebook.columntitle.timeTaken"/>", 
+			    	"<fmt:message key="gradebook.columntitle.lessonFeedback"/>", 
+			    	"<fmt:message key="gradebook.columntitle.mark"/>"
 			    ],
 			    colModel:[
 			      {name:'id', index:'id', sortable:false, editable:false, hidden:true, search:false, hidedlg:true},
@@ -108,7 +108,7 @@
 			    ],
 			    loadError: function(xhr,st,err) {
 			    	jQuery("#userView").clearGridData();
-			    	info_dialog('<fmt:message key="label.error"/>', '<fmt:message key="gradebook.error.loaderror"/>', '<fmt:message key="label.ok"/>');
+			    	info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="gradebook.error.loaderror"/>", "<fmt:message key="label.ok"/>");
 			    },
 			    subGrid: true,
 				subGridRowExpanded: function(subgrid_id, row_id) {
@@ -130,13 +130,13 @@
 						     colNames: [
 						     	'',
 						     	'',
-						     	'<fmt:message key="gradebook.columntitle.activity"/>',
-						     	'<fmt:message key="gradebook.columntitle.progress"/>',
-						     	'<fmt:message key="gradebook.columntitle.outputs"/>', 
-						     	'<fmt:message key="gradebook.columntitle.competences"/>', 
-						     	'<fmt:message key="gradebook.columntitle.timeTaken"/>', 
-						     	'<fmt:message key="gradebook.columntitle.activityFeedback"/>', 
-						     	'<fmt:message key="gradebook.columntitle.mark"/>'
+						     	"<fmt:message key="gradebook.columntitle.activity"/>",
+						     	"<fmt:message key="gradebook.columntitle.progress"/>",
+						     	"<fmt:message key="gradebook.columntitle.outputs"/>", 
+						     	"<fmt:message key="gradebook.columntitle.competences"/>", 
+						     	"<fmt:message key="gradebook.columntitle.timeTaken"/>", 
+						     	"<fmt:message key="gradebook.columntitle.activityFeedback"/>", 
+						     	"<fmt:message key="gradebook.columntitle.mark"/>"
 						     ],
 						     colModel: [
 						       	{name:'id', index:'id', sortable:false, hidden:true, hidedlg:true},
@@ -151,7 +151,7 @@
 						     ],
 						     loadError: function(xhr,st,err) {
 						    	jQuery("#"+subgrid_table_id).clearGridData();
-						    	info_dialog('<fmt:message key="label.error"/>', '<fmt:message key="gradebook.error.loaderror"/>', '<fmt:message key="label.ok"/>');
+						    	info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="gradebook.error.loaderror"/>", "<fmt:message key="label.ok"/>");
 						     },
 						     formatCell: function(rowid, cellname,value, iRow, iCol) {
 					    	 	if (cellname == "mark") {
@@ -191,7 +191,7 @@
 					    	 		var currRowData = jQuery("#"+subgrid_table_id).getRowData(rowid);
 						     		if (currRowData['marksAvailable'] != null && currRowData['marksAvailable'] != "") {
 						     			if (parseFloat(value) > parseFloat(currRowData['marksAvailable'])){
-						     				info_dialog('<fmt:message key="label.error"/>', '<fmt:message key="error.markhigher"/>', '<fmt:message key="label.ok"/>');
+						     				info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="error.markhigher"/>", "<fmt:message key="label.ok"/>");
 						     				jQuery("#"+subgrid_table_id).restoreCell( iRow, iCol);
 						     				throw("Mark must be lower than maximum mark");
 						     			}
@@ -219,7 +219,7 @@
 						     	}
 						     },
 						     errorCell: function(serverresponse, status) {
-						     	info_dialog('<fmt:message key="label.error"/>', '<fmt:message key="error.cellsave"/>', '<fmt:message key="label.ok"/>');
+						     	info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="error.cellsave"/>", "<fmt:message key="label.ok"/>");
 						     },
 							 gridComplete: function(){
 							 	toolTip($(".jqgrow"));
@@ -266,7 +266,7 @@
 				
 				// Creating activity view with sub learner view
 				jQuery("#activityView").jqGrid({
-					caption: '<fmt:message key="gradebook.gridtitle.activitygrid"/>',
+					caption: "<fmt:message key="gradebook.gridtitle.activitygrid"/>",
 				    datatype: "xml",
 				    url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getActivityGridData&view=monActivityView&lessonID=${lessonDetails.lessonID}",
 				    height: "100%",
@@ -280,10 +280,10 @@
 				    colNames:[
 				    	'', 
 				    	'',
-				    	'<fmt:message key="gradebook.columntitle.name"/>', 
-				    	'<fmt:message key="gradebook.columntitle.averageTimeTaken"/>', 
-				    	'<fmt:message key="gradebook.columntitle.competences"/>', 
-				    	'<fmt:message key="gradebook.columntitle.averageMark"/>'
+				    	"<fmt:message key="gradebook.columntitle.name"/>", 
+				    	"<fmt:message key="gradebook.columntitle.averageTimeTaken"/>", 
+				    	"<fmt:message key="gradebook.columntitle.competences"/>", 
+				    	"<fmt:message key="gradebook.columntitle.averageMark"/>"
 				    ],
 				    colModel:[
 				      {name:'id', index:'id', sortable:false, hidden:true, hidedlg:true},
@@ -295,7 +295,7 @@
 				    ],
 				    loadError: function(xhr,st,err) {
 			    		jQuery("#activityView").clearGridData();
-			    		info_dialog('<fmt:message key="label.error"/>', '<fmt:message key="gradebook.error.loaderror"/>', '<fmt:message key="label.ok"/>');
+			    		info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="gradebook.error.loaderror"/>", "<fmt:message key="label.ok"/>");
 			    	},
 				    imgpath: '<lams:LAMSURL />includes/javascript/jqgrid/themes/basic/images',
 				    subGrid: true,
@@ -322,12 +322,12 @@
 						     colNames: [
 						     	'',
 						     	'',
-						     	'<fmt:message key="gradebook.columntitle.name"/>',
-						     	'<fmt:message key="gradebook.columntitle.progress"/>', 
-						     	'<fmt:message key="gradebook.columntitle.timeTaken"/>', 
-						     	'<fmt:message key="gradebook.columntitle.outputs"/>', 
-						     	'<fmt:message key="gradebook.columntitle.activityFeedback"/>', 
-						     	'<fmt:message key="gradebook.columntitle.mark"/>'
+						     	"<fmt:message key="gradebook.columntitle.name"/>",
+						     	"<fmt:message key="gradebook.columntitle.progress"/>", 
+						     	"<fmt:message key="gradebook.columntitle.timeTaken"/>", 
+						     	"<fmt:message key="gradebook.columntitle.outputs"/>", 
+						     	"<fmt:message key="gradebook.columntitle.activityFeedback"/>", 
+						     	"<fmt:message key="gradebook.columntitle.mark"/>"
 						     ],
 						     colModel:[
 						     	{name:'id', index:'id', sortable:false, editable:false, hidden:true, search:false, hidedlg:true},
@@ -341,7 +341,7 @@
 						     ],
 						     loadError: function(xhr,st,err) {
 					    		jQuery("#"+subgrid_table_id).clearGridData();
-					    		info_dialog('<fmt:message key="label.error"/>', '<fmt:message key="gradebook.error.loaderror"/>', '<fmt:message key="label.ok"/>');
+					    		info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="gradebook.error.loaderror"/>", "<fmt:message key="label.ok"/>");
 					    	 },
 					    	 formatCell: function(rowid, cellname,value, iRow, iCol) {
 					    	 	if (cellname == "mark") {
@@ -381,7 +381,7 @@
 					    	 		var currRowData = jQuery("#"+subgrid_table_id).getRowData(rowid);
 						     		if (currRowData['marksAvailable'] != null && currRowData['marksAvailable'] != "") {
 						     			if (parseFloat(value) > parseFloat(currRowData['marksAvailable'])){
-						     				info_dialog('<fmt:message key="label.error"/>', '<fmt:message key="error.markhigher"/>', '<fmt:message key="label.ok"/>');
+						     				info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="error.markhigher"/>", "<fmt:message key="label.ok"/>");
 						     				jQuery("#"+subgrid_table_id).restoreCell( iRow, iCol);
 						     				throw("Mark must be lower than maximum mark");
 						     			}
@@ -405,7 +405,7 @@
 						     	}
 						     },
 						     errorCell: function(serverresponse, status) {
-						     	info_dialog('<fmt:message key="label.error"/>', '<fmt:message key="error.cellsave"/>', '<fmt:message key="label.ok"/>');
+						     	info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="error.cellsave"/>", "<fmt:message key="label.ok"/>");
 						     },
 							 gridComplete: function(){
 							 	toolTip($(".jqgrow"));	// applying tooltips for this grid
@@ -442,7 +442,7 @@
 				// Enable show/hide columns
 				jQuery("#activityView").navButtonAdd('#activityViewPager',{
 					caption: "",
-					title: '<fmt:message key="gradebook.function.window.showColumns"/>',
+					title: "<fmt:message key="gradebook.function.window.showColumns"/>",
 					buttonimg:"<lams:LAMSURL />images/table_edit.png", 
 					onClickButton: function(){
 						jQuery("#activityView").setColumns();
Index: lams_gradebook/web/includes/jsp/jqGridIncludes.jsp
===================================================================
diff -u -rea79f29aed5c764a223234e456442bc1e49fcf85 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_gradebook/web/includes/jsp/jqGridIncludes.jsp	(.../jqGridIncludes.jsp)	(revision ea79f29aed5c764a223234e456442bc1e49fcf85)
+++ lams_gradebook/web/includes/jsp/jqGridIncludes.jsp	(.../jqGridIncludes.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -39,7 +39,7 @@
 	    processData: "Processing...",
 	    msg: {
 	        required:"Field is required",
-	        number:'<fmt:message key="gradebook.function.error.enterNumber"/>',
+	        number:"<fmt:message key="gradebook.function.error.enterNumber"/>",
 	        minValue:"value must be greater than or equal to ",
 	        maxValue:"value must be less than or equal to",
 	        email: "is not a valid e-mail",
@@ -50,27 +50,27 @@
 	
 	// search entries
 	$.jgrid.search = {
-		    caption: '<fmt:message key="gradebook.function.search.title"/>',
-		    Find: '<fmt:message key="label.find"/>',
-		    Reset: '<fmt:message key="label.reset"/>',
+		    caption: "<fmt:message key="gradebook.function.search.title"/>",
+		    Find: "<fmt:message key="label.find"/>",
+		    Reset: "<fmt:message key="label.reset"/>",
 		    odata : [
-		    	'<fmt:message key="gradebook.function.search.equalTo"/>', 
-		    	'<fmt:message key="gradebook.function.search.notEqualTo"/>', 
+		    	"<fmt:message key="gradebook.function.search.equalTo"/>", 
+		    	"<fmt:message key="gradebook.function.search.notEqualTo"/>", 
 		    	'less', 
 		    	'less or equal',
 		    	'greater',
 		    	'greater or equal', 
-		    	'<fmt:message key="gradebook.function.search.startsWith"/>',
-		    	'<fmt:message key="gradebook.function.search.endsWith"/>',
-		    	'<fmt:message key="gradebook.function.search.contains"/>' 
+		    	"<fmt:message key="gradebook.function.search.startsWith"/>",
+		    	"<fmt:message key="gradebook.function.search.endsWith"/>",
+		    	"<fmt:message key="gradebook.function.search.contains"/>" 
 		    ]
 	};
 	
 	// setcolumns module
 	$.jgrid.col ={
-	    caption: '<fmt:message key="gradebook.function.window.showColumns"/>',
-	    bSubmit: '<fmt:message key="label.ok"/>',
-	    bCancel: '<fmt:message key="label.cancel"/>'
+	    caption: "<fmt:message key="gradebook.function.window.showColumns"/>",
+	    bSubmit: "<fmt:message key="label.ok"/>",
+	    bCancel: "<fmt:message key="label.cancel"/>"
 	};
 	
 	// ---------------------------------------------------------------------
Index: lams_monitoring/web/errorbox.jsp
===================================================================
diff -u -re68fa47bb59bec7d651852d0bc0458bd96fca379 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_monitoring/web/errorbox.jsp	(.../errorbox.jsp)	(revision e68fa47bb59bec7d651852d0bc0458bd96fca379)
+++ lams_monitoring/web/errorbox.jsp	(.../errorbox.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -13,7 +13,7 @@
 <logic:present name="<%=Globals.ERROR_KEY%>">
 <tr>
 	<td width="10%"  align="right" >
-		<img src="<%=rootPath%>/images/error.jpg" alt='<fmt:message key="error.title"/>'/>
+		<img src="<%=rootPath%>/images/error.jpg" alt="<fmt:message key="error.title"/>"/>
 	</td>
 	<td width="90%" valign="center" class="body" colspan="2">
 		<html:errors/>
Index: lams_tool_assessment/web/pages/authoring/basic.jsp
===================================================================
diff -u -r8c36fe00146d9eebf2c071d742e908ab419168c3 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 8c36fe00146d9eebf2c071d742e908ab419168c3)
+++ lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -8,7 +8,7 @@
 	//The panel of assessment list panel
 	var questionListTargetDiv = "#questionListArea";
 	function deleteQuestion(idx,sessionMapID){
-		var	deletionConfirmed = confirm('<fmt:message key="warning.msg.authoring.do.you.want.to.delete"></fmt:message>');
+		var	deletionConfirmed = confirm("<fmt:message key="warning.msg.authoring.do.you.want.to.delete"></fmt:message>");
 
 		if (deletionConfirmed) {
 			var url = "<c:url value="/authoring/removeQuestion.do"/>";
Index: lams_tool_assessment/web/pages/export/parts/exportlearner.jsp
===================================================================
diff -u -r6e6db32c93f144dc842f21601eb37745cdd7ca60 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_assessment/web/pages/export/parts/exportlearner.jsp	(.../exportlearner.jsp)	(revision 6e6db32c93f144dc842f21601eb37745cdd7ca60)
+++ lams_tool_assessment/web/pages/export/parts/exportlearner.jsp	(.../exportlearner.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -26,10 +26,10 @@
 	  					width: 500,
 	  					shrinkToFit: true,
 	  					
-	  				   	colNames:['<fmt:message key="label.monitoring.user.summary.attempt" />',
-	  							'<fmt:message key="label.monitoring.user.summary.time" />',
-	  							'<fmt:message key="label.monitoring.user.summary.response" />',
-	  						    '<fmt:message key="label.monitoring.user.summary.grade" />'],
+	  				   	colNames:["<fmt:message key="label.monitoring.user.summary.attempt" />",
+	  							"<fmt:message key="label.monitoring.user.summary.time" />",
+	  							"<fmt:message key="label.monitoring.user.summary.response" />",
+	  						    "<fmt:message key="label.monitoring.user.summary.grade" />"],
 	  						    
 	  				   	colModel:[
 	  				   		{name:'id', index:'id', width:55, sorttype:"int"},
Index: lams_tool_assessment/web/pages/export/parts/exportteacher.jsp
===================================================================
diff -u -r6e6db32c93f144dc842f21601eb37745cdd7ca60 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_assessment/web/pages/export/parts/exportteacher.jsp	(.../exportteacher.jsp)	(revision 6e6db32c93f144dc842f21601eb37745cdd7ca60)
+++ lams_tool_assessment/web/pages/export/parts/exportteacher.jsp	(.../exportteacher.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -28,11 +28,11 @@
 	  					shrinkToFit: false,
 	  					
 	  				   	colNames:['#',
-	  							'<fmt:message key="label.monitoring.summary.user.name" />',
+	  							"<fmt:message key="label.monitoring.summary.user.name" />",
 	  				   	        <c:forEach var="question" items="${assessment.questions}">
 	  				   	     		"${question.title}", 
 	  				   	        </c:forEach>
-	  						    '<fmt:message key="label.monitoring.summary.total" />'],
+	  						    "<fmt:message key="label.monitoring.summary.total" />"],
 	  						    
 	  				   	colModel:[
 	  				   		{name:'id',index:'id', width:20, sorttype:"int"},
@@ -81,9 +81,9 @@
 		  					width: 500,
 		  					shrinkToFit: true,
 		  					
-		  				   	colNames:['<fmt:message key="label.monitoring.summary.user.name" />',
-		  							'<fmt:message key="label.monitoring.user.summary.response" />',
-		  						    '<fmt:message key="label.monitoring.user.summary.grade" />'],
+		  				   	colNames:["<fmt:message key="label.monitoring.summary.user.name" />",
+		  							"<fmt:message key="label.monitoring.user.summary.response" />",
+		  						    "<fmt:message key="label.monitoring.user.summary.grade" />"],
 		  						    
 		  				   	colModel:[
 								{name:'userName',index:'userName', width:100},
Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
===================================================================
diff -u -r6a20c448cdfdc7895e72dda22c5359be1234cf47 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision 6a20c448cdfdc7895e72dda22c5359be1234cf47)
+++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -33,9 +33,9 @@
 	  					shrinkToFit: true,
 	  					
 	  				   	colNames:['questionResultUid',
-	  		  				   	'<fmt:message key="label.monitoring.summary.user.name" />',
-	  							'<fmt:message key="label.monitoring.user.summary.response" />',
-	  						    '<fmt:message key="label.monitoring.user.summary.grade" />'],
+	  		  				   	"<fmt:message key="label.monitoring.summary.user.name" />",
+	  							"<fmt:message key="label.monitoring.user.summary.response" />",
+	  						    "<fmt:message key="label.monitoring.user.summary.grade" />"],
 	  						    
 	  				   	colModel:[
 							{name:'questionResultUid', index:'questionResultUid', width:0},
Index: lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
===================================================================
diff -u -r6a20c448cdfdc7895e72dda22c5359be1234cf47 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(.../usersummary.jsp)	(revision 6a20c448cdfdc7895e72dda22c5359be1234cf47)
+++ lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(.../usersummary.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -31,11 +31,11 @@
 	  					width: 500,
 	  					shrinkToFit: true,
 	  					
-	  				   	colNames:['<fmt:message key="label.monitoring.user.summary.attempt" />',
+	  				   	colNames:["<fmt:message key="label.monitoring.user.summary.attempt" />",
 	  							'questionResultUid',
-	  							'<fmt:message key="label.monitoring.user.summary.time" />',
-	  							'<fmt:message key="label.monitoring.user.summary.response" />',
-	  						    '<fmt:message key="label.monitoring.user.summary.grade" />'],
+	  							"<fmt:message key="label.monitoring.user.summary.time" />",
+	  							"<fmt:message key="label.monitoring.user.summary.response" />",
+	  						    "<fmt:message key="label.monitoring.user.summary.grade" />"],
 	  						    
 	  				   	colModel:[
 	  				   		{name:'id', index:'id', width:55, sorttype:"int"},
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r07819656d65375e869df0a0b8555bccd9a01d8e2 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 07819656d65375e869df0a0b8555bccd9a01d8e2)
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -18,11 +18,11 @@
 			   	colNames:['#',
 						'userId',
 						'sessionId',
-						'<fmt:message key="label.monitoring.summary.user.name" />',
+						"<fmt:message key="label.monitoring.summary.user.name" />",
 			   	        <c:forEach var="question" items="${assessment.questions}">
 			   	     		"${question.title}", 
 			   	        </c:forEach>
-					    '<fmt:message key="label.monitoring.summary.total" />'],
+					    "<fmt:message key="label.monitoring.summary.total" />"],
 					    
 			   	colModel:[
 			   		{name:'id',index:'id', width:20, sorttype:"int"},
@@ -104,12 +104,12 @@
 				height: 90,
 				width: ${width},
 				shrinkToFit: true,
-				caption: '<fmt:message key="label.monitoring.summary.learner.summary" />',
+				caption: "<fmt:message key="label.monitoring.summary.learner.summary" />",
 			   	colNames:['#',
 						'questionResultUid',
   						'Question',
-  						'<fmt:message key="label.monitoring.user.summary.response" />',
-  						'<fmt:message key="label.monitoring.user.summary.grade" />'],
+  						"<fmt:message key="label.monitoring.user.summary.response" />",
+  						"<fmt:message key="label.monitoring.user.summary.grade" />"],
 					    
 			   	colModel:[
 	  			   		{name:'id', index:'id', width:20, sorttype:"int"},
Index: lams_tool_chat/web/pages/learning/learning.jsp
===================================================================
diff -u -rd8e26667cb5daa978a8bc805b91cb3fb47db451f -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_chat/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision d8e26667cb5daa978a8bc805b91cb3fb47db451f)
+++ lams_tool_chat/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -86,7 +86,7 @@
 
 							<td valign="middle" width="105px">
 								<input id="sendButton" class="button" type="submit"
-									value='<fmt:message>button.send</fmt:message>' />
+									value="<fmt:message>button.send</fmt:message>" />
 
 							</td>
 						</tr>
Index: lams_tool_daco/web/pages/authoring/parts/questionlist.jsp
===================================================================
diff -u -rb054fb7526acfd0ae74e51d197702f843aa2101f -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_daco/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision b054fb7526acfd0ae74e51d197702f843aa2101f)
+++ lams_tool_daco/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -60,7 +60,7 @@
 					onclick="javascript:editQuestion(${status.index},'${sessionMapID}')" /></td>
 				<td><img src="${tool}includes/images/cross.gif"
 					title="<fmt:message key="label.common.delete" />"
-					onclick="javascript:if (confirm('<fmt:message key="message.authoring.delete.question" />')) deleteQuestion(${status.index},'${sessionMapID}');" /></td>
+					onclick='javascript:if (confirm("<fmt:message key="message.authoring.delete.question" />")) deleteQuestion(${status.index},"${sessionMapID}");' /></td>
 		</tr>
 	</c:forEach>
 </table>
Index: lams_tool_forum/web/jsps/authoring/advance.jsp
===================================================================
diff -u -ra01292ae06e058ffcc16aaeec6d61959a7b69273 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_forum/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
+++ lams_tool_forum/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -180,11 +180,11 @@
 				var errors = '';
 				var num = parseFloat(this.value);
 				if(isNaN(num)) 
-					errors = '<fmt:message key="js.error.invalid.number"/>\n';
+					errors = "<fmt:message key="js.error.invalid.number"/>\n";
 				else if (num <= min)
-					errors = '<fmt:message key="js.error.min.number"/>';
+					errors = "<fmt:message key="js.error.min.number"/>";
 				if(errors)
-					alert('<fmt:message key="js.error.title"/>\n'+errors);
+					alert("<fmt:message key="js.error.title"/>\n"+errors);
 				
 			}
 			function allowNewTopic(){
Index: lams_tool_gmap/web/common/learnerheader.jsp
===================================================================
diff -u -r00ae80d4791f903bcb3661537fc7e129c72ad195 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_gmap/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision 00ae80d4791f903bcb3661537fc7e129c72ad195)
+++ lams_tool_gmap/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -43,9 +43,9 @@
 		var TREE_CLOSED_ICON = "${tool}/images/tree_closed.gif";
 		var TREE_OPEN_ICON = "${tool}/images/tree_open.gif";
 		
-		var errorMissingTitle = '<fmt:message key="error.missingMarkerTitle"/>';
-		var markerLimitMsg = '<fmt:message key="label.learner.markerLimitReached"/>'
-		var confirmDelete = '<fmt:message key="label.authoring.basic.confirmDelete"/>';
+		var errorMissingTitle = "<fmt:message key="error.missingMarkerTitle"/>";
+		var markerLimitMsg = "<fmt:message key="label.learner.markerLimitReached"/>"
+		var confirmDelete = "<fmt:message key="label.authoring.basic.confirmDelete"/>";
 		
 		var sessionName = '${gmapSessionDTO.sessionName}';
 		
@@ -85,7 +85,7 @@
 		    	
 		    	
 		    	
-		    	addUserToList('0','<fmt:message key="label.authoring.basic.authored"></fmt:message>' );
+		    	addUserToList('0',"<fmt:message key="label.authoring.basic.authored"></fmt:message>" );
 		    	<c:forEach var="user" items="${gmapSessionDTO.userDTOs}">
 		    		addUserToList('${user.uid}','${user.firstName} ${user.lastName}');
 		    	</c:forEach>
@@ -99,7 +99,7 @@
 					<c:otherwise>
 						<c:choose>
 						<c:when  test="${marker.isAuthored}">
-						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}"/>'), decode_utf8('<c:out value="${marker.title}" />'), '${marker.uid}', true, false, '<fmt:message key="label.authoring.basic.authored"></fmt:message>', '0' );
+						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}"/>'), decode_utf8('<c:out value="${marker.title}" />'), '${marker.uid}', true, false, "<fmt:message key="label.authoring.basic.authored"></fmt:message>", '0' );
 						</c:when>
 						<c:when  test="${gmapDTO.allowShowAllMarkers}">
 						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}"/>'), decode_utf8('<c:out value="${marker.title}" />'), '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName}', '${marker.createdBy.uid}' );
Index: lams_tool_gmap/web/includes/jsp/mapFunctions.jsp
===================================================================
diff -u -r3a61d2c456071d793975f003f451636aed0d1f7c -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(.../mapFunctions.jsp)	(revision 3a61d2c456071d793975f003f451636aed0d1f7c)
+++ lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(.../mapFunctions.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -294,7 +294,7 @@
 			{
 				if (!point) 
 				{
-					alert('<fmt:message key="error.cantFindAddress"/> ' + address );
+					alert("<fmt:message key="error.cantFindAddress"/> " + address );
 				} 
 				else 
 				{
@@ -375,8 +375,8 @@
 			markerIn.linksBar = "<br/ >" + markerIn.removeLink + "&nbsp;" + markerIn.editLink;
 		}
 		markerIn.markerMetaData = "<span style='font-size:90%; color:#999999;'>";
-		markerIn.markerMetaData += '<fmt:message key="label.createdBy"/> ' + markerIn.createdBy + "<br />";
-		markerIn.markerMetaData += '<nobr><fmt:message key="label.latitudeLongitude"/> (' + markerIn.getPoint().lat() + "-" + markerIn.getPoint().lng() +")</nobr>";
+		markerIn.markerMetaData += "<fmt:message key="label.createdBy"/> " + markerIn.createdBy + "<br />";
+		markerIn.markerMetaData += "<nobr><fmt:message key="label.latitudeLongitude"/> (" + markerIn.getPoint().lat() + "-" + markerIn.getPoint().lng() +")</nobr>";
 		markerIn.markerMetaData += "</span>";
 		markerIn.infoWindowHtml = "<h4>" + markerIn.title + "</h4><div style='overflow:auto; width:350px; height:80px'>" +  markerIn.infoMessage.replace(/\n/g, "<br />") + "</div>"+ markerIn.markerMetaData  + markerIn.linksBar;
 	}	
@@ -419,7 +419,7 @@
 		// Check if there are unsaved markers
 		if (markers[i].state == "unsaved" || markers[i].state == "update")
 		{
-			var ans = confirm('<fmt:message key="label.unsavedMarkers" />');
+			var ans = confirm("<fmt:message key="label.unsavedMarkers" />");
 			if (ans)
 			{
 				return true;
@@ -450,7 +450,7 @@
 		// Check if there are unsaved markers
 		if (markers[i].state == "unsaved")
 		{
-			var ans = confirm('<fmt:message key="label.unsavedMarkers" />');
+			var ans = confirm("<fmt:message key="label.unsavedMarkers" />");
 			if (!ans)
 			{
 				return false;
Index: lams_tool_gmap/web/pages/authoring/basic.jsp
===================================================================
diff -u -rcf00c458d8f6d4cef59b8280c3ecfc45db474bee -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision cf00c458d8f6d4cef59b8280c3ecfc45db474bee)
+++ lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -71,7 +71,7 @@
     	markers = new Array();
     	geocoder = new GClientGeocoder();
 
-    	currUser = '<fmt:message key="label.authoring.basic.authored"></fmt:message>';
+    	currUser = "<fmt:message key="label.authoring.basic.authored"></fmt:message>";
     	currUserId = '0';
 		map.setCenter(new GLatLng('${formBean.gmap.mapCenterLatitude}', '${formBean.gmap.mapCenterLongitude}' ));
 		map.setCenter(new GLatLng('${formBean.gmap.mapCenterLatitude}', '${formBean.gmap.mapCenterLongitude}' ));
Index: lams_tool_gmap/web/pages/export/exportPortfolio.jsp
===================================================================
diff -u -rcf00c458d8f6d4cef59b8280c3ecfc45db474bee -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_gmap/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision cf00c458d8f6d4cef59b8280c3ecfc45db474bee)
+++ lams_tool_gmap/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -229,7 +229,7 @@
 			<c:forEach var="session" items="${gmapDTO.sessionDTOs}" varStatus="status">
 			function addUsersForSession${session.sessionID}()
 			{
-				addUserToList('0','<fmt:message key="label.authoring.basic.authored"></fmt:message>' );
+				addUserToList('0',"<fmt:message key="label.authoring.basic.authored"></fmt:message>" );
 				<c:forEach var="user" items="${session.userDTOs}">
 					addUserToList('${user.uid}','${user.firstName} ${user.lastName}' );
 				</c:forEach>
@@ -261,7 +261,7 @@
 		</c:when>
 		<c:otherwise>
 		
-			addUserToList('0','<fmt:message key="label.authoring.basic.authored"></fmt:message>' );
+			addUserToList('0',"<fmt:message key="label.authoring.basic.authored"></fmt:message>" );
 			<c:forEach var="user" items="${sessionDTO.userDTOs}">
 				addUserToList('${user.uid}','${user.firstName} ${user.lastName}' );
 			</c:forEach>
Index: lams_tool_gmap/web/pages/monitoring/headItems.jsp
===================================================================
diff -u -rf2868221badcd51a57e5c5ef3d249b9072b35b74 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_gmap/web/pages/monitoring/headItems.jsp	(.../headItems.jsp)	(revision f2868221badcd51a57e5c5ef3d249b9072b35b74)
+++ lams_tool_gmap/web/pages/monitoring/headItems.jsp	(.../headItems.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -33,9 +33,9 @@
 var RED_MARKER_ICON = "${tool}/images/red_Marker.png";
 var TREE_CLOSED_ICON = "${tool}/images/tree_closed.gif";
 var TREE_OPEN_ICON = "${tool}/images/tree_open.gif";
-var errorMissingTitle = '<fmt:message key="error.missingMarkerTitle"/>';
-var markerLimitMsg = '<fmt:message key="label.learner.markerLimitReached"/>'
-var confirmDelete = '<fmt:message key="label.authoring.basic.confirmDelete"/>';
+var errorMissingTitle = "<fmt:message key="error.missingMarkerTitle"/>";
+var markerLimitMsg = "<fmt:message key="label.learner.markerLimitReached"/>"
+var confirmDelete = "<fmt:message key="label.authoring.basic.confirmDelete"/>";
 
 var map;
 var markers;
@@ -96,7 +96,7 @@
 {
 	var bounds = map.getBounds();
 	var point = bounds.getCenter();
-	addMarker(point, "", "", -1, false, true, '<fmt:message key="label.authoring.basic.authored"></fmt:message>', 0);
+	addMarker(point, "", "", -1, false, true, "<fmt:message key="label.authoring.basic.authored"></fmt:message>", 0);
 }
 
 //-->
Index: lams_tool_gmap/web/pages/monitoring/summary.jsp
===================================================================
diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_gmap/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision acc8d2acf5b6b0002e0c8129947040a779ab4077)
+++ lams_tool_gmap/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -301,7 +301,7 @@
 	{
 		sessionName = '${session.sessionName}';
 		document.getElementById("toolSessionID").value ="${session.sessionID}";
-		addUserToList('0','<fmt:message key="label.authoring.basic.authored"></fmt:message>' );
+		addUserToList('0',"<fmt:message key="label.authoring.basic.authored"></fmt:message>" );
 		<c:forEach var="user" items="${session.userDTOs}">
 			addUserToList('${user.uid}','${user.firstName} ${user.lastName}' );
 		</c:forEach>
Index: lams_tool_images/web/pages/authoring/basic.jsp
===================================================================
diff -u -r616336eff87580ecb6f13770899bc9af7eff4fa8 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_images/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 616336eff87580ecb6f13770899bc9af7eff4fa8)
+++ lams_tool_images/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -48,7 +48,7 @@
 	var imageGalleryListTargetDiv = "imageGalleryListArea";
 	function deleteItem(idx,sessionMapID){
 
-		var	deletionConfirmed = confirm('<fmt:message key="warning.msg.authoring.do.you.want.to.delete"></fmt:message>');
+		var	deletionConfirmed = confirm("<fmt:message key="warning.msg.authoring.do.you.want.to.delete"></fmt:message>");
 		
 		if (deletionConfirmed) {
 			var url = "<c:url value="/authoring/removeImage.do"/>";
Index: lams_tool_images/web/pages/monitoring/imagesummary.jsp
===================================================================
diff -u -r8e512e5f28ad5c247d577c7189e2b7908f506240 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_images/web/pages/monitoring/imagesummary.jsp	(.../imagesummary.jsp)	(revision 8e512e5f28ad5c247d577c7189e2b7908f506240)
+++ lams_tool_images/web/pages/monitoring/imagesummary.jsp	(.../imagesummary.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -17,7 +17,7 @@
 		<script type="text/javascript">
 
 			function deleteComment(commentUid) {
-				var	deletionConfirmed = confirm('<fmt:message key="warning.msg.monitoring.do.you.want.to.delete"></fmt:message>');
+				var	deletionConfirmed = confirm("<fmt:message key="warning.msg.monitoring.do.you.want.to.delete"></fmt:message>");
 
 				if (deletionConfirmed) {
 					window.location.href = "<c:url value='/monitoring/removeComment.do'/>?sessionMapID=${sessionMapID}&commentUid=" + commentUid;
Index: lams_tool_laqa/web/admin/config.jsp
===================================================================
diff -u -r014c90f20614f95033e08273fc00c81ff0c94638 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_laqa/web/admin/config.jsp	(.../config.jsp)	(revision 014c90f20614f95033e08273fc00c81ff0c94638)
+++ lams_tool_laqa/web/admin/config.jsp	(.../config.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -71,7 +71,7 @@
 				
 				var i;
 				with (catMenu) {
-					options[0] = new Option('<fmt:message key="wizard.selectCategory" />', "none");
+					options[0] = new Option("<fmt:message key="wizard.selectCategory" />", "none");
 					for(i = 0; i < categoryArray.length; i++)
 					{
 						options[i+1] = new Option(categoryArray[i].title, i);
@@ -115,11 +115,11 @@
 			{
 				if (catMenu.selectedIndex == null || catMenu.selectedIndex <= 0)
 				{
-					alert('<fmt:message key="wizard.delete.notselected" />');
+					alert("<fmt:message key="wizard.delete.notselected" />");
 				}
 				else
 				{
-					if (confirm('<fmt:message key="wizard.delete.warnDeleteCategory" />'))
+					if (confirm("<fmt:message key="wizard.delete.warnDeleteCategory" />"))
 					{
 						var uid = categoryArray[catMenu.selectedIndex-1].uid;
 						
@@ -140,11 +140,11 @@
 			{
 				if (skillMenu.selectedIndex == null || skillMenu.selectedIndex <= 0)
 				{
-					alert('<fmt:message key="wizard.delete.notselected" />');
+					alert("<fmt:message key="wizard.delete.notselected" />");
 				}
 				else
 				{
-					if (confirm('<fmt:message key="wizard.delete.warnDeleteSkill" />'))
+					if (confirm("<fmt:message key="wizard.delete.warnDeleteSkill" />"))
 					{
 						var uid = categoryArray[catMenu.selectedIndex-1].skills[skillMenu.selectedIndex-1].uid;
 						
@@ -165,11 +165,11 @@
 			{
 				if (qMenu.selectedIndex == null || qMenu.selectedIndex <= 0)
 				{
-					alert('<fmt:message key="wizard.delete.notselected" />');
+					alert("<fmt:message key="wizard.delete.notselected" />");
 				}
 				else
 				{
-					if (confirm('<fmt:message key="wizard.delete.warnDeleteQuestion" />'))
+					if (confirm("<fmt:message key="wizard.delete.warnDeleteQuestion" />"))
 					{
 						var uid = categoryArray[catMenu.selectedIndex-1].skills[skillMenu.selectedIndex-1].questions[qMenu.selectedIndex-1].uid;
 						
@@ -201,7 +201,7 @@
 				}
 				else
 				{
-					alert('<fmt:message key="wizard.edit.notSelected" />');
+					alert("<fmt:message key="wizard.edit.notSelected" />");
 				}
 			}
 			
@@ -215,15 +215,15 @@
 					{ 
 				    	buttons: 
 				    	{ 
-					        '<fmt:message key="wizard.ok" />': function() 
+					        "<fmt:message key="wizard.ok" />": function() 
 					        { 
 					            if(handleDialogInput(inputType, isAdd))
 					            {
 									document.getElementById('inputText').value = "";
 					            	$(this).dialog("close"); 
 					            }
 					        }, 
-					       '<fmt:message key="label.cancel" />': function() 
+					       "<fmt:message key="label.cancel" />": function() 
 					        { 
 					            document.getElementById('inputText').value = "";
 					            $(this).dialog("close"); 
@@ -243,7 +243,7 @@
 				var inputText = trim(document.getElementById("inputText").value);
 				if (inputText == null || inputText == "")
 				{
-					alert('<fmt:message key="wizard.edit.fieldRequired" />');
+					alert("<fmt:message key="wizard.edit.fieldRequired" />");
 					return false
 				}
 
@@ -285,7 +285,7 @@
 							}
 							else
 							{
-								alert('<fmt:message key="wizard.add.mustSelectCategory" />');
+								alert("<fmt:message key="wizard.add.mustSelectCategory" />");
 								return false;
 							}
 						}
@@ -316,7 +316,7 @@
 							}
 							else
 							{
-								alert('<fmt:message key="wizard.add.mustSelectSkill" />');
+								alert("<fmt:message key="wizard.add.mustSelectSkill" />");
 								return false;
 							}
 							
@@ -422,7 +422,7 @@
 			
 			function disableExport()
 			{
-				msg = '<fmt:message key="wizard.export.savefirst" />'
+				msg = "<fmt:message key="wizard.export.savefirst" />"
 				document.getElementById("exportButton").href = "javascript:alert('" + msg + "');";
 			}
 			
@@ -434,7 +434,7 @@
 				}
 				else
 				{
-					if(confirm('<fmt:message key="wizard.import.warn" />'))
+					if(confirm("<fmt:message key="wizard.import.warn" />"))
 					{
 						customSubmit("importWizard");
 					}
Index: lams_tool_laqa/web/authoring/newQuestionBox.jsp
===================================================================
diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_laqa/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision acc8d2acf5b6b0002e0c8129947040a779ab4077)
+++ lams_tool_laqa/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -82,7 +82,7 @@
                         
                         var i;
                         with (catMenu) {
-                            options[0] = new Option('<fmt:message key="wizard.selectCategory" />', "none");
+                            options[0] = new Option("<fmt:message key="wizard.selectCategory" />", "none");
                             for(i = 0; i < categoryArray.length; i++)
                             {
                                 options[i+1] = new Option(categoryArray[i].title, i);
Index: lams_tool_laqa/web/includes/jsp/qaWizardCommon.jsp
===================================================================
diff -u -r80a367726b9e7607851be28429bda54d9b306159 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_laqa/web/includes/jsp/qaWizardCommon.jsp	(.../qaWizardCommon.jsp)	(revision 80a367726b9e7607851be28429bda54d9b306159)
+++ lams_tool_laqa/web/includes/jsp/qaWizardCommon.jsp	(.../qaWizardCommon.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -48,7 +48,7 @@
 			
 			var i;
 			with (skillMenu) {
-				options[0] = new Option('<fmt:message key="wizard.selectSkill" />', "none");
+				options[0] = new Option("<fmt:message key="wizard.selectSkill" />", "none");
 				for(i = 0; i < skillArray.length; i++)
 				{
 					options[i+1] = new Option(skillArray[i].title, i);
@@ -69,7 +69,7 @@
 			
 			var i;
 			with (qMenu) {
-				options[0] = new Option('<fmt:message key="wizard.selectQuestion" />', "none");
+				options[0] = new Option("<fmt:message key="wizard.selectQuestion" />", "none");
 				for(i = 0; i < questionArray.length; i++)
 				{
 					options[i+1] = new Option(questionArray[i].question, i);
Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
diff -u -r153f4c4a1ab240a3c22cf39c07444bddafeb0c54 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 153f4c4a1ab240a3c22cf39c07444bddafeb0c54)
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -45,7 +45,7 @@
 			if (actionMethod != 'getPreviousQuestion') {
 				jQuery(".text-area").each(function() {
 					if (jQuery.trim($(this).val()) == "") {
-						if (confirm('<fmt:message key="warning.empty.answers" />')) {
+						if (confirm("<fmt:message key="warning.empty.answers" />")) {
 							doSubmit(actionMethod);
 							return false;
 						} else {
Index: lams_tool_pixlr/web/pages/authoring/basic.jsp
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_pixlr/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -52,7 +52,7 @@
 			<c:choose>
 				<c:when test='${imageExists}'>
 					<div style="text-align:center;">
-					<img id="image"  title='<fmt:message key="tooltip.openfullsize" />' onclick="openImage('${imageURL}')" src="${imageURL}"/>
+					<img id="image"  title="<fmt:message key="tooltip.openfullsize" />" onclick="openImage('${imageURL}')" src="${imageURL}"/>
 					<br><br>
 				
 					<a href="javascript:submitForm('deleteImage')"><fmt:message key="label.authoring.remove"></fmt:message></a>
Index: lams_tool_pixlr/web/pages/export/exportPortfolio.jsp
===================================================================
diff -u -r7ac799f882768ec282d31d732647571de698120e -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_pixlr/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 7ac799f882768ec282d31d732647571de698120e)
+++ lams_tool_pixlr/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -67,7 +67,7 @@
 <br />
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <img
 	src="tool_images/${pixlrDTO.imageFileName}" id="originalImage"
-	title='<fmt:message key="tooltip.openfullsize" />'
+	title="<fmt:message key="tooltip.openfullsize" />"
 	onclick="openPopup('tool_images/${pixlrDTO.imageFileName}', origImageHeight, origImageWidth);" />
 
 <br />
@@ -113,7 +113,7 @@
 								<img src="tool_images/${user.imageFileName}"
 									height="${user.imageThumbnailHeight}"
 									width="${user.imageThumbnailWidth}"
-									title='<fmt:message key="tooltip.openfullsize" />'
+									title="<fmt:message key="tooltip.openfullsize" />"
 									onclick="openPopup('tool_images/${user.imageFileName}', ${user.imageHeight}, ${user.imageWidth})" />
 							</c:when>
 							<c:otherwise>
Index: lams_tool_pixlr/web/pages/learning/pixlr.jsp
===================================================================
diff -u -r4539f61212802fc0e2c9cebc3365f7193b1c922e -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_pixlr/web/pages/learning/pixlr.jsp	(.../pixlr.jsp)	(revision 4539f61212802fc0e2c9cebc3365f7193b1c922e)
+++ lams_tool_pixlr/web/pages/learning/pixlr.jsp	(.../pixlr.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -7,7 +7,7 @@
 	
 	function openPixlr(url)
 	{
-		alert('<fmt:message key="message.learner.saveWhenFinished" />');
+		alert("<fmt:message key="message.learner.saveWhenFinished" />");
 		
 		url += "&target=" + escape("${returnURL}");
 		url += "&image=" + escape("${currentImageURL}");
@@ -63,7 +63,7 @@
 
 	<br />
 	<div style="text-align:center;">
-		<img id="image" border="1" title='<fmt:message key="tooltip.openfullsize" />' onclick="openImage('${currentImageURL}')" src="${currentImageURL}" />
+		<img id="image" border="1" title="<fmt:message key="tooltip.openfullsize" />" onclick="openImage('${currentImageURL}')" src="${currentImageURL}" />
 		
 		<br />
 		<br />
Index: lams_tool_pixlr/web/pages/learning/viewAll.jsp
===================================================================
diff -u -r9027d6af6539e20c3c565935b6fcdce68026a1b9 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_pixlr/web/pages/learning/viewAll.jsp	(.../viewAll.jsp)	(revision 9027d6af6539e20c3c565935b6fcdce68026a1b9)
+++ lams_tool_pixlr/web/pages/learning/viewAll.jsp	(.../viewAll.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -68,7 +68,7 @@
 												<img src="${pixlrImageFolderURL}/${learner.imageFileName}" 
 													height="${learner.imageThumbnailHeight}" 
 													width="${learner.imageThumbnailWidth}"
-													title='<fmt:message key="tooltip.openfullsize" />'
+													title="<fmt:message key="tooltip.openfullsize" />"
 													onclick="openPopup('${pixlrImageFolderURL}/${learner.imageFileName}', ${learner.imageHeight}, ${learner.imageWidth})"
 												/>
 											</c:when>
Index: lams_tool_pixlr/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_pixlr/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -134,7 +134,7 @@
 								<img src="${pixlrImageFolderURL}/${user.imageFileName}" 
 									height="${user.imageThumbnailHeight}" 
 									width="${user.imageThumbnailWidth}"
-									title='<fmt:message key="tooltip.openfullsize" />'
+									title="<fmt:message key="tooltip.openfullsize" />"
 									onclick="openPopup('${pixlrImageFolderURL}/${user.imageFileName}', ${user.imageHeight}, ${user.imageWidth})"
 								 />
 								 <c:if test="${pixlrDTO.allowViewOthersImages}">
Index: lams_tool_sbmt/web/monitoring/mark/updatemark.jsp
===================================================================
diff -u -r02696b4b5a761a0fcc9f72a677d3599656ffb725 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_sbmt/web/monitoring/mark/updatemark.jsp	(.../updatemark.jsp)	(revision 02696b4b5a761a0fcc9f72a677d3599656ffb725)
+++ lams_tool_sbmt/web/monitoring/mark/updatemark.jsp	(.../updatemark.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -11,7 +11,7 @@
 	<script type="text/javascript">
 		function removeMarkFile() {
 
-			var answer = confirm('<fmt:message key="message.monitor.mark.confirmDeleteFile"/>');
+			var answer = confirm("<fmt:message key="message.monitor.mark.confirmDeleteFile"/>");
 			if (answer) {	
 				document.getElementById("method").value = "removeMarkFile";
 				document.getElementById("updateMarkForm").submit();
Index: lams_tool_task/web/pages/authoring/basic.jsp
===================================================================
diff -u -ra3da609771f1cedff31c3af15d26d6b69308fe97 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_task/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision a3da609771f1cedff31c3af15d26d6b69308fe97)
+++ lams_tool_task/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -46,7 +46,7 @@
 		
 		var containsConditions = document.getElementById("conditionTable").rows.length > 0;
 		if (containsConditions) {
-			deletionConfirmed = confirm('<fmt:message key="warning.msg.authoring.deletion.affect.conditions"></fmt:message>');
+			deletionConfirmed = confirm("<fmt:message key="warning.msg.authoring.deletion.affect.conditions"></fmt:message>");
  		}
 		
 		if (deletionConfirmed) {
Index: lams_tool_videorecorder/web/pages/monitoring/summary.jsp
===================================================================
diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_videorecorder/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision acc8d2acf5b6b0002e0c8129947040a779ab4077)
+++ lams_tool_videorecorder/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -18,7 +18,7 @@
 		if (elem != null) {
 			//elem.style.display="none";
 			elem.href = "javascript: hideMessage('" + url + "', '" + sessionId + "');";
-			$("#showhideVRButton" + sessionId).text('<fmt:message key="monitor.summary.button.hide.video.recorder"><fmt:param><fmt:message key="activity.title" /></fmt:param></fmt:message>');
+			$("#showhideVRButton" + sessionId).text("<fmt:message key="monitor.summary.button.hide.video.recorder"><fmt:param><fmt:message key="activity.title" /></fmt:param></fmt:message>");
 		}
 		location.hash = "videoRecorder" + sessionId;
 	}
@@ -33,7 +33,7 @@
 		if (elem != null) {
 			//elem.style.display="block";
 			elem.href = "javascript: showMessage('" + url + "', '" + sessionId + "');";
-			$("#showhideVRButton" + sessionId).text('<fmt:message key="monitor.summary.button.show.video.recorder"><fmt:param><fmt:message key="activity.title" /></fmt:param></fmt:message>');
+			$("#showhideVRButton" + sessionId).text("<fmt:message key="monitor.summary.button.show.video.recorder"><fmt:param><fmt:message key="activity.title" /></fmt:param></fmt:message>");
 		}
 	}
 	-->
Index: lams_tool_wiki/web/pages/authoring/advanced.jsp
===================================================================
diff -u -rf08d91b95c1892c71594dd4f7fd6e9b4509cccc7 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_wiki/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision f08d91b95c1892c71594dd4f7fd6e9b4509cccc7)
+++ lams_tool_wiki/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -104,7 +104,7 @@
 		
 		if (max > 0 && min > max)
 		{
-			alert('<fmt:message key="advanced.editingLimits.error" />');
+			alert("<fmt:message key="advanced.editingLimits.error" />");
 			minMenu.selectedIndex = max;
 		}
 	}
Index: lams_tool_wiki/web/pages/authoring/basic.jsp
===================================================================
diff -u -r06731c610e64ed7d4574eae2b6ae5e052e9bfde8 -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_wiki/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 06731c610e64ed7d4574eae2b6ae5e052e9bfde8)
+++ lams_tool_wiki/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -14,19 +14,19 @@
 	</div>
 	
 	<div id="buttons" style="float: right; width: 50%; text-align:right; " >
-		<a href="javascript:changeDiv('view');" title='<fmt:message key="label.wiki.view.toolTip"></fmt:message>'>
+		<a href="javascript:changeDiv('view');" title="<fmt:message key="label.wiki.view.toolTip"></fmt:message>">
 			<fmt:message key="label.wiki.view"></fmt:message>
 		</a> 
 		&nbsp;
-		<a href="javascript:changeDiv('edit');" title='<fmt:message key="label.wiki.edit.toolTip"></fmt:message>'>
+		<a href="javascript:changeDiv('edit');" title="<fmt:message key="label.wiki.edit.toolTip"></fmt:message>">
 			<fmt:message key="label.wiki.edit"></fmt:message>
 		</a> 
 		&nbsp;
-		<a href="javascript:cancelAdd();changeDiv('add');" title='<fmt:message key="label.wiki.add.toolTip"></fmt:message>'>
+		<a href="javascript:cancelAdd();changeDiv('add');" title="<fmt:message key="label.wiki.add.toolTip"></fmt:message>">
 			<fmt:message key="label.wiki.add"></fmt:message>
 		</a> 
 		&nbsp;
-		<a href="javascript:changeDiv('history');" title='<fmt:message key="label.wiki.history.toolTip"></fmt:message>'>
+		<a href="javascript:changeDiv('history');" title="<fmt:message key="label.wiki.history.toolTip"></fmt:message>">
 			<fmt:message key="label.wiki.history"></fmt:message>
 		</a> 
 		<c:if test="${currentWikiPage.title != mainWikiPage.title}">
@@ -124,15 +124,15 @@
 								</c:choose>
 							</td>
 							<td>
-								<a href="javascript:doRevert('${wikiContentPageVersion.uid}');" title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
+								<a href="javascript:doRevert('${wikiContentPageVersion.uid}');" title="<fmt:message key="label.wiki.history.actions.compare.tooltip" />">
 									<fmt:message key="label.wiki.history.actions.revert" /> 
 								</a>
 								&nbsp; 
-								<a href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'comparePage');" title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
+								<a href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'comparePage');" title="<fmt:message key="label.wiki.history.actions.compare.tooltip" />">
 									<fmt:message key="label.wiki.history.actions.compare" /> 
 								</a>
 								&nbsp;
-								<a href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'viewPage');" title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
+								<a href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'viewPage');" title="<fmt:message key="label.wiki.history.actions.compare.tooltip" />">
 									<fmt:message key="label.wiki.history.actions.view" /> 
 								</a>
 							</td>
@@ -283,7 +283,7 @@
 		
 		if (title == null || trim(title).length == 0)
 		{
-			alert('<fmt:message key="label.wiki.add.title.required"></fmt:message>');
+			alert("<fmt:message key="label.wiki.add.title.required"></fmt:message>");
 			return;
 		}
 		
@@ -296,7 +296,7 @@
 			
 			if (trim(title) == wikiLinkArray[i])
 			{
-				alert('<fmt:message key="label.wiki.add.title.exists"><fmt:param>' + title + '</fmt:param></fmt:message>');
+				alert("<fmt:message key="label.wiki.add.title.exists"><fmt:param>" + title + "</fmt:param></fmt:message>");
 				return;
 			}
 		}
Index: lams_tool_wiki/web/pages/learning/wiki.jsp
===================================================================
diff -u -raa23536bf893527084d4b72019050dc457c8b23c -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision aa23536bf893527084d4b72019050dc457c8b23c)
+++ lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -130,42 +130,42 @@
 			
 				<c:if test="${contentEditable}">
 				
-					<a href="javascript:refreshPage();" title='<fmt:message key="label.wiki.refresh.toolTip"></fmt:message>'>
+					<a href="javascript:refreshPage();" title="<fmt:message key="label.wiki.refresh.toolTip"></fmt:message>">
 						<fmt:message key="label.wiki.refresh"></fmt:message>
 					</a> 
 					
 					<c:if test="${editableFlag or addFlag}">
 						&nbsp;
-						<a href="javascript:changeDiv('view');" title='<fmt:message key="label.wiki.view.toolTip"></fmt:message>'>
+						<a href="javascript:changeDiv('view');" title="<fmt:message key="label.wiki.view.toolTip"></fmt:message>">
 							<fmt:message key="label.wiki.view"></fmt:message>
 						</a>
 					</c:if>
 					
 					<c:if test="${editableFlag}">
 						&nbsp;
-						<a href="javascript:changeDiv('edit');" title='<fmt:message key="label.wiki.edit.toolTip"></fmt:message>'>
+						<a href="javascript:changeDiv('edit');" title="<fmt:message key="label.wiki.edit.toolTip"></fmt:message>">
 							<fmt:message key="label.wiki.edit"></fmt:message>
 						</a>
 					</c:if>
 					
 					<c:if test="${addFlag}">
 						&nbsp;
-						<a href="javascript:cancelAdd();changeDiv('add');" title='<fmt:message key="label.wiki.add.toolTip"></fmt:message>'>
+						<a href="javascript:cancelAdd();changeDiv('add');" title="<fmt:message key="label.wiki.add.toolTip"></fmt:message>">
 							<fmt:message key="label.wiki.add"></fmt:message>
 						</a>
 					</c:if>
 					
 					<c:if test="${editableFlag}">
 						&nbsp;
-						<a href="javascript:changeDiv('history');" title='<fmt:message key="label.wiki.history.toolTip"></fmt:message>'>
+						<a href="javascript:changeDiv('history');" title="<fmt:message key="label.wiki.history.toolTip"></fmt:message>">
 							<fmt:message key="label.wiki.history"></fmt:message>
 						</a>
 					</c:if>
 					
 					<c:if test="${currentWikiPage.title != mainWikiPage.title && editableFlag}">
 						&nbsp;
 						<a href="javascript:doRemove(&#39;<fmt:message key="label.wiki.remove.confirm"></fmt:message>&#39;)"
-							title='<fmt:message key="label.wiki.remove.toolTip"></fmt:message>'
+							title="<fmt:message key="label.wiki.remove.toolTip"></fmt:message>"
 						>
 							<fmt:message key="label.wiki.remove"></fmt:message>
 						</a>
@@ -266,17 +266,17 @@
 									</td>
 									
 									<td>
-										<a href="javascript:doRevert('${wikiContentPageVersion.uid}');" title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
+										<a href="javascript:doRevert('${wikiContentPageVersion.uid}');" title="<fmt:message key="label.wiki.history.actions.compare.tooltip" />">
 											<fmt:message key="label.wiki.history.actions.revert" /> 
 										</a> 
 										
 										&nbsp;
-										<a href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'comparePage');" title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
+										<a href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'comparePage');" title="<fmt:message key="label.wiki.history.actions.compare.tooltip" />">
 											<fmt:message key="label.wiki.history.actions.compare" />
 										</a> 
 										
 										&nbsp;
-										<a href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'viewPage');" title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
+										<a href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'viewPage');" title="<fmt:message key="label.wiki.history.actions.compare.tooltip" />">
 											<fmt:message key="label.wiki.history.actions.view" /> 
 										</a>
 									</td>
@@ -436,7 +436,7 @@
 		
 		if (title == null || trim(title).length == 0)
 		{
-			alert('<fmt:message key="label.wiki.add.title.required"></fmt:message>');
+			alert("<fmt:message key="label.wiki.add.title.required"></fmt:message>");
 			return;
 		}
 		
@@ -449,7 +449,7 @@
 			
 			if (trim(title) == wikiLinkArray[i])
 			{
-				alert('<fmt:message key="label.wiki.add.title.exists"><fmt:param>' + title + '</fmt:param></fmt:message>');
+				alert("<fmt:message key="label.wiki.add.title.exists"><fmt:param>" + title + "</fmt:param></fmt:message>");
 				return;
 			}
 		}
Index: lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp
===================================================================
diff -u -raa23536bf893527084d4b72019050dc457c8b23c -rce3e782fd6844641f7298e09104f8d7554f073ff
--- lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp	(.../wikiDisplay.jsp)	(revision aa23536bf893527084d4b72019050dc457c8b23c)
+++ lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp	(.../wikiDisplay.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
@@ -30,29 +30,29 @@
 		</div>
 
 		<div id="buttons" style="float: right; width: 50%; text-align:right;">
-			<a href="javascript:refreshPage();" title='<fmt:message key="label.wiki.refresh.toolTip"></fmt:message>'>
+			<a href="javascript:refreshPage();" title="<fmt:message key="label.wiki.refresh.toolTip"></fmt:message>">
 				<fmt:message key="label.wiki.refresh"></fmt:message>
 			</a> 
 			&nbsp;
-			<a href="javascript:changeDiv('view');" title='<fmt:message key="label.wiki.view.toolTip"></fmt:message>'>
+			<a href="javascript:changeDiv('view');" title="<fmt:message key="label.wiki.view.toolTip"></fmt:message>">
 				<fmt:message key="label.wiki.view"></fmt:message>
 			</a> 
 			&nbsp;
-			<a href="javascript:changeDiv('edit');" title='<fmt:message key="label.wiki.edit.toolTip"></fmt:message>'>
+			<a href="javascript:changeDiv('edit');" title="<fmt:message key="label.wiki.edit.toolTip"></fmt:message>">
 				<fmt:message key="label.wiki.edit"></fmt:message>
 			</a> 
 			&nbsp;
-			<a href="javascript:cancelAdd();changeDiv('add');" title='<fmt:message key="label.wiki.add.toolTip"></fmt:message>'>
+			<a href="javascript:cancelAdd();changeDiv('add');" title="<fmt:message key="label.wiki.add.toolTip"></fmt:message>">
 				<fmt:message key="label.wiki.add"></fmt:message>
 			</a> 
 			&nbsp;
-			<a href="javascript:changeDiv('history');" title='<fmt:message key="label.wiki.history.toolTip"></fmt:message>' >
+			<a href="javascript:changeDiv('history');" title="<fmt:message key="label.wiki.history.toolTip"></fmt:message>" >
 				<fmt:message key="label.wiki.history"></fmt:message>
 			</a> 
 			<c:if test="${currentWikiPage.title != mainWikiPage.title}">
 				&nbsp;
 				<a href="javascript:doRemove(&#39;<fmt:message key="label.wiki.remove.confirm"></fmt:message>&#39;)"
-					title='<fmt:message key="label.wiki.remove.toolTip"></fmt:message>'
+					title="<fmt:message key="label.wiki.remove.toolTip"></fmt:message>"
 				>
 					<fmt:message key="label.wiki.remove"></fmt:message>
 				</a>
@@ -143,17 +143,17 @@
 									</c:choose>
 								</td>
 								<td>
-									<a href="javascript:doRevert('${wikiContentPageVersion.uid}');" title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
+									<a href="javascript:doRevert('${wikiContentPageVersion.uid}');" title="<fmt:message key="label.wiki.history.actions.compare.tooltip" />">
 										<fmt:message key="label.wiki.history.actions.revert" /> 
 									</a> 
 									&nbsp;
 									
-									<a href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'comparePage');" title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
+									<a href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'comparePage');" title="<fmt:message key="label.wiki.history.actions.compare.tooltip" />">
 										<fmt:message key="label.wiki.history.actions.compare" />
 									</a> 
 									&nbsp;
 									
-									<a href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'viewPage');" title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
+									<a href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'viewPage');" title="<fmt:message key="label.wiki.history.actions.compare.tooltip" />">
 										<fmt:message key="label.wiki.history.actions.view" /> 
 									</a>
 								</td>
@@ -335,7 +335,7 @@
 		
 		if (title == null || trim(title).length == 0)
 		{
-			alert('<fmt:message key="label.wiki.add.title.required"></fmt:message>');
+			alert("<fmt:message key="label.wiki.add.title.required"></fmt:message>");
 			return;
 		}
 		
@@ -348,7 +348,7 @@
 			
 			if (trim(title) == wikiLinkArray[i])
 			{
-				alert('<fmt:message key="label.wiki.add.title.exists"><fmt:param>' + title + '</fmt:param></fmt:message>');
+				alert("<fmt:message key="label.wiki.add.title.exists"><fmt:param>" + title + "</fmt:param></fmt:message>");
 				return;
 			}
 		}