Index: lams_tool_lamc/web/learning/CombinedAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/CombinedAnswersContent.jsp,v
diff -u -r1.36 -r1.36.2.1
--- lams_tool_lamc/web/learning/CombinedAnswersContent.jsp	29 Mar 2014 02:16:23 -0000	1.36
+++ lams_tool_lamc/web/learning/CombinedAnswersContent.jsp	23 Feb 2016 14:46:50 -0000	1.36.2.1
@@ -1,104 +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-->
 
-<!--options content goes here-->
+  <c:forEach var="dto" items="${requestScope.learnerAnswersDTOList}">
 
-<p>
-	<c:out value="${mcGeneralLearnerFlowDTO.activityInstructions}" escapeXml="false" /> 
-</p>
+    <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>
+            </table>
+          </div>
+          <div class="panel-body">
+            <!-- Answer options begin -->
+            <div class="table-responsive">
+              <table class="table table-hover table-condensed">
+                <tbody>
+                  <c:forEach var="option" items="${dto.options}" varStatus="status">
+                    <tr>
+                      <td class="text-nowrap" style="vertical-align: top;">
+                          <c:choose>
+                            <c:when test="${hasEditRight}">		
+                              <input type="radio" id="${dto.questionUid}-${option.uid}" name="checkedCa${dto.questionUid}" class="noBorder" value="${dto.questionUid}-${option.uid}"
+                                     <c:if test="${option.selected}">checked="checked"</c:if>/>
+                            
+                            </c:when>
+                          <c:otherwise>
+                            <input type="radio" id="${dto.questionUid}-${option.uid}" name="checkedCa${dto.questionUid}" class="noBorder" value="${dto.questionUid}-${option.uid}" <c:if test="${option.selected}">checked="checked"</c:if> disabled="disabled">
+                          </c:otherwise>
+                    </c:choose>
+                    <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>
+      <!-- End answer options -->            
 
-<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>
+    </div>
+    </div>
+  </div>
+</div>
 
-<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true' && mcGeneralLearnerFlowDTO.passMark != '0'}">
 
-	<p>
-		<fmt:message key="label.learner.message" />
-		(
-		<c:out value="${mcGeneralLearnerFlowDTO.passMark}" />
-		)
-	</p>
 
-</c:if>
 
-<c:forEach var="dto" items="${requestScope.learnerAnswersDTOList}">
 
-	<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" items="${dto.options}" varStatus="status">
-			
-				<tr>
-		
-					<td>
-						<c:choose>
-							<c:when test="${hasEditRight}">		
-								<input type="radio" name="checkedCa${dto.questionUid}" class="noBorder" value="${dto.questionUid}-${option.uid}"
-									<c:if test="${option.selected}">checked="checked"</c:if>>
-							</c:when>
-							
-							<c:otherwise>
-								<input type="radio" name="checkedCa${dto.questionUid}" class="noBorder" value="${dto.questionUid}-${option.uid}" 
-									<c:if test="${option.selected}">checked="checked"</c:if> disabled="disabled">
-							</c:otherwise>
-						</c:choose>
-					</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>
-						</c:if>
-								
-						<c:out value="${option.mcQueOptionText}" escapeXml="false" />
-					</td>
-					
-				</tr>
-			</c:forEach>
-		</tbody>
-	</table>
-
 </c:forEach>
 
 <html:hidden property="donePreview" />
 
-<div class="space-bottom-top align-right">
-	<html:hidden property="continueOptionsCombined" value="Continue" />
+<html:hidden property="continueOptionsCombined" value="Continue" />
 
-	<c:if test="${hasEditRight}">
-		<html:button property="continueButton" styleClass="button" onclick="doSubmit();" styleId="continueButton">
-			<fmt:message key="button.continue" />
-		</html:button>
-	</c:if>
-</div>
+<c:if test="${hasEditRight}">
+  <html:button property="continueButton" styleClass="btn btn-sm btn-primary pull-right" onclick="doSubmit();" styleId="continueButton">
+    <fmt:message key="button.continue" />
+  </html:button>
+</c:if>
 
 <!--options content ends here-->