Index: lams_tool_laqa/web/authoring/newQuestionBox.jsp
===================================================================
diff -u -r4e39db7121b2be70c34a77f7e53982cf9a5c4b04 -r2f53601ac19db5f846eb50d31a111e12ff136a0a
--- lams_tool_laqa/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 4e39db7121b2be70c34a77f7e53982cf9a5c4b04)
+++ lams_tool_laqa/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 2f53601ac19db5f846eb50d31a111e12ff136a0a)
@@ -5,20 +5,19 @@
 </div>
 
 <div class="panel-body">
-<html:form action="/authoring?validate=false" styleId="newQuestionForm" enctype="multipart/form-data" method="POST">
-	<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-	<html:hidden property="dispatch" value="${empty formBean.editableQuestionIndex ? 'addSingleQuestion' : 'saveSingleQuestion'}" />
-	<html:hidden property="toolContentID" />
-	<html:hidden property="httpSessionID" />
-	<html:hidden property="contentFolderID" />
-	<html:hidden property="editableQuestionIndex" />
-	<html:hidden property="editQuestionBoxRequest" value="${not empty formBean.editableQuestionIndex}" />
+<form:form action="authoring.do?validate=false" modelAttribute="newQuestionForm" id="newQuestionForm" method="POST">
+	<form:hidden path="dispatch" value="${empty newQuestionForm.editableQuestionIndex ? 'addSingleQuestion' : 'saveSingleQuestion'}" />
+	<form:hidden path="toolContentID" />
+	<form:hidden path="httpSessionID" />
+	<form:hidden path="contentFolderID" />
+	<form:hidden path="editableQuestionIndex" />
+	<form:hidden path="editQuestionBoxRequest" value="${not empty newQuestionForm.editableQuestionIndex}" />
 	
-	<lams:CKEditor id="newQuestion" value="${formBean.editableQuestionText}"
-				   contentFolderID="${formBean.contentFolderID}"/>
+	<lams:CKEditor id="newQuestion" value="${newQuestionForm.editableQuestionText}"
+				   contentFolderID="${newQuestionForm.contentFolderID}"/>
 
 			<div class="checkbox">
-				<label> <html:checkbox property="required" value="1"
+				<label> <form:checkbox path="required" value="1"
 						styleId="required" />&nbsp;<fmt:message key="label.required.desc" />
 				</label>
 			</div>
@@ -31,19 +30,19 @@
 				<fmt:param> </fmt:param>
 			</fmt:message>:
 		</label>
-			<input type="number" class="form-control input-sm" id="minWordsLimit" name="minWordsLimit" value="${formBean.minWordsLimit}" min="0"/>
+			<input type="number" class="form-control input-sm" id="minWordsLimit" name="minWordsLimit" value="${newQuestionForm.minWordsLimit}" min="0"/>
 	</div>
 	
 	<div class="form-group">
 	    <label for="feedback"><fmt:message key="label.feedback" /></label>
-		<lams:CKEditor id="feedback" value="${formBean.feedback}"
-				   contentFolderID="${formBean.contentFolderID}"/>
+		<lams:CKEditor id="feedback" value="${newQuestionForm.feedback}"
+				   contentFolderID="${newQuestionForm.contentFolderID}"/>
 	</div>
 </div>	
 	<div class="voffset5 pull-right">
 		<a href="#" onclick="hideMessage()" class="btn btn-default btn-xs loffset5"> <fmt:message key="label.cancel" /> </a>
 		<a href="#" onclick="submitMessage()" class="btn btn-default btn-xs"> <fmt:message key="label.save.question" /></a>
 	</div>
-</html:form>
+</form:form>
 </div>
 </div>
\ No newline at end of file