Index: lams_tool_laqa/web/authoring/addCondition.jsp
===================================================================
diff -u -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271 -r2f53601ac19db5f846eb50d31a111e12ff136a0a
--- lams_tool_laqa/web/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
+++ lams_tool_laqa/web/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 2f53601ac19db5f846eb50d31a111e12ff136a0a)
@@ -1,45 +1,41 @@
 <!DOCTYPE html>
-		
 <%@ include file="/common/taglibs.jsp"%>
 	
 <div class="panel panel-default">
-<div class="panel-heading">
-	<div class="panel-title"><fmt:message key="label.authoring.conditions.add.condition" /></div>
-</div>
+	<div class="panel-heading">
+		<div class="panel-title"><fmt:message key="label.authoring.conditions.add.condition" /></div>
+	</div>
 
-<div class="panel-body">	
-
-	<!-- Basic Info Form-->
-	<%@ include file="/common/messages.jsp"%>
-	<html:form action="/authoring/saveOrUpdateCondition" method="post" styleId="QaConditionForm" focus="displayName" >
-		<html:hidden property="orderId" />
-		
-		<div class="form-group">
-		    <label for="displayName"><fmt:message key="label.authoring.conditions.condition.name" /> *</label>
-		    <html:text tabindex="1" property="displayName" size="51" styleClass="form-control"/>
+	<div class="panel-body">	
+	
+		<!-- Basic Info Form-->
+		<form:form action="saveOrUpdateCondition.do" method="post" modelAttribute="QaConditionForm" id="QaConditionForm" >
+			<%@ include file="/common/messages.jsp"%>
+			<form:hidden path="orderId" />
+			
+			<div class="form-group">
+			    <label for="displayName"><fmt:message key="label.authoring.conditions.condition.name" /> *</label>
+			    <form:input tabindex="1" path="displayName" size="51" cssClass="form-control"/>
+			</div>
+	
+			<%-- Text search form fields are being included --%>
+			<lams:TextSearch wrapInFormTag="false" sessionMapID="${sessionMapID}"  />
+						
+			<h4><fmt:message key="textsearch.questions" /></h4>
+			<c:forEach var="itemE" items="${QaConditionForm.possibleItems}">
+				<div class="checkbox">
+					<label>
+						<form:checkbox path="selectedItems" value="${itemE.key}"/>
+						<c:out value="${itemE.value}"/>
+					</label>
+				</div>
+			</c:forEach>
+			
+		</form:form>
+	
+		<div class="voffset5 pull-right">
+		    <a href="#" onclick="hideConditionMessage();" class="btn btn-default btn-xs"><fmt:message key="label.cancel" /> </a>
+			<a href="#" onclick="submitCondition()" class="btn btn-default btn-xs"><fmt:message key="label.save.question" /> </a>
 		</div>
-
-		<%-- Text search form fields are being included --%>
-		<lams:TextSearch wrapInFormTag="false" sessionMapID="${sessionMapID}"  />
-					
-		<h4><fmt:message key="textsearch.questions" /></h4>
-		<div class="checkbox">
-		<logic:iterate name="QaConditionForm" id="itemE" property="possibleItems">
-			<div class="checkbox">
-			<label>
-		  	<html:multibox property="selectedItems" >
-		    	<bean:write name="itemE" property="value" />
-		  	</html:multibox>
-		    <bean:write name="itemE" property="label"/>
-		    </label>
-		    </div>
-		</logic:iterate>
-		
-	</html:form>
-
-	<div class="voffset5 pull-right">
-	    <a href="#" onclick="hideConditionMessage();" class="btn btn-default btn-xs"><fmt:message key="label.cancel" /> </a>
-		<a href="#" onclick="submitCondition()" class="btn btn-default btn-xs"><fmt:message key="label.save.question" /> </a>
 	</div>
-</div>
 </div>
\ No newline at end of file
