Index: lams_central/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10 -r1f1fb6ddb9d422eaa00c14aa421a058bb57fd15a
--- lams_central/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10)
+++ lams_central/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 1f1fb6ddb9d422eaa00c14aa421a058bb57fd15a)
@@ -14,9 +14,13 @@
 <%@ attribute name="resizeParentFrameName" required="false" rtexprvalue="true"%>
 <%@ attribute name="method" required="false" rtexprvalue="true"%>
 <%@ attribute name="maxWords" required="false" rtexprvalue="true"%>
+<%@ attribute name="isRequired" required="false" rtexprvalue="true"%>
+<c:if test="${empty isRequired}">
+	<c:set var="isRequired" value="false" />
+</c:if>
+<%-- Either "ariaLabel" or "ariaLabelledby" attribute is required for proper support of ARIA --%>
 <%@ attribute name="ariaLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="ariaLabelledby" required="false" rtexprvalue="true"%>
-<%@ attribute name="ariaRequired" required="false" rtexprvalue="true"%>
 
 <c:if test="${empty method}">
 	<c:set var="method" value="inline" />
@@ -52,9 +56,7 @@
 
 <textarea id="${id}" name="${id}"
 	style="display: none; visibility: hidden; height: 0px;"
-	<c:if test="${not empty ariaLabel}">aria-label="${ariaLabel}"</c:if>
-	<c:if test="${not empty ariaLabelledby}">aria-labelledby="${ariaLabelledby}"</c:if>
-	aria-required="${ariaRequired}" aria-multiline="true">${fixedValue}</textarea>
+	>${fixedValue}</textarea>
 
 <c:if test="${not empty placeholder}">
 		<label for="${id}" class="cke-label-floating">${placeholder}</label>
@@ -100,7 +102,14 @@
 				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
 				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
 				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
-				contentFolderID				  : contentFolderID
+				contentFolderID				  : contentFolderID,
+				isRequired					  : ${isRequired},
+				<c:if test="${not empty ariaLabel}">
+					ariaLabel      			  : "${ariaLabel}",
+				</c:if>
+				<c:if test="${not empty ariaLabelledby}">
+					ariaLabelledby      	  : "${ariaLabelledby}",
+				</c:if>
 		};
 		
 		if (maxWords > 0) {
@@ -114,8 +123,6 @@
 			});
 		}
 
-		
-
 		instance = CKEDITOR[method](id, configuration);
 		instance.initializeFunction = function(){
 			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID, maxWords);
@@ -125,7 +132,6 @@
 	
 	// run initialisation code
 	initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}", ${empty maxWords or maxWords <= 0 ? 0 : maxWords});
-	
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_central/web/includes/javascript/ckconfig_custom.js
===================================================================
diff -u -rc612e32f2eb43e457a3ed528a5e9fb0febddae06 -r1f1fb6ddb9d422eaa00c14aa421a058bb57fd15a
--- lams_central/web/includes/javascript/ckconfig_custom.js	(.../ckconfig_custom.js)	(revision c612e32f2eb43e457a3ed528a5e9fb0febddae06)
+++ lams_central/web/includes/javascript/ckconfig_custom.js	(.../ckconfig_custom.js)	(revision 1f1fb6ddb9d422eaa00c14aa421a058bb57fd15a)
@@ -168,6 +168,18 @@
 	}
 	e.editor._.editable.$.style.minHeight = height;
 	
+	//add ARIA attributes
+	if (e.editor.config.isRequired) {
+		e.editor._.editable.$.ariaRequired = true;	
+	}
+	if (e.editor.config.ariaLabel) {
+		e.editor._.editable.$.setAttribute('aria-label', e.editor.config.ariaLabel);
+		//e.editor._.editable.$.ariaLabel = ;	
+	} else if (e.editor.config.ariaLabelledby) {
+		e.editor._.editable.$.setAttribute('aria-labelledby', e.editor.config.ariaLabelledby);
+		//e.editor._.editable.$.ariaLabelledby = e.editor.config.ariaLabelledby;	
+	}
+	
 	// make all links open in new window
 	e.editor.on('getData', function(f){
 		// create a DOM element for easier manipulation
Index: lams_tool_assessment/web/pages/learning/parts/essay.jsp
===================================================================
diff -u -r6866da235d682d74f883afdd01e00e92d16a13eb -r1f1fb6ddb9d422eaa00c14aa421a058bb57fd15a
--- lams_tool_assessment/web/pages/learning/parts/essay.jsp	(.../essay.jsp)	(revision 6866da235d682d74f883afdd01e00e92d16a13eb)
+++ lams_tool_assessment/web/pages/learning/parts/essay.jsp	(.../essay.jsp)	(revision 1f1fb6ddb9d422eaa00c14aa421a058bb57fd15a)
@@ -142,13 +142,13 @@
 	<div>
 		<c:choose>
 			<c:when test="${question.allowRichEditor && hasEditRight}">
-				<lams:CKEditor id="essay-question${questionIndex}"
+				<lams:CKEditor id="question${questionIndex}"
 					value="${question.answer}"
 					contentFolderID="${sessionMap.learnerContentFolder}"
 					toolbarSet="DefaultLearner" height="174px"
 					maxWords="${question.maxWordsLimit}"
 					ariaLabelledby="question-title-${questionIndex} instructions-${questionIndex}"
-					ariaRequired="${question.answerRequired}"
+					isRequired="${question.answerRequired}"
 					></lams:CKEditor>
 			</c:when>
 			
Index: lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r1f1fb6ddb9d422eaa00c14aa421a058bb57fd15a
--- lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 1f1fb6ddb9d422eaa00c14aa421a058bb57fd15a)
@@ -14,9 +14,13 @@
 <%@ attribute name="resizeParentFrameName" required="false" rtexprvalue="true"%>
 <%@ attribute name="method" required="false" rtexprvalue="true"%>
 <%@ attribute name="maxWords" required="false" rtexprvalue="true"%>
+<%@ attribute name="isRequired" required="false" rtexprvalue="true"%>
+<c:if test="${empty isRequired}">
+	<c:set var="isRequired" value="false" />
+</c:if>
+<%-- Either "ariaLabel" or "ariaLabelledby" attribute is required for proper support of ARIA --%>
 <%@ attribute name="ariaLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="ariaLabelledby" required="false" rtexprvalue="true"%>
-<%@ attribute name="ariaRequired" required="false" rtexprvalue="true"%>
 
 <c:if test="${empty method}">
 	<c:set var="method" value="inline" />
@@ -52,9 +56,7 @@
 
 <textarea id="${id}" name="${id}"
 	style="display: none; visibility: hidden; height: 0px;"
-	<c:if test="${not empty ariaLabel}">aria-label="${ariaLabel}"</c:if>
-	<c:if test="${not empty ariaLabelledby}">aria-labelledby="${ariaLabelledby}"</c:if>
-	aria-required="${ariaRequired}" aria-multiline="true">${fixedValue}</textarea>
+	>${fixedValue}</textarea>
 
 <c:if test="${not empty placeholder}">
 		<label for="${id}" class="cke-label-floating">${placeholder}</label>
@@ -100,7 +102,14 @@
 				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
 				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
 				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
-				contentFolderID				  : contentFolderID
+				contentFolderID				  : contentFolderID,
+				isRequired					  : ${isRequired},
+				<c:if test="${not empty ariaLabel}">
+					ariaLabel      			  : "${ariaLabel}",
+				</c:if>
+				<c:if test="${not empty ariaLabelledby}">
+					ariaLabelledby      	  : "${ariaLabelledby}",
+				</c:if>
 		};
 		
 		if (maxWords > 0) {
@@ -114,8 +123,6 @@
 			});
 		}
 
-		
-
 		instance = CKEDITOR[method](id, configuration);
 		instance.initializeFunction = function(){
 			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID, maxWords);
@@ -125,7 +132,6 @@
 	
 	// run initialisation code
 	initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}", ${empty maxWords or maxWords <= 0 ? 0 : maxWords});
-	
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r1f1fb6ddb9d422eaa00c14aa421a058bb57fd15a
--- lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 1f1fb6ddb9d422eaa00c14aa421a058bb57fd15a)
@@ -14,9 +14,13 @@
 <%@ attribute name="resizeParentFrameName" required="false" rtexprvalue="true"%>
 <%@ attribute name="method" required="false" rtexprvalue="true"%>
 <%@ attribute name="maxWords" required="false" rtexprvalue="true"%>
+<%@ attribute name="isRequired" required="false" rtexprvalue="true"%>
+<c:if test="${empty isRequired}">
+	<c:set var="isRequired" value="false" />
+</c:if>
+<%-- Either "ariaLabel" or "ariaLabelledby" attribute is required for proper support of ARIA --%>
 <%@ attribute name="ariaLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="ariaLabelledby" required="false" rtexprvalue="true"%>
-<%@ attribute name="ariaRequired" required="false" rtexprvalue="true"%>
 
 <c:if test="${empty method}">
 	<c:set var="method" value="inline" />
@@ -52,9 +56,7 @@
 
 <textarea id="${id}" name="${id}"
 	style="display: none; visibility: hidden; height: 0px;"
-	<c:if test="${not empty ariaLabel}">aria-label="${ariaLabel}"</c:if>
-	<c:if test="${not empty ariaLabelledby}">aria-labelledby="${ariaLabelledby}"</c:if>
-	aria-required="${ariaRequired}" aria-multiline="true">${fixedValue}</textarea>
+	>${fixedValue}</textarea>
 
 <c:if test="${not empty placeholder}">
 		<label for="${id}" class="cke-label-floating">${placeholder}</label>
@@ -100,7 +102,14 @@
 				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
 				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
 				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
-				contentFolderID				  : contentFolderID
+				contentFolderID				  : contentFolderID,
+				isRequired					  : ${isRequired},
+				<c:if test="${not empty ariaLabel}">
+					ariaLabel      			  : "${ariaLabel}",
+				</c:if>
+				<c:if test="${not empty ariaLabelledby}">
+					ariaLabelledby      	  : "${ariaLabelledby}",
+				</c:if>
 		};
 		
 		if (maxWords > 0) {
@@ -114,8 +123,6 @@
 			});
 		}
 
-		
-
 		instance = CKEDITOR[method](id, configuration);
 		instance.initializeFunction = function(){
 			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID, maxWords);
@@ -125,7 +132,6 @@
 	
 	// run initialisation code
 	initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}", ${empty maxWords or maxWords <= 0 ? 0 : maxWords});
-	
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){