Index: lams_tool_vote/web/authoring/BasicContent.jsp
===================================================================
diff -u -rb91a146c89c8453761fda681274bca06b3fd1e72 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6
--- lams_tool_vote/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision b91a146c89c8453761fda681274bca06b3fd1e72)
+++ lams_tool_vote/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6)
@@ -23,12 +23,12 @@
 	}
 
 	function removeNomination(questionIndex){
-		document.VoteAuthoringForm.questionIndex.value=questionIndex;
+		document.forms.voteAuthoringForm.questionIndex.value=questionIndex;
         submitMethod('removeNomination');
 	}
 
 	function removeMonitoringNomination(questionIndex){
-		document.VoteMonitoringForm.questionIndex.value=questionIndex;
+		document.voteMonitoringForm.questionIndex.value=questionIndex;
         submitMonitoringMethod('removeNomination');
 	}
 	
@@ -49,14 +49,14 @@
 
 </script>
 
-<html:hidden property="questionIndex" />
+<form:hidden path="questionIndex" />
 
 <div class="form-group">
     <label for="title"><fmt:message key="label.authoring.title.col"/></label>
-    <html:text property="title" styleClass="form-control"></html:text>
+    <form:input path="title" cssClass="form-control" />
 </div>
 <div class="form-group">
-    <label for="instructions"><fmt:message key="label.authoring.instructions.col" /></label>
+	<label for="instructions"><fmt:message key="label.authoring.instructions.col" /></label>
 	<lams:CKEditor id="instructions" value="${voteGeneralAuthoringDTO.activityInstructions}"
 		contentFolderID="${voteGeneralAuthoringDTO.contentFolderID}"></lams:CKEditor>
 </div>
@@ -66,19 +66,19 @@
 </div>
 
 <p>
-	<a href="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newNominationBox&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&minNominationCount=${voteGeneralAuthoringDTO.minNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}"/>');"
+	<a href="javascript:showMessage('<lams:WebAppURL />authoring/newNominationBox.do?contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&minNominationCount=${voteGeneralAuthoringDTO.minNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}');"
 			class="btn btn-default btn-sm"><i class="fa fa-plus"></i>&nbsp;
 		<fmt:message key="label.add.new.nomination" /> 
 	</a>
 	
 	<c:if test="${not empty voteGeneralAuthoringDTO.dataFlowObjectNames}">
 		<span style="margin-left: 20px;"><fmt:message key="label.data.flow.choose" /></span>
-		<html:select property="assignedDataFlowObject" onchange="javascript:onSelectDataInput();">
-			<html:option value="0" styleId="dataFlowNoneOption"><fmt:message key="label.data.flow.none" /></html:option>
+		<form:select path="assignedDataFlowObject" onchange="javascript:onSelectDataInput();">
+			<form:option value="0" id="dataFlowNoneOption"><fmt:message key="label.data.flow.none" /></form:option>
 			<c:forEach items="${voteGeneralAuthoringDTO.dataFlowObjectNames}" var="dataFlowObject" varStatus="status">
-				<html:option value="${status.index+1}">${dataFlowObject}</html:option>
+				<form:option value="${status.index+1}">${dataFlowObject}</form:option>
 			</c:forEach>
-		</html:select>
+		</form:select>
 	</c:if>
 </p>