Index: lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp
===================================================================
diff -u -r1a02559e19419af9991eaeb9363f809355b39bc7 -rc048314fbc71e9f6125f8298849b394f45ff6c55
--- lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp	(.../SingleQuestionAnswersContent.jsp)	(revision 1a02559e19419af9991eaeb9363f809355b39bc7)
+++ lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp	(.../SingleQuestionAnswersContent.jsp)	(revision c048314fbc71e9f6125f8298849b394f45ff6c55)
@@ -1,105 +1,88 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
-<c:set var="tool">
-	<lams:WebAppURL />
-</c:set>
-
 <!--options content goes here-->
 
-<p>
-	<c:out value="${mcGeneralLearnerFlowDTO.activityInstructions}" escapeXml="false" />
-</p>
-
-<c:if test="${not empty mcLearnerStarterDTO.submissionDeadline}">
-	<div class="info">
-		<fmt:message key="authoring.info.teacher.set.restriction" >
-			<fmt:param><lams:Date value="${mcLearnerStarterDTO.submissionDeadline}" /></fmt:param>
-		</fmt:message>	
-	</div>
-</c:if>
-
-<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true' && mcGeneralLearnerFlowDTO.passMark != '0'}">
-	<strong> <fmt:message key="label.learner.message" /> ( <c:out
-			value="${mcGeneralLearnerFlowDTO.passMark}" /> ) 
-	</strong>
-</c:if>
-
 <html:hidden property="nextQuestionSelected" />
 <html:hidden property="continueOptionsCombined" />
 <html:hidden property="questionIndex" value="${mcGeneralLearnerFlowDTO.questionIndex}" />
 
-<c:forEach var="dto" varStatus="status"	items="${requestScope.learnerAnswersDTOList}">
+<c:forEach var="dto" varStatus="status" items="${requestScope.learnerAnswersDTOList}">
 	<c:if test="${dto.displayOrder == mcGeneralLearnerFlowDTO.questionIndex}">
-	
-		<div class="shading-bg">
-			<div style="overflow: auto;">
-				<span class="float-left space-right">
-					${dto.displayOrder})
-				</span>
-				<c:out value="${dto.question}" escapeXml="false" />
-				
-				<c:if test="${mcGeneralLearnerFlowDTO.showMarks == 'true'}">
-					[
-					<strong> <fmt:message key="label.mark" /> </strong>
-					<c:out value="${dto.mark}" />
-					]
-				</c:if>				
-			</div>
-		</div>
-		
-		<table class="indent">
-			<tbody>
-				<c:forEach var="option" varStatus="status" items="${dto.options}">
-					<tr>
-					
-						<td>
-							<input type="radio" name="checkedCa" class="noBorder" value="${dto.questionUid}-${option.uid}"
-								<c:if test="${option.selected}">checked="checked"</c:if>>
-						</td>
-		
-						<td width="100%">
-							<c:if test="${isPrefixAnswersWithLetters}">
-								<c:set var="seqLetter" value="${status.index}"/>
-								<span class="float-left">
-									<%=Character.toChars(97 + (Integer)pageContext.getAttribute("seqLetter"))%>)
-								</span>
+
+		<div class="row no-gutter">
+			<div class="col-xs-12">
+				<div class="panel panel-default">
+					<div class="panel-heading">
+						<table>
+							<tr>
+								<td style="vertical-align: top;">${dto.displayOrder})</td>
+								<td width="100%" style="padding-left: 5px"><c:out value="${dto.question}" escapeXml="false" /></td>
+							</tr>
+							<c:if test="${mcGeneralLearnerFlowDTO.showMarks == 'true'}">
+								<tr>
+									<td width="100%" colspan="2">[ <strong><fmt:message key="label.mark" /></strong> <c:out
+											value="${dto.mark}" /> ]
+									</td>
+								</tr>
 							</c:if>
-								
-							<c:out value="${option.mcQueOptionText}" escapeXml="false" />
-						</td>
-					
-					</tr>
-				</c:forEach>
-			</tbody>
-		</table>
+						</table>
+					</div>
+					<!-- Display answers -->
+					<div class="panel-body">
+						<div class="table-responsive">
+							<table class="table table-hover table-condensed">
+								<tbody>
+									<c:forEach var="option" varStatus="status" items="${dto.options}">
+										<tr>
+											<td class="text-nowrap" style="vertical-align: top;"><input type="radio"
+												id="${dto.questionUid}-${option.uid}" name="checkedCa" class="noBorder"
+												value="${dto.questionUid}-${option.uid}" <c:if test="${option.selected}">checked="checked"</c:if> /> <c:if
+													test="${isPrefixAnswersWithLetters}">
+													<c:set var="seqLetter" value="${status.index}" />
+													<%=Character
+									.toChars(97 + (Integer) pageContext
+											.getAttribute("seqLetter"))%>)
+                              </c:if></td>
 
+											<td width="100%"><label for="${dto.questionUid}-${option.uid}"> <c:out
+														value="${option.mcQueOptionText}" escapeXml="false" />
+											</label></td>
+
+										</tr>
+									</c:forEach>
+
+								</tbody>
+							</table>
+						</div>
+					</div>
+					<!-- end display answers -->
+				</div>
+			</div>
+		</div>
 	</c:if>
 </c:forEach>
 
 <html:hidden property="donePreview" />
 
-<div class="space-bottom-top">
-    <c:if test="${mcGeneralLearnerFlowDTO.totalCountReached != 'true'  &&  mcGeneralLearnerFlowDTO.totalQuestionCount != '1'}"> 
-    	<html:button property="continueOptionsCombined" onclick="submitNextQuestionSelected();" styleClass="button"> 
-        	<fmt:message key="button.continue" /> 
-        </html:button> 
-    </c:if>
+<c:if
+	test="${mcGeneralLearnerFlowDTO.totalCountReached != 'true'  &&  mcGeneralLearnerFlowDTO.totalQuestionCount != '1'}">
+	<html:button property="continueOptionsCombined" onclick="submitNextQuestionSelected();"
+		styleClass="btn btn-sm btn-primary pull-right">
+		<fmt:message key="button.continue" />
+	</html:button>
+</c:if>
 
-	<c:if test="${mcGeneralLearnerFlowDTO.totalQuestionCount == '1'}">
-		<html:button property="continueOptionsCombined" onclick="doSubmit();" styleClass="button">
-			<fmt:message key="button.continue" />
-		</html:button>
-	</c:if>
+<c:if test="${mcGeneralLearnerFlowDTO.totalQuestionCount == '1'}">
+	<html:button property="continueOptionsCombined" onclick="doSubmit();" styleClass="btn btn-sm btn-primary pull-right">
+		<fmt:message key="button.continue" />
+	</html:button>
+</c:if>
 
-	<c:if test="${mcGeneralLearnerFlowDTO.totalCountReached == 'true'}">
-		<html:button property="continueOptionsCombined" onclick="submitAllAnswers();" styleClass="button">
-			<fmt:message key="button.submit" />
-		</html:button>
-	</c:if>
+<c:if test="${mcGeneralLearnerFlowDTO.totalCountReached == 'true'}">
+	<html:button property="continueOptionsCombined" onclick="submitAllAnswers();"
+		styleClass="btn btn-sm btn-primary pull-right">
+		<fmt:message key="button.submit" />
+	</html:button>
+</c:if>
 
-	<p>&nbsp;</p>
-</div>
 <!--options content ends here-->