- -

+ -

+ ${assessment.passingMark} -

+ @@ -567,22 +564,22 @@ -

+ -

@@ -599,42 +596,62 @@ <%@ include file="parts/attemptsummary.jsp"%> - <%@ include file="parts/allquestions.jsp"%> +
+ <%@ include file="parts/allquestions.jsp"%> +
<%-- Reflection entry --%> -
-
-
- -
- - -
- -
- - -
- -
- - - - - - - - +
+
+
+
+ +
+ +
+ +
+
+ +
+ +
+ + +
+ +
+ + +
+ +
+ + + + + + + + +
+ +
+
+
+

- + @@ -644,7 +661,8 @@ - + @@ -653,12 +671,14 @@ - + - + @@ -678,12 +698,7 @@
-
- + -
-
- - Index: lams_tool_assessment/web/pages/learning/notebook.jsp =================================================================== diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -r3900618a37feede0762b63edea137223d4f19721 --- lams_tool_assessment/web/pages/learning/notebook.jsp (.../notebook.jsp) (revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2) +++ lams_tool_assessment/web/pages/learning/notebook.jsp (.../notebook.jsp) (revision 3900618a37feede0762b63edea137223d4f19721) @@ -1,6 +1,8 @@ -<%@ include file="/common/taglibs.jsp"%> - +<%@ include file="/common/taglibs.jsp"%> + + + <fmt:message key="label.learning.title" /> @@ -11,54 +13,46 @@ function disableFinishButton() { document.getElementById("finishButton").disabled = true; } - function submitForm(methodName){ + function submitForm(methodName) { var f = document.getElementById('reflectionForm'); f.submit(); } + + $(document).ready(function(){ + window.onload = function() { + document.getElementById("focused").focus(); + } + }); </script> </lams:head> <body class="stripes"> - - <c:set var="sessionMapID" value="${param.sessionMapID}" /> - <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" /> + <lams:Page type="learner" title="${sessionMap.title}"> - <html:form action="/learning/submitReflection" method="post" onsubmit="disableFinishButton();" styleId="reflectionForm"> - <html:hidden property="userID" /> - <html:hidden property="sessionMapID" /> + <html:form action="/learning/submitReflection" method="post" onsubmit="disableFinishButton();" styleId="reflectionForm"> + <html:hidden property="userID" /> + <html:hidden property="sessionMapID" /> - <div id="content"> - <h1> - <c:out value="${sessionMap.title}" escapeXml="true"/> - </h1> - <%@ include file="/common/messages.jsp"%> - <p> + <div class="panel"> <lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" /> - </p> - - <html:textarea cols="60" rows="8" property="entryText" styleClass="text-area" /> - - <div class="space-bottom-top align-right"> - <html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')"> - <span class="nextActivity"> - <c:choose> - <c:when test="${sessionMap.activityPosition.last}"> - <fmt:message key="label.submit" /> - </c:when> - <c:otherwise> - <fmt:message key="label.finished" /> - </c:otherwise> - </c:choose> - </span> - </html:link> </div> - </div> - </html:form> - <div id="footer"> - </div> -  + <html:textarea rows="5" property="entryText" styleClass="form-control" styleId="focused" /> + <html:link href="#nogo" styleClass="btn btn-primary voffset10 pull-right na" styleId="finishButton" onclick="submitForm('finish')"> + <c:choose> + <c:when test="${sessionMap.activityPosition.last}"> + <fmt:message key="label.submit" /> + </c:when> + <c:otherwise> + <fmt:message key="label.finished" /> + </c:otherwise> + </c:choose> + </html:link> + + </html:form> + + </lams:Page> </body> </lams:html> Index: lams_tool_assessment/web/pages/learning/parts/allquestions.jsp =================================================================== diff -u -r11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa -r3900618a37feede0762b63edea137223d4f19721 --- lams_tool_assessment/web/pages/learning/parts/allquestions.jsp (.../allquestions.jsp) (revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa) +++ lams_tool_assessment/web/pages/learning/parts/allquestions.jsp (.../allquestions.jsp) (revision 3900618a37feede0762b63edea137223d4f19721) @@ -1,64 +1,68 @@ <%@ include file="/common/taglibs.jsp"%> -<form id="answers" name="answers" method="post" action="<c:url value='/learning/submitAll.do?sessionMapID=${sessionMapID}'/>"> - <table cellspacing="0" class="alternative-color"> - <c:forEach var="question" items="${sessionMap.pagedQuestions[pageNumber-1]}" varStatus="status"> - <tr> - <c:if test="${assessment.numbered}"> - <td class="question-numbers"> - ${status.index + sessionMap.questionNumberingOffset} - </td> - </c:if> +<div class="row no-gutter"> + <div class="col-xs-12"> + <form id="answers" name="answers" method="post" action="<c:url value='/learning/submitAll.do?sessionMapID=${sessionMapID}'/>"> + <c:forEach var="question" items="${sessionMap.pagedQuestions[pageNumber-1]}" varStatus="status"> - <td style="padding-left: 0px;" id="question-area-${status.index}"> - <input type="hidden" name="questionUid${status.index}" id="questionUid${status.index}" value="${question.uid}" /> + <input type="hidden" name="questionUid${status.index}" id="questionUid${status.index}" value="${question.uid}" /> - <div class="field-name" style="padding: 10px 15px 15px;"> + <div class="panel panel-default" id="question-area-${status.index}"> + <div class="field-name panel-heading"> + <c:if test="${assessment.numbered}"> + <span class="question-numbers"> + ${status.index + sessionMap.questionNumberingOffset}. + </span> + </c:if> + <c:if test="${question.answerRequired}"> - <span style="float: left; padding-right: 5px;"> + <span class="asterisk"> <img title="* <fmt:message key="label.authoring.answer.required"/>" alt="<fmt:message key="label.authoring.answer.required"/>" src="${ctxPath}/includes/images/req.gif" /> </span> </c:if> + ${question.question} - </div> - - <c:choose> - <c:when test="${question.type == 1}"> - <%@ include file="multiplechoice.jsp"%> - </c:when> - <c:when test="${question.type == 2}"> - <%@ include file="matchingpairs.jsp"%> - </c:when> - <c:when test="${question.type == 3}"> - <%@ include file="shortanswer.jsp"%> - </c:when> - <c:when test="${question.type == 4}"> - <%@ include file="numerical.jsp"%> - </c:when> - <c:when test="${question.type == 5}"> - <%@ include file="truefalse.jsp"%> - </c:when> - <c:when test="${question.type == 6}"> - <%@ include file="essay.jsp"%> - </c:when> - <c:when test="${question.type == 7}"> - <%@ include file="ordering.jsp"%> - </c:when> - <c:when test="${question.type == 8}"> - <c:set var="questionIndex" value="${status.index}"/> - - <div id="mark-hedging-question-${question.uid}"> - <%@ include file="markhedging.jsp"%> - </div> - </c:when> - </c:choose> - - <%@ include file="questionsummary.jsp"%> - </td> - </tr> - </c:forEach> - </table> -</form> + + <div class="panel-body"> + <c:choose> + <c:when test="${question.type == 1}"> + <%@ include file="multiplechoice.jsp"%> + </c:when> + <c:when test="${question.type == 2}"> + <%@ include file="matchingpairs.jsp"%> + </c:when> + <c:when test="${question.type == 3}"> + <%@ include file="shortanswer.jsp"%> + </c:when> + <c:when test="${question.type == 4}"> + <%@ include file="numerical.jsp"%> + </c:when> + <c:when test="${question.type == 5}"> + <%@ include file="truefalse.jsp"%> + </c:when> + <c:when test="${question.type == 6}"> + <%@ include file="essay.jsp"%> + </c:when> + <c:when test="${question.type == 7}"> + <%@ include file="ordering.jsp"%> + </c:when> + <c:when test="${question.type == 8}"> + <c:set var="questionIndex" value="${status.index}"/> + + <div id="mark-hedging-question-${question.uid}"> + <%@ include file="markhedging.jsp"%> + </div> + </c:when> + </c:choose> + + <%@ include file="questionsummary.jsp"%> + </div> + + </div> + </c:forEach> + </form> + </div> +</div>  <c:if test="${fn:length(sessionMap.pagedQuestions) > 1}"> Index: lams_tool_assessment/web/pages/learning/parts/attemptsummary.jsp =================================================================== diff -u -r1e33f64c06430834c80a2b01d42bcdf844c5d958 -r3900618a37feede0762b63edea137223d4f19721 --- lams_tool_assessment/web/pages/learning/parts/attemptsummary.jsp (.../attemptsummary.jsp) (revision 1e33f64c06430834c80a2b01d42bcdf844c5d958) +++ lams_tool_assessment/web/pages/learning/parts/attemptsummary.jsp (.../attemptsummary.jsp) (revision 3900618a37feede0762b63edea137223d4f19721) @@ -1,53 +1,57 @@ <c:if test="${finishedLock}"> - <table class="forum"> - <tr> - <th style="width: 130px;"> - <fmt:message key="label.learning.summary.started.on" /> - </th> - <td > - <lams:Date value="${result.startDate}"/> - </td> - </tr> - - <tr> - <th> - <fmt:message key="label.learning.summary.completed.on" /> - </th> - <td> - <lams:Date value="${result.finishDate}" /> - </td> - </tr> - <tr> - <th> - <fmt:message key="label.learning.summary.time.taken" /> - </th> - <td> - <fmt:formatDate value="${result.timeTaken}" pattern="H" timeZone="GMT" /> <fmt:message key="label.learning.summary.hours" /> - <fmt:formatDate value="${result.timeTaken}" pattern="m" timeZone="GMT" /> <fmt:message key="label.learning.summary.minutes" /> - </td> - </tr> - <c:if test="${assessment.allowGradesAfterAttempt}"> + <lams:Alert id="attempt-summary" type="info" close="false"> + <table class="table table-hover"> <tr> + <th style="width: 130px;"> + <fmt:message key="label.learning.summary.started.on" /> + </th> + <td > + <lams:Date value="${result.startDate}"/> + </td> + </tr> + + <tr> <th> - <fmt:message key="label.learning.summary.grade" /> + <fmt:message key="label.learning.summary.completed.on" /> </th> <td> - <fmt:formatNumber value="${result.grade}" maxFractionDigits="3"/> - <fmt:message key="label.learning.summary.out.of.maximum" /> - ${result.maximumGrade} (<fmt:formatNumber value="${result.grade * 100 / result.maximumGrade}" maxFractionDigits="2"/>%) + <lams:Date value="${result.finishDate}" /> </td> </tr> - </c:if> - <c:if test="${assessment.allowOverallFeedbackAfterQuestion && (result.overallFeedback != null)}"> + <tr> <th> - <fmt:message key="label.learning.summary.feedback" /> + <fmt:message key="label.learning.summary.time.taken" /> </th> <td> - <c:out value="${result.overallFeedback}" escapeXml="true"/> + <fmt:formatDate value="${result.timeTaken}" pattern="H" timeZone="GMT" /> <fmt:message key="label.learning.summary.hours" /> + <fmt:formatDate value="${result.timeTaken}" pattern="m" timeZone="GMT" /> <fmt:message key="label.learning.summary.minutes" /> </td> - </tr> - </c:if> - </table> - <br><br> + </tr> + + <c:if test="${assessment.allowGradesAfterAttempt}"> + <tr> + <th> + <fmt:message key="label.learning.summary.grade" /> + </th> + <td> + <fmt:formatNumber value="${result.grade}" maxFractionDigits="3"/> + <fmt:message key="label.learning.summary.out.of.maximum" /> + ${result.maximumGrade} (<fmt:formatNumber value="${result.grade * 100 / result.maximumGrade}" maxFractionDigits="2"/>%) + </td> + </tr> + </c:if> + + <c:if test="${assessment.allowOverallFeedbackAfterQuestion && (result.overallFeedback != null)}"> + <tr> + <th> + <fmt:message key="label.learning.summary.feedback" /> + </th> + <td> + <c:out value="${result.overallFeedback}" escapeXml="true"/> + </td> + </tr> + </c:if> + </table> + </lams:Alert> </c:if> Index: lams_tool_assessment/web/pages/learning/parts/essay.jsp =================================================================== diff -u -r96fd6dca8151163358cff7e355fd3b473ba85484 -r3900618a37feede0762b63edea137223d4f19721 --- lams_tool_assessment/web/pages/learning/parts/essay.jsp (.../essay.jsp) (revision 96fd6dca8151163358cff7e355fd3b473ba85484) +++ lams_tool_assessment/web/pages/learning/parts/essay.jsp (.../essay.jsp) (revision 3900618a37feede0762b63edea137223d4f19721) @@ -56,62 +56,64 @@ <fmt:message key="label.learning.short.answer.answer" /> </div> -<table class="question-table"> - <c:if test="${isWordsLimitEnabled}"> +<div class="table-responsive"> + <table class="table table-hover table-condensed"> + <c:if test="${isWordsLimitEnabled}"> + <tr> + <td> + + <c:choose> + <c:when test="${question.maxWordsLimit != 0 && question.minWordsLimit != 0}"> + <div class="reg-info"> + <fmt:message key="label.info.max.and.min.number.words" > + <fmt:param>${question.minWordsLimit}</fmt:param> + <fmt:param>${question.maxWordsLimit}</fmt:param> + </fmt:message> + </div> + </c:when> + <c:when test="${question.maxWordsLimit != 0}"> + <div class="reg-info"> + <fmt:message key="label.info.maximum.number.words" > + <fmt:param>${question.maxWordsLimit}</fmt:param> + </fmt:message> + </div> + </c:when> + <c:when test="${question.minWordsLimit != 0}"> + <div class="reg-info"> + <fmt:message key="label.info.minimum.number.words" > + <fmt:param>${question.minWordsLimit}</fmt:param> + </fmt:message> + </div> + </c:when> + </c:choose> + </td> + </tr> + </c:if> + <tr> - <td class="reg-padding"> - + <td> <c:choose> - <c:when test="${question.maxWordsLimit != 0 && question.minWordsLimit != 0}"> - <div class="info"> - <fmt:message key="label.info.max.and.min.number.words" > - <fmt:param>${question.minWordsLimit}</fmt:param> - <fmt:param>${question.maxWordsLimit}</fmt:param> - </fmt:message> - </div> + <c:when test="${question.allowRichEditor && !isEditingDisabled}"> + <lams:CKEditor id="question${status.index}" value="${question.answerString}" contentFolderID="${sessionMap.learnerContentFolder}" toolbarSet="DefaultLearner"></lams:CKEditor> </c:when> - <c:when test="${question.maxWordsLimit != 0}"> - <div class="info"> - <fmt:message key="label.info.maximum.number.words" > - <fmt:param>${question.maxWordsLimit}</fmt:param> - </fmt:message> - </div> - </c:when> - <c:when test="${question.minWordsLimit != 0}"> - <div class="info"> - <fmt:message key="label.info.minimum.number.words" > - <fmt:param>${question.minWordsLimit}</fmt:param> - </fmt:message> - </div> - </c:when> + <c:when test="${question.allowRichEditor && finishedLock}"> + ${question.answerString} + </c:when> + <c:otherwise> + <lams:STRUTS-textarea property="question${status.index}" styleClass="form-control" value="${question.answerString}" disabled="${isEditingDisabled}" /> + </c:otherwise> </c:choose> </td> </tr> - </c:if> + + <c:if test="${isWordsLimitEnabled}"> + <tr> + <td> + <fmt:message key="label.words" /> <span id="word-count${status.index}">0</span> + </td> + </tr> + </c:if> + </table> +</div> - <tr> - <td class="reg-padding"> - <c:choose> - <c:when test="${question.allowRichEditor && !isEditingDisabled}"> - <lams:CKEditor id="question${status.index}" value="${question.answerString}" contentFolderID="${sessionMap.learnerContentFolder}" toolbarSet="DefaultLearner"></lams:CKEditor> - </c:when> - <c:when test="${question.allowRichEditor && finishedLock}"> - ${question.answerString} - </c:when> - <c:otherwise> - <lams:STRUTS-textarea property="question${status.index}" rows="7" cols="60" value="${question.answerString}" disabled="${isEditingDisabled}" /> - </c:otherwise> - </c:choose> - </td> - </tr> - - <c:if test="${isWordsLimitEnabled}"> - <tr> - <td class="reg-padding"> - <fmt:message key="label.words" /> <span id="word-count${status.index}">0</span> - </td> - </tr> - </c:if> -</table> - <%@ include file="markandpenaltyarea.jsp"%> Index: lams_tool_assessment/web/pages/learning/parts/markhedging.jsp =================================================================== diff -u -rdb599324881fb550c8645c904483d48ffe9f237d -r3900618a37feede0762b63edea137223d4f19721 --- lams_tool_assessment/web/pages/learning/parts/markhedging.jsp (.../markhedging.jsp) (revision db599324881fb550c8645c904483d48ffe9f237d) +++ lams_tool_assessment/web/pages/learning/parts/markhedging.jsp (.../markhedging.jsp) (revision 3900618a37feede0762b63edea137223d4f19721) @@ -6,83 +6,85 @@ </fmt:message> </div> -<table class="question-table"> - <c:forEach var="option" items="${question.options}"> - <tr> - <c:if test="${finishedLock || question.responseSubmitted}"> - <td class="complete-item-gif"> +<div class="table-responsive"> + <table class="table table-hover table-condensed"> + <c:forEach var="option" items="${question.options}"> + <tr> + <c:if test="${finishedLock || question.responseSubmitted}"> + <td class="complete-item-gif"> + + <c:if test="${assessment.allowRightAnswersAfterQuestion && option.correct}"> + <img src="<html:rewrite page='/includes/images/completeitem.gif'/>"> + </c:if> + <c:if test="${assessment.allowWrongAnswersAfterQuestion && !option.correct}"> + <img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>"> + </c:if> + + </td> + </c:if> - <c:if test="${assessment.allowRightAnswersAfterQuestion && option.correct}"> - <img src="<html:rewrite page='/includes/images/completeitem.gif'/>"> - </c:if> - <c:if test="${assessment.allowWrongAnswersAfterQuestion && !option.correct}"> - <img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>"> - </c:if> + <td> + <c:out value="${option.optionString}" escapeXml="false" /> + </td> + + <td style="width: 100px;"> + + <select name="question${questionIndex}_${option.sequenceId}" class="mark-hedging-select" data-question-index="${questionIndex}" + <c:if test="${isEditingDisabled || question.responseSubmitted}">disabled="disabled"</c:if> + > + <c:forEach var="i" begin="0" end="${question.grade}"> + <option + <c:if test="${option.answerInt == i}">selected="selected"</c:if> + >${i}</option> + </c:forEach> + + </select> </td> - </c:if> - - <td class="question-option"> - <c:out value="${option.optionString}" escapeXml="false" /> - </td> - - <td class="has-radio-button"> - - <select name="question${questionIndex}_${option.sequenceId}" class="mark-hedging-select" data-question-index="${questionIndex}" - <c:if test="${isEditingDisabled || question.responseSubmitted}">disabled="disabled"</c:if> - > - - <c:forEach var="i" begin="0" end="${question.grade}"> - <option - <c:if test="${option.answerInt == i}">selected="selected"</c:if> - >${i}</option> - </c:forEach> - - </select> - </td> - - <c:if test="${(finishedLock || question.responseSubmitted) && assessment.allowQuestionFeedback}"> - - <c:choose> - <c:when test="${option.correct}"> - <c:set var="color" scope="page" value="red" /> - </c:when> - <c:otherwise> - <c:set var="color" scope="page" value="blue" /> - </c:otherwise> - </c:choose> - - <td width="30%" style="padding:5px 10px 2px; font-style: italic; color:${color};"> - <c:if test="${option.answerInt > 0}"> - <c:out value="${option.feedback}" escapeXml="false" /> - </c:if> - </td> - </c:if> - - </tr> - </c:forEach> + + <c:if test="${(finishedLock || question.responseSubmitted) && assessment.allowQuestionFeedback}"> - <c:if test="${question.hedgingJustificationEnabled}"> - <tr> - <td> - <c:if test="${!isEditingDisabled && !question.responseSubmitted}"> - <div> - <fmt:message key="label.justify.hedging.marks" /> - </div> + <c:choose> + <c:when test="${option.correct}"> + <c:set var="color" scope="page" value="red" /> + </c:when> + <c:otherwise> + <c:set var="color" scope="page" value="blue" /> + </c:otherwise> + </c:choose> + + <td width="30%" style="padding:5px 10px 2px; font-style: italic; color:${color};"> + <c:if test="${option.answerInt > 0}"> + <c:out value="${option.feedback}" escapeXml="false" /> + </c:if> + </td> </c:if> - <lams:STRUTS-textarea property="question${questionIndex}" rows="4" cols="60" value="${question.answerString}" - disabled="${isEditingDisabled || question.responseSubmitted}" styleClass="mark-hedging-select" - /> - </td> - </tr> - </c:if> -</table> + </tr> + </c:forEach> + + <c:if test="${question.hedgingJustificationEnabled}"> + <tr> + <td> + <c:if test="${!isEditingDisabled && !question.responseSubmitted}"> + <div> + <fmt:message key="label.justify.hedging.marks" /> + </div> + </c:if> + + <lams:STRUTS-textarea property="question${questionIndex}" rows="4" cols="60" value="${question.answerString}" + disabled="${isEditingDisabled || question.responseSubmitted}" styleClass="mark-hedging-select" + /> + </td> + </tr> + </c:if> + </table> +</div> <c:if test="${!finishedLock && !question.responseSubmitted && isLeadershipEnabled && isUserLeader}"> <div class="float-right"> <html:button property="submit-hedging-question${questionIndex}" onclick="return submitSingleMarkHedgingQuestion(${question.uid}, ${questionIndex});" - styleClass="button"> + styleClass="btn pull-right"> <fmt:message key="label.learning.submit" /> </html:button> </div> Index: lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp =================================================================== diff -u -r1668e000b0959071785e5cdd21732af39bd1505f -r3900618a37feede0762b63edea137223d4f19721 --- lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp (.../matchingpairs.jsp) (revision 1668e000b0959071785e5cdd21732af39bd1505f) +++ lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp (.../matchingpairs.jsp) (revision 3900618a37feede0762b63edea137223d4f19721) @@ -4,34 +4,36 @@ <fmt:message key="label.learning.matching.pairs.pick.up" /> </div> -<table class="question-table"> - <c:forEach var="option" items="${question.options}"> - <tr> - <c:if test="${finishedLock}"> - <td class="complete-item-gif"> - - <c:if test="${assessment.allowRightAnswersAfterQuestion && (option.answerInt == option.uid)}"> - <img src="<html:rewrite page='/includes/images/completeitem.gif'/>"> - </c:if> - <c:if test="${assessment.allowWrongAnswersAfterQuestion && (option.answerInt != -1) && (option.answerInt != option.uid)}"> - <img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>"> - </c:if> - - </td> - </c:if> - <td style="padding:5px 15px 2px; width: 40%;"> - <c:out value="${option.question}" escapeXml="false" /> - </td> - <td class="question-option"> - <html:select property="question${status.index}_${option.sequenceId}" value="${option.answerInt}" disabled="${isEditingDisabled}"> - <html:option value="-1"><fmt:message key="label.learning.matching.pairs.choose" /></html:option> - <c:forEach var="selectOption" items="${question.matchingPairOptions}"> - <html:option value="${selectOption.uid}">${selectOption.optionString}</html:option> - </c:forEach> - </html:select> - </td> - </tr> - </c:forEach> -</table> +<div class="table-responsive"> + <table class="table table-hover table-condensed"> + <c:forEach var="option" items="${question.options}"> + <tr> + <c:if test="${finishedLock}"> + <td class="complete-item-gif"> + + <c:if test="${assessment.allowRightAnswersAfterQuestion && (option.answerInt == option.uid)}"> + <img src="<html:rewrite page='/includes/images/completeitem.gif'/>"> + </c:if> + <c:if test="${assessment.allowWrongAnswersAfterQuestion && (option.answerInt != -1) && (option.answerInt != option.uid)}"> + <img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>"> + </c:if> + + </td> + </c:if> + <td> + <c:out value="${option.question}" escapeXml="false" /> + </td> + <td style="width: 100px;"> + <html:select property="question${status.index}_${option.sequenceId}" value="${option.answerInt}" disabled="${isEditingDisabled}"> + <html:option value="-1"><fmt:message key="label.learning.matching.pairs.choose" /></html:option> + <c:forEach var="selectOption" items="${question.matchingPairOptions}"> + <html:option value="${selectOption.uid}">${selectOption.optionString}</html:option> + </c:forEach> + </html:select> + </td> + </tr> + </c:forEach> + </table> +</div> <%@ include file="markandpenaltyarea.jsp"%> \ No newline at end of file Index: lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp =================================================================== diff -u -r6a20d28e700fd15a65dd6d6b1d5907052219926b -r3900618a37feede0762b63edea137223d4f19721 --- lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp (.../multiplechoice.jsp) (revision 6a20d28e700fd15a65dd6d6b1d5907052219926b) +++ lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp (.../multiplechoice.jsp) (revision 3900618a37feede0762b63edea137223d4f19721) @@ -11,63 +11,67 @@ </c:choose> </div> -<table class="question-table"> - <c:forEach var="option" items="${question.options}"> - <tr> - <c:if test="${finishedLock}"> - <td class="complete-item-gif"> +<div class="table-responsive"> + <table class="table table-hover table-condensed"> + <c:forEach var="option" items="${question.options}"> + <tr> + <c:if test="${finishedLock}"> + <td class="complete-item-gif"> + + <c:if test="${assessment.allowRightAnswersAfterQuestion && option.answerBoolean && (option.grade > 0)}"> + <img src="<html:rewrite page='/includes/images/completeitem.gif'/>"> + </c:if> + <c:if test="${assessment.allowWrongAnswersAfterQuestion && option.answerBoolean && (option.grade <= 0)}"> + <img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>"> + </c:if> + + </td> + </c:if> - <c:if test="${assessment.allowRightAnswersAfterQuestion && option.answerBoolean && (option.grade > 0)}"> - <img src="<html:rewrite page='/includes/images/completeitem.gif'/>"> - </c:if> - <c:if test="${assessment.allowWrongAnswersAfterQuestion && option.answerBoolean && (option.grade <= 0)}"> - <img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>"> - </c:if> - + <td class="has-radio-button"> + <c:choose> + <c:when test="${question.multipleAnswersAllowed}"> + <input type="checkbox" name="question${status.index}_${option.sequenceId}" value="${true}" styleClass="noBorder" + <c:if test="${option.answerBoolean}">checked="checked"</c:if> + <c:if test="${isEditingDisabled}">disabled="disabled"</c:if> + /> + </c:when> + <c:otherwise> + <input type="radio" name="question${status.index}" value="${option.sequenceId}" styleClass="noBorder" + <c:if test="${option.answerBoolean}">checked="checked"</c:if> + <c:if test="${isEditingDisabled}">disabled="disabled"</c:if> + /> + </c:otherwise> + </c:choose> </td> - </c:if> - - <td class="has-radio-button"> - <c:choose> - <c:when test="${question.multipleAnswersAllowed}"> - <input type="checkbox" name="question${status.index}_${option.sequenceId}" value="${true}" styleClass="noBorder" - <c:if test="${option.answerBoolean}">checked="checked"</c:if> - <c:if test="${isEditingDisabled}">disabled="disabled"</c:if> - /> - </c:when> - <c:otherwise> - <input type="radio" name="question${status.index}" value="${option.sequenceId}" styleClass="noBorder" - <c:if test="${option.answerBoolean}">checked="checked"</c:if> - <c:if test="${isEditingDisabled}">disabled="disabled"</c:if> - /> - </c:otherwise> - </c:choose> - </td> - - <td class="question-option"> - <c:out value="${option.optionString}" escapeXml="false" /> - </td> - - <c:if test="${finishedLock && option.answerBoolean && assessment.allowQuestionFeedback}"> + + <td> + <c:out value="${option.optionString}" escapeXml="false" /> + </td> + + <c:if test="${finishedLock && assessment.allowQuestionFeedback}"> + + <c:choose> + <c:when test="${option.grade <= 0}"> + <c:set var="color" scope="page" value="red" /> + </c:when> + <c:otherwise> + <c:set var="color" scope="page" value="blue" /> + </c:otherwise> + </c:choose> + + <td style="padding:5px 10px 2px; font-style: italic; color:${color}; width=30%;"> + <c:if test="${option.answerBoolean}"> + <c:out value="${option.feedback}" escapeXml="false" /> + </c:if> + </td> + </c:if> + + </tr> + </c:forEach> + </table> +</div> - <c:choose> - <c:when test="${option.grade <= 0}"> - <c:set var="color" scope="page" value="red" /> - </c:when> - <c:otherwise> - <c:set var="color" scope="page" value="blue" /> - </c:otherwise> - </c:choose> - - <td style="padding:5px 10px 2px; font-style: italic; color:${color}; width=30%;"> - <c:out value="${option.feedback}" escapeXml="false" /> - </td> - </c:if> - - </tr> - </c:forEach> -</table> - <c:if test="${finishedLock && assessment.allowQuestionFeedback}"> <div class="question-feedback"> <c:choose> Index: lams_tool_assessment/web/pages/learning/parts/numerical.jsp =================================================================== diff -u -r7986913d0e78df6f660ee31e628cc278e9072c1a -r3900618a37feede0762b63edea137223d4f19721 --- lams_tool_assessment/web/pages/learning/parts/numerical.jsp (.../numerical.jsp) (revision 7986913d0e78df6f660ee31e628cc278e9072c1a) +++ lams_tool_assessment/web/pages/learning/parts/numerical.jsp (.../numerical.jsp) (revision 3900618a37feede0762b63edea137223d4f19721) @@ -4,27 +4,29 @@ <fmt:message key="label.learning.short.answer.answer" /> </div> -<table class="question-table"> - <tr> - <c:if test="${finishedLock}"> - <td class="complete-item-gif"> - - <c:if test="${assessment.allowRightAnswersAfterQuestion && question.answerBoolean}"> - <img src="<html:rewrite page='/includes/images/completeitem.gif'/>"> - </c:if> - <c:if test="${assessment.allowWrongAnswersAfterQuestion && !question.answerBoolean}"> - <img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>"> - </c:if> +<div class="table-responsive"> + <table class="table table-hover table-condensed"> + <tr> + <c:if test="${finishedLock}"> + <td class="complete-item-gif"> - </td> - </c:if> - <td class="reg-padding"> - <input type="text" autocomplete="off" name="question${status.index}" value="<c:out value='${question.answerString}' />" styleClass="noBorder" size="70" - <c:if test="${isEditingDisabled}">disabled="disabled"</c:if> - /> - </td> - </tr> -</table> + <c:if test="${assessment.allowRightAnswersAfterQuestion && question.answerBoolean}"> + <img src="<html:rewrite page='/includes/images/completeitem.gif'/>"> + </c:if> + <c:if test="${assessment.allowWrongAnswersAfterQuestion && !question.answerBoolean}"> + <img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>"> + </c:if> + + </td> + </c:if> + <td> + <input type="text" autocomplete="off" name="question${status.index}" value="<c:out value='${question.answerString}' />" class="form-control" + <c:if test="${isEditingDisabled}">disabled="disabled"</c:if> + /> + </td> + </tr> + </table> +</div> <c:if test="${finishedLock && assessment.allowQuestionFeedback && (question.questionFeedback != null)}"> <div class="question-feedback"> Index: lams_tool_assessment/web/pages/learning/parts/ordering.jsp =================================================================== diff -u -r71da0e76045dd5ab9dd29b50944ced6395554359 -r3900618a37feede0762b63edea137223d4f19721 --- lams_tool_assessment/web/pages/learning/parts/ordering.jsp (.../ordering.jsp) (revision 71da0e76045dd5ab9dd29b50944ced6395554359) +++ lams_tool_assessment/web/pages/learning/parts/ordering.jsp (.../ordering.jsp) (revision 3900618a37feede0762b63edea137223d4f19721) @@ -11,7 +11,8 @@ <fmt:message key="label.learning.ordering.sort.answers" /> </div> - <table class="question-table"> + <div class="table-responsive"> + <table class="table table-hover table-condensed"> <c:forEach var="option" items="${question.options}" varStatus="ordStatus"> <tr> @@ -27,13 +28,13 @@ </td> </c:if> - <td class="reg-padding"> + <td class="ordering-option"> <input type="hidden" name="question${status.index}_${option.sequenceId}" value="${option.sequenceId}" /> <c:out value="${option.optionString}" escapeXml="false" /> </td> <c:if test="${(mode != 'teacher') || !hasEditRight}"> - <td style="width text-align: center; width: 20px;" class="reg-padding"> + <td style="text-align: center; width: 20px;"> <c:if test="${not ordStatus.first and !finishedLock}"> <img src="<html:rewrite page='/includes/images/uparrow.gif'/>" border="0" title="<fmt:message key="label.authoring.basic.up"/>" @@ -58,7 +59,8 @@ </c:if> </tr> </c:forEach> - </table> + </table> + </div> <c:if test="${finishedLock && assessment.allowQuestionFeedback}"> <div class="question-feedback"> Index: lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp =================================================================== diff -u -r7986913d0e78df6f660ee31e628cc278e9072c1a -r3900618a37feede0762b63edea137223d4f19721 --- lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp (.../shortanswer.jsp) (revision 7986913d0e78df6f660ee31e628cc278e9072c1a) +++ lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp (.../shortanswer.jsp) (revision 3900618a37feede0762b63edea137223d4f19721) @@ -4,28 +4,28 @@ <fmt:message key="label.learning.short.answer.answer" /> </div> -<table class="question-table"> - <tr> - - <c:if test="${finishedLock}"> - <td class="complete-item-gif"> - <c:if test="${assessment.allowRightAnswersAfterQuestion && question.answerBoolean}"> - <img src="<html:rewrite page='/includes/images/completeitem.gif'/>"> - </c:if> - <c:if test="${assessment.allowWrongAnswersAfterQuestion && !question.answerBoolean}"> - <img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>"> - </c:if> - </td> - </c:if> - - <td class="reg-padding"> - <input type="text" autocomplete="off" name="question${status.index}" value="<c:out value='${question.answerString}' />" styleClass="noBorder" size="70" - <c:if test="${isEditingDisabled}">disabled="disabled"</c:if> - /> - </td> - - </tr> -</table> +<div class="table-responsive"> + <table class="table table-hover table-condensed"> + <tr> + <c:if test="${finishedLock}"> + <td class="complete-item-gif"> + <c:if test="${assessment.allowRightAnswersAfterQuestion && question.answerBoolean}"> + <img src="<html:rewrite page='/includes/images/completeitem.gif'/>"> + </c:if> + <c:if test="${assessment.allowWrongAnswersAfterQuestion && !question.answerBoolean}"> + <img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>"> + </c:if> + </td> + </c:if> + + <td> + <input type="text" autocomplete="off" name="question${status.index}" value="<c:out value='${question.answerString}' />" class="form-control" + <c:if test="${isEditingDisabled}">disabled="disabled"</c:if> + /> + </td> + </tr> + </table> +</div> <c:if test="${finishedLock && assessment.allowQuestionFeedback && (question.questionFeedback != null)}"> <div class="question-feedback"> Index: lams_tool_assessment/web/pages/learning/parts/truefalse.jsp =================================================================== diff -u -r1668e000b0959071785e5cdd21732af39bd1505f -r3900618a37feede0762b63edea137223d4f19721 --- lams_tool_assessment/web/pages/learning/parts/truefalse.jsp (.../truefalse.jsp) (revision 1668e000b0959071785e5cdd21732af39bd1505f) +++ lams_tool_assessment/web/pages/learning/parts/truefalse.jsp (.../truefalse.jsp) (revision 3900618a37feede0762b63edea137223d4f19721) @@ -4,7 +4,8 @@ <fmt:message key="label.learning.short.answer.answer" /> </div> -<table class="question-table"> +<div class="table-responsive"> + <table class="table table-hover table-condensed"> <tr> <c:if test="${finishedLock}"> <td class="complete-item-gif"> @@ -32,7 +33,7 @@ <c:if test="${isEditingDisabled}">disabled="disabled"</c:if> /> </td> - <td class="question-option"> + <td> <fmt:message key="label.learning.true.false.true" /> </td> </tr> @@ -62,13 +63,13 @@ <c:if test="${isEditingDisabled}">disabled="disabled"</c:if> /> </td> - <td class="question-option"> + <td> <fmt:message key="label.learning.true.false.false" /> </td> - </tr> + </tr> + </table> +</div> -</table> - <c:if test="${finishedLock && assessment.allowQuestionFeedback && (question.answerString != null)}"> <c:choose> <c:when test="${question.answerBoolean}"> Index: lams_tool_assessment/web/pages/learning/start.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r3900618a37feede0762b63edea137223d4f19721 --- lams_tool_assessment/web/pages/learning/start.jsp (.../start.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_assessment/web/pages/learning/start.jsp (.../start.jsp) (revision 3900618a37feede0762b63edea137223d4f19721) @@ -1,7 +1,7 @@ <!DOCTYPE html> - <%@ include file="/common/taglibs.jsp"%> <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/> + <html> <body class="stripes"> <script type="text/javascript"> Index: lams_tool_assessment/web/pages/learning/submissionDeadline.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r3900618a37feede0762b63edea137223d4f19721 --- lams_tool_assessment/web/pages/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_assessment/web/pages/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 3900618a37feede0762b63edea137223d4f19721) @@ -1,52 +1,42 @@ <!DOCTYPE html> <%@include file="/common/taglibs.jsp"%> <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" /> +<c:set var="title" scope="request"><fmt:message key="activity.title" /></c:set> + <lams:html> <lams:head> <%@ include file="/common/header.jsp"%> <script type="text/javascript"> -  </script> </lams:head> <body class="stripes"> - <div id="content"> - <h1> - <c:out value="${sessionMap.title}" escapeXml="true"/> - </h1> - - <div class="warning"> + <lams:Page type="learner" title="${sessionMap.title}"> + + <lams:Alert id="submission-deadline" type="danger" close="false"> <fmt:message key="authoring.info.teacher.set.restriction" > <fmt:param><lams:Date value="${sessionMap.submissionDeadline}" /></fmt:param> </fmt:message> - </div> - - <div class="space-bottom-top align-right"> - <html:link href="#nogo" property="FinishButton" styleId="finishButton" - onclick="return finishSession()" styleClass="button"> - <span class="nextActivity"> - <c:choose> - <c:when test="${sessionMap.activityPosition.last}"> - <fmt:message key="label.submit" /> - </c:when> - <c:otherwise> - <fmt:message key="label.finished" /> - </c:otherwise> - </c:choose> - </span> - </html:link> - </div> - </div> - <div id="footer"> - </div> -  - + </lams:Alert> + + <html:link href="#nogo" property="FinishButton" styleId="finishButton" + onclick="return finishSession()" styleClass="btn btn-primary voffset10 pull-right na"> + <c:choose> + <c:when test="${sessionMap.activityPosition.last}"> + <fmt:message key="label.submit" /> + </c:when> + <c:otherwise> + <fmt:message key="label.finished" /> + </c:otherwise> + </c:choose> + </html:link> + + </lams:Page> </body> </lams:html> Index: lams_tool_assessment/web/pages/learning/waitforleader.jsp =================================================================== diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -r3900618a37feede0762b63edea137223d4f19721 --- lams_tool_assessment/web/pages/learning/waitforleader.jsp (.../waitforleader.jsp) (revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2) +++ lams_tool_assessment/web/pages/learning/waitforleader.jsp (.../waitforleader.jsp) (revision 3900618a37feede0762b63edea137223d4f19721) @@ -1,5 +1,4 @@ <!DOCTYPE html> - <%@ include file="/common/taglibs.jsp"%> <lams:html> @@ -20,37 +19,29 @@ </lams:head> <body class="stripes"> - <div id="content"> - <h1> - <c:out value="${assessment.title}" escapeXml="true"/> - </h1> + <lams:Page type="learner" title="${content.title}"> - <h2> + <h4> <fmt:message key="label.waiting.for.leader" /> - </h2> + </h4> <div> <fmt:message key="label.users.from.group" /> </div> <div> <c:forEach var="user" items="${groupUsers}" varStatus="status"> - <div> + <div class="user"> <c:out value="${user.firstName}" escapeXml="true"/> <c:out value="${user.lastName}" escapeXml="true"/> </div> </c:forEach> </div> - <div class="space-bottom-top align-right"> - <html:button property="refreshButton" onclick="refresh();" styleClass="button"> - <fmt:message key="label.refresh" /> - </html:button> - </div> + <html:button property="refreshButton" onclick="refresh();" styleClass="btn btn-sm btn-primary pull-right"> + <fmt:message key="label.refresh" /> + </html:button> - </div> + </lams:Page> - <div id="footer"> - </div> - </body> </lams:html>