Index: lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
===================================================================
diff -u -r55645d4b796f36715b66a70fce66406a986ee647 -r099554309e1f77769667c041fb6d0fa91a89ea03
--- lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision 55645d4b796f36715b66a70fce66406a986ee647)
+++ lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision 099554309e1f77769667c041fb6d0fa91a89ea03)
@@ -5,76 +5,96 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
-<c:set var="tool">
-	<lams:WebAppURL />
-</c:set>
+<c:forEach var="questionEntry"
+	items="${generalLearnerFlowDTO.mapQuestionContentLearner}">
+	<c:forEach var="answerEntry"
+		items="${generalLearnerFlowDTO.mapAnswers}">
 
-<c:forEach var="questionEntry" items="${generalLearnerFlowDTO.mapQuestionContentLearner}">
-	<c:forEach var="answerEntry" items="${generalLearnerFlowDTO.mapAnswers}">
-	
 		<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>
-					<strong><fmt:message key="label.answer" /></strong>
-				</p>
-				
-				<c:choose>
-					<c:when test="${hasEditRight}">
-					
-						<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>
-						>
+			<div class="row no-gutter">
+				<div class="col-xs-12">
+					<div class="panel panel-default">
+						<div class="panel-heading">
+							<div class="panel-title">
+								<strong> <fmt:message key="label.question" /> <c:out
+										value="${questionEntry.key}" /> 
+								</strong>
+							</div>
+						</div>
+						<div class="panel-body">
+							<div class="panel"><c:out value="${questionEntry.value.question}" escapeXml="false" /></div>
+						
+							<div class="answer-req">
+							<fmt:message key="label.learning.yourAnswer" /> 
+							<c:if
+									test="${questionEntry.value.required}">
+									<small><mark>
+											<fmt:message key="label.required" />
+										</mark></small>
+								</c:if> <c:if test="${questionEntry.value.minWordsLimit != 0}">
+									<br/><small><em>- <fmt:message key="label.minimum.number.words">
+											<fmt:param>&nbsp;${questionEntry.value.minWordsLimit}</fmt:param>
+										</fmt:message>
+									</em></small>
+								</c:if>
+								</div>
+
 							<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 test="${hasEditRight}">
+
+									<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}"
+													id="answer${questionEntry.key}" rows="5"
+													class="form-control"><c:out value='${answerEntry.value}' escapeXml='false' /></lams:textarea>
+											</c:otherwise>
+										</c:choose>
+									</div>
+
 								</c:when>
-						
+
 								<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>
+									<lams:textarea name="answer${questionEntry.key}" rows="5"
+										class="form-control" disabled="disabled">
+										<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>
+				</div>
 			</div>
-		
 		</c:if>
-	
+
 	</c:forEach>
 </c:forEach>
 
 <c:if test="${hasEditRight}">
-	<div class="space-bottom-top align-right">
-		<html:button property="btnCombined" onclick="javascript:submitMethod('submitAnswersContent');"	styleClass="button">
+	<div class="right-buttons">
+		<html:button property="btnCombined"
+			onclick="javascript:submitMethod('submitAnswersContent');"
+			styleClass="btn btn-primary pull-right voffset5">
 			<fmt:message key="button.submitAllContent" />
 		</html:button>
 	</div>
-</c:if>
\ No newline at end of file
+</c:if>
+
+
+<script type="text/javascript">
+	window.onload = function() {
+		document.getElementById("answer1").focus();
+	}
+</script>
+