Index: lams_central/web/questions/questionChoice.jsp
===================================================================
diff -u -r0f295260a6f4f68d391ed74f3a7967fbf841af90 -r784731558fee35bec1bcb6ce76ecf352b5856db5
--- lams_central/web/questions/questionChoice.jsp	(.../questionChoice.jsp)	(revision 0f295260a6f4f68d391ed74f3a7967fbf841af90)
+++ lams_central/web/questions/questionChoice.jsp	(.../questionChoice.jsp)	(revision 784731558fee35bec1bcb6ce76ecf352b5856db5)
@@ -156,148 +156,163 @@
 </c:set>
 
 <lams:Page type="admin" title="${title}">
-
-	<lams:Alert id="errorArea" type="danger" close="false">
-		<fmt:message key="label.questions.choice.missing" />
-	</lams:Alert>
-	
-	<input id="selectAll" type="checkbox" /><fmt:message key="label.questions.choice.select.all" /><br /><br />
-			       
-	<form id="questionForm" method="POST">
-		<input type="hidden" name="questionCount" value="${fn:length(questions)}" />
-		
-		<c:if test="${not empty collections}">
-			<!-- Choose a collection where questions should be imported to -->
-			<label id="collectionSelect">
-				<fmt:message key="label.questions.choice.collection" />&nbsp;
-				<select name="collectionUid" id="collectionUid">
-					<c:forEach items="${collections}" var="collection">
-						<option value="${collection.uid}" ${empty collection.personal ? "selected" : ""}>
-							<c:out value="${collection.name}"/> 
-						</option>
-					</c:forEach>
-				</select>
-			</label>
-		</c:if>
-		
-		<c:forEach var="question" items="${questions}" varStatus="questionStatus">
-			<%-- Question itself --%>
-			<input id="question${questionStatus.index}" name="question${questionStatus.index}"
-			       value="<c:out value='${question.title}' />"
-			       class="question" type="checkbox" />${questionStatus.index + 1}.
-     		<c:choose>
-				<c:when test="${question.type eq 'mc'}">
-					(<fmt:message key="label.questions.choice.type.mc" />)
-				</c:when>
-				<c:when test="${question.type eq 'mr'}">
-					(<fmt:message key="label.questions.choice.type.mr" />)
-				</c:when>
-				<c:when test="${question.type eq 'mt'}">
-					(<fmt:message key="label.questions.choice.type.mt" />)
-				</c:when>
-				<c:when test="${question.type eq 'fb'}">
-					(<fmt:message key="label.questions.choice.type.fb" />)
-				</c:when>
-				<c:when test="${question.type eq 'es'}">
-					(<fmt:message key="label.questions.choice.type.es" />)
-				</c:when>
-				<c:when test="${question.type eq 'tf'}">
-					(<fmt:message key="label.questions.choice.type.tf" />)
-				</c:when>
-				<c:when test="${question.type eq 'mh'}">
-					(<fmt:message key="label.questions.choice.type.mh" />)
-				</c:when>
-				<c:otherwise>
-					(<fmt:message key="label.questions.choice.type.unknown" />)
-				</c:otherwise>
-			</c:choose>
-			<c:out value='${question.title}' />
+	<c:choose>
+		<c:when test="${empty questions}">
+			<lams:Alert type="info" close="false">
+				<fmt:message key="label.questions.choice.none.found" />
+			</lams:Alert>
 			
-			<input id="question${questionStatus.index}label" name="question${questionStatus.index}label"
-			       value="<c:out value='${question.label}' />"
-			       class="questionAttribute" type="hidden" />
-			       
-			<input id="question${questionStatus.index}text" name="question${questionStatus.index}text"
-			       value="<c:out value='${question.text}' />"
-			       class="questionAttribute" type="hidden" disabled="disabled" />
-			       <div class="questionText">${question.text}</div><br />
-			<input type="hidden" id="question${questionStatus.index}type" name="question${questionStatus.index}type"
-		           value="${question.type}"
-		           class="questionAttribute" disabled="disabled" />
-		           
-		    <c:if test="${not empty question.score}">
-		     	<input type="hidden" id="question${questionStatus.index}score" name="question${questionStatus.index}score"
-		           value="${question.score}"
-		           class="questionAttribute" disabled="disabled" />
-		    </c:if>
-			<%-- Question feedback --%>
-		    <input type="hidden" id="question${questionStatus.index}feedback" name="question${questionStatus.index}feedback"
-		           value="<c:out value='${question.feedback}' />"
-		           class="questionAttribute" disabled="disabled" />
-		    <%-- If question contains images, where to take them from --%>
-		    <input type="hidden" id="question${questionStatus.index}resourcesFolder"
-		           name="question${questionStatus.index}resourcesFolder"
-		           value="<c:out value='${question.resourcesFolderPath}' />"
-		           class="questionAttribute" disabled="disabled" />
-		    <%-- Answers, if required and exist --%>
-			<c:if test="${fn:length(question.answers) > 0}">
-				<div id="question${questionStatus.index}answerDiv" class="answerDiv">
-					<input type="hidden" name="answerCount${questionStatus.index}" 
-					       value="${fn:length(question.answers)}" />
-					<c:forEach var="answer" items="${question.answers}" varStatus="answerStatus">
-						<%-- Answer itself --%>
-						<c:choose>
-							<c:when test="${question.type eq 'mc' or question.type eq 'mr' or question.type eq 'mh' or question.type eq 'fb'}">
-								<input name="question${questionStatus.index}answer${answerStatus.index}"
-					       			   value="<c:out value='${answer.text}' />" class="answer"
-					       			   type="checkbox" checked="checked" disabled="disabled" />${answer.text}<br />
-			       			</c:when>
-			       			<c:otherwise>
-			       				<%-- Do not display answers if management is too difficult or pointless --%>
-								<input name="question${questionStatus.index}answer${answerStatus.index}"
-					       			   value="<c:out value='${answer.text}' />"
-					       			   type="hidden" disabled="disabled" />
-							</c:otherwise>
-						</c:choose>
-			       		<%-- Answers score and feedback --%>
-			       		<input type="hidden" name="question${questionStatus.index}answer${answerStatus.index}score"
-						       value="${answer.score}" disabled="disabled" />
-						<input type="hidden" name="question${questionStatus.index}answer${answerStatus.index}feedback"
-		           			   value="<c:out value='${answer.feedback}' />" disabled="disabled" />
-					</c:forEach>
-					<c:if test="${question.type eq 'mt'}">
-						<input type="hidden" name="matchAnswerCount${questionStatus.index}" 
-						       value="${fn:length(question.matchAnswers)}" />
-						<c:forEach var="matchAnswer" items="${question.matchAnswers}" varStatus="matchAnswerStatus">
-							<input name="question${questionStatus.index}matchAnswer${matchAnswerStatus.index}"
-					       		   value="<c:out value='${matchAnswer.text}' />"
-					       		   type="hidden" disabled="disabled" />
+			<div id="buttonsDiv" class="voffset10 pull-right">
+				<input class="btn btn-default" value='<fmt:message key="button.cancel"/>' type="button" onClick="javascript:window.close()" />
+			</div>
+		</c:when>
+		<c:otherwise>
+			<lams:Alert id="errorArea" type="danger" close="false">
+				<fmt:message key="label.questions.choice.missing" />
+			</lams:Alert>
+			
+			<input id="selectAll" type="checkbox" /><fmt:message key="label.questions.choice.select.all" /><br /><br />
+					       
+			<form id="questionForm" method="POST">
+				<input type="hidden" name="questionCount" value="${fn:length(questions)}" />
+				
+				<c:if test="${not empty collections}">
+					<!-- Choose a collection where questions should be imported to -->
+					<label id="collectionSelect">
+						<fmt:message key="label.questions.choice.collection" />&nbsp;
+						<select name="collectionUid" id="collectionUid">
+							<c:forEach items="${collections}" var="collection">
+								<option value="${collection.uid}" ${empty collection.personal ? "selected" : ""}>
+									<c:out value="${collection.name}"/> 
+								</option>
+							</c:forEach>
+						</select>
+					</label>
+				</c:if>
+				
+				<c:forEach var="question" items="${questions}" varStatus="questionStatus">
+					<%-- Question itself --%>
+					<input id="question${questionStatus.index}" name="question${questionStatus.index}"
+					       value="<c:out value='${question.title}' />"
+					       class="question" type="checkbox" />${questionStatus.index + 1}.
+		     		<c:choose>
+						<c:when test="${question.type eq 'mc'}">
+							(<fmt:message key="label.questions.choice.type.mc" />)
+						</c:when>
+						<c:when test="${question.type eq 'mr'}">
+							(<fmt:message key="label.questions.choice.type.mr" />)
+						</c:when>
+						<c:when test="${question.type eq 'mt'}">
+							(<fmt:message key="label.questions.choice.type.mt" />)
+						</c:when>
+						<c:when test="${question.type eq 'fb'}">
+							(<fmt:message key="label.questions.choice.type.fb" />)
+						</c:when>
+						<c:when test="${question.type eq 'es'}">
+							(<fmt:message key="label.questions.choice.type.es" />)
+						</c:when>
+						<c:when test="${question.type eq 'tf'}">
+							(<fmt:message key="label.questions.choice.type.tf" />)
+						</c:when>
+						<c:when test="${question.type eq 'mh'}">
+							(<fmt:message key="label.questions.choice.type.mh" />)
+						</c:when>
+						<c:otherwise>
+							(<fmt:message key="label.questions.choice.type.unknown" />)
+						</c:otherwise>
+					</c:choose>
+					<c:out value='${question.title}' />
+					
+					<input id="question${questionStatus.index}label" name="question${questionStatus.index}label"
+					       value="<c:out value='${question.label}' />"
+					       class="questionAttribute" type="hidden" />
+					       
+					<input id="question${questionStatus.index}text" name="question${questionStatus.index}text"
+					       value="<c:out value='${question.text}' />"
+					       class="questionAttribute" type="hidden" disabled="disabled" />
+					       <div class="questionText">${question.text}</div><br />
+					<input type="hidden" id="question${questionStatus.index}type" name="question${questionStatus.index}type"
+				           value="${question.type}"
+				           class="questionAttribute" disabled="disabled" />
+				           
+				    <c:if test="${not empty question.score}">
+				     	<input type="hidden" id="question${questionStatus.index}score" name="question${questionStatus.index}score"
+				           value="${question.score}"
+				           class="questionAttribute" disabled="disabled" />
+				    </c:if>
+					<%-- Question feedback --%>
+				    <input type="hidden" id="question${questionStatus.index}feedback" name="question${questionStatus.index}feedback"
+				           value="<c:out value='${question.feedback}' />"
+				           class="questionAttribute" disabled="disabled" />
+				    <%-- If question contains images, where to take them from --%>
+				    <input type="hidden" id="question${questionStatus.index}resourcesFolder"
+				           name="question${questionStatus.index}resourcesFolder"
+				           value="<c:out value='${question.resourcesFolderPath}' />"
+				           class="questionAttribute" disabled="disabled" />
+				    <%-- Answers, if required and exist --%>
+					<c:if test="${fn:length(question.answers) > 0}">
+						<div id="question${questionStatus.index}answerDiv" class="answerDiv">
+							<input type="hidden" name="answerCount${questionStatus.index}" 
+							       value="${fn:length(question.answers)}" />
+							<c:forEach var="answer" items="${question.answers}" varStatus="answerStatus">
+								<%-- Answer itself --%>
+								<c:choose>
+									<c:when test="${question.type eq 'mc' or question.type eq 'mr' or question.type eq 'mh' or question.type eq 'fb'}">
+										<input name="question${questionStatus.index}answer${answerStatus.index}"
+							       			   value="<c:out value='${answer.text}' />" class="answer"
+							       			   type="checkbox" checked="checked" disabled="disabled" />
+							       		<c:if test="${answer.score == 1}"><b></c:if>
+							       		${answer.text}<br />
+							       		<c:if test="${answer.score == 1}"></b></c:if>
+					       			</c:when>
+					       			<c:otherwise>
+					       				<%-- Do not display answers if management is too difficult or pointless --%>
+										<input name="question${questionStatus.index}answer${answerStatus.index}"
+							       			   value="<c:out value='${answer.text}' />"
+							       			   type="hidden" disabled="disabled" />
+									</c:otherwise>
+								</c:choose>
+					       		<%-- Answers score and feedback --%>
+					       		<input type="hidden" name="question${questionStatus.index}answer${answerStatus.index}score"
+								       value="${answer.score}" disabled="disabled" />
+								<input type="hidden" name="question${questionStatus.index}answer${answerStatus.index}feedback"
+				           			   value="<c:out value='${answer.feedback}' />" disabled="disabled" />
+							</c:forEach>
+							<c:if test="${question.type eq 'mt'}">
+								<input type="hidden" name="matchAnswerCount${questionStatus.index}" 
+								       value="${fn:length(question.matchAnswers)}" />
+								<c:forEach var="matchAnswer" items="${question.matchAnswers}" varStatus="matchAnswerStatus">
+									<input name="question${questionStatus.index}matchAnswer${matchAnswerStatus.index}"
+							       		   value="<c:out value='${matchAnswer.text}' />"
+							       		   type="hidden" disabled="disabled" />
+								</c:forEach>
+								<c:forEach var="entry" items="${question.matchMap}">
+						       		<input name="question${questionStatus.index}match${entry.key}"
+						       		   	   value="${entry.value}"
+						       		   	   type="hidden" disabled="disabled" />
+							    </c:forEach>
+							</c:if>
+						</div>
+					</c:if>
+					
+					 <%-- Learning Outcomes, if required and exist --%>
+					<c:if test="${fn:length(question.learningOutcomes) > 0}">
+						<input type="hidden" name="learningOutcomeCount${questionStatus.index}" 
+							       value="${fn:length(question.learningOutcomes)}" />
+						<c:forEach var="learningOutcome" items="${question.learningOutcomes}" varStatus="learningOutcomeStatus">
+							<input name="question${questionStatus.index}learningOutcome${learningOutcomeStatus.index}"
+							       value="<c:out value='${learningOutcome}'/>" type="hidden" />
 						</c:forEach>
-						<c:forEach var="entry" items="${question.matchMap}">
-				       		<input name="question${questionStatus.index}match${entry.key}"
-				       		   	   value="${entry.value}"
-				       		   	   type="hidden" disabled="disabled" />
-					    </c:forEach>
 					</c:if>
-				</div>
-			</c:if>
-			
-			 <%-- Learning Outcomes, if required and exist --%>
-			<c:if test="${fn:length(question.learningOutcomes) > 0}">
-				<input type="hidden" name="learningOutcomeCount${questionStatus.index}" 
-					       value="${fn:length(question.learningOutcomes)}" />
-				<c:forEach var="learningOutcome" items="${question.learningOutcomes}" varStatus="learningOutcomeStatus">
-					<input name="question${questionStatus.index}learningOutcome${learningOutcomeStatus.index}"
-					       value="<c:out value='${learningOutcome}'/>" type="hidden" />
 				</c:forEach>
-			</c:if>
-		</c:forEach>
-		
-		<div id="buttonsDiv" class="voffset10 pull-right">
-			<input class="btn btn-default" value='<fmt:message key="button.cancel"/>' type="button" onClick="javascript:window.close()" />
-			<input id="submitButton" class="btn btn-primary" value='<fmt:message key="label.ok"/>'      type="button" onClick="javascript:submitForm()" />			
-		</div>
-	</form>
+				
+				<div id="buttonsDiv" class="voffset10 pull-right">
+					<input class="btn btn-default" value='<fmt:message key="button.cancel"/>' type="button" onClick="javascript:window.close()" />
+					<input id="submitButton" class="btn btn-primary" value='<fmt:message key="label.ok"/>'      type="button" onClick="javascript:submitForm()" />			
+				</div>
+			</form>
+		</c:otherwise>
+	</c:choose>
 
 <div id="footer"></div>
 </lams:Page>