Index: lams_tool_laqa/web/learning/mobile/CombinedAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/mobile/CombinedAnswersContent.jsp,v
diff -u -r1.2 -r1.2.2.1
--- lams_tool_laqa/web/learning/mobile/CombinedAnswersContent.jsp	8 Jan 2014 17:50:54 -0000	1.2
+++ lams_tool_laqa/web/learning/mobile/CombinedAnswersContent.jsp	15 Jun 2015 22:24:55 -0000	1.2.2.1
@@ -12,55 +12,69 @@
 	<lams:WebAppURL />
 </c:set>
 
-<ul data-role="listview" data-theme="c" id="qaQuestions">
-	<c:forEach var="questionEntry" items="${generalLearnerFlowDTO.mapQuestionContentLearner}">
-		<c:forEach var="answerEntry" items="${generalLearnerFlowDTO.mapAnswers}">
-			<c:if test="${questionEntry.key == answerEntry.key}">
+<c:forEach var="questionEntry" items="${generalLearnerFlowDTO.mapQuestionContentLearner}">
+	<c:forEach var="answerEntry" items="${generalLearnerFlowDTO.mapAnswers}">
 	
-			<li>
-				<p class="space-top">
-				 	<strong><fmt:message key="label.question" /> 
-				 	<c:out	value="${questionEntry.key}" />:</strong>
+		<c:if test="${questionEntry.key == answerEntry.key}">
+		
+			<div class="shading-bg">
+				<p>
+			 		<strong>
+			 			<fmt:message key="label.question" /> 
+			 			<c:out value="${questionEntry.key}" />:
+			 		</strong>
 					<c:if test="${questionEntry.value.required}">
 						<fmt:message key="label.required" />
 					</c:if>
+					<c:if test="${questionEntry.value.minWordsLimit != 0}">
+						<fmt:message key="label.minimum.number.words" >
+							<fmt:param>&nbsp;${questionEntry.value.minWordsLimit}</fmt:param>
+						</fmt:message>
+					</c:if>	
 					<c:out value="${questionEntry.value.question}" escapeXml="false" />
 				</p>
-					
-				<p class="small-space-top">
+								 
+				<p>
 					<strong><fmt:message key="label.answer" /></strong>
 				</p>
+				
+				<c:choose>
+					<c:when test="${hasEditRight}">
 					
-				<div class="small-space-bottom">
-					<c:choose>
-						<c:when test="${hasEditRight}">
-							<lams:textarea name="answer${questionEntry.key}" rows="5" cols="60" class="text-area" ><c:out value='${answerEntry.value}' escapeXml='false' /></lams:textarea>
-						</c:when>
+						<div data-sequence-id="${questionEntry.key}" data-is-ckeditor="${generalLearnerFlowDTO.allowRichEditor}"
+							 data-min-words-limit="${questionEntry.value.minWordsLimit}"
+							<c:if test="${questionEntry.value.minWordsLimit != 0}">class="min-words-limit-enabled"</c:if>
+						>
+							<c:choose>
+								<c:when test="${generalLearnerFlowDTO.allowRichEditor}">
+									<lams:CKEditor id="answer${questionEntry.key}" value="${answerEntry.value}"
+										contentFolderID="${sessionMap.learnerContentFolder}" toolbarSet="DefaultLearner">
+									</lams:CKEditor>
+								</c:when>
 						
-						<c:otherwise>
-							<lams:textarea name="answer${questionEntry.key}" rows="5" cols="60" class="text-area" disabled="disabled"><c:out value='${answerEntry.value}' escapeXml='false' /></lams:textarea>
-						</c:otherwise>
-					</c:choose>
-
-				</div>
-			</li>
-			
-			</c:if>
-		</c:forEach>
+								<c:otherwise>
+									<lams:textarea name="answer${questionEntry.key}" id="answer${questionEntry.key}" rows="5" cols="60" class="text-area"><c:out value='${answerEntry.value}' escapeXml='false' /></lams:textarea>
+								</c:otherwise>
+							</c:choose>
+						</div>
+						
+					</c:when>
+					
+					<c:otherwise>
+						<lams:textarea name="answer${questionEntry.key}" rows="5" cols="60" class="text-area" disabled="disabled"><c:out value='${answerEntry.value}' escapeXml='false' /></lams:textarea>
+					</c:otherwise>
+				</c:choose>
+			</div>
+		
+		</c:if>
+	
 	</c:forEach>
-</ul>
+</c:forEach>
 
 <c:if test="${hasEditRight}">
-	<div class="space-top button-inside">
-		<button name="btnCombined" onclick="javascript:submitMethod('submitAnswersContent');" data-theme="b">
+	<div class="space-bottom-top align-right">
+		<html:button property="btnCombined" onclick="javascript:submitMethod('submitAnswersContent');"	styleClass="button">
 			<fmt:message key="button.submitAllContent" />
-		</button>
+		</html:button>
 	</div>
-</c:if>
-
-</div><!-- /page div -->
-
-<div data-role="footer" data-theme="b">
-	<h2>&nbsp;</h2>
-</div><!-- /footer -->
-
+</c:if>
\ No newline at end of file