Index: lams_central/web/questions/questionChoice.jsp
===================================================================
diff -u -r2471b37f4df96b3f1930cf8dea8936b982d43e61 -r05c00f92856ef13cd90d6fce06acb069418c2512
--- lams_central/web/questions/questionChoice.jsp	(.../questionChoice.jsp)	(revision 2471b37f4df96b3f1930cf8dea8936b982d43e61)
+++ lams_central/web/questions/questionChoice.jsp	(.../questionChoice.jsp)	(revision 05c00f92856ef13cd90d6fce06acb069418c2512)
@@ -1,11 +1,6 @@
 <!DOCTYPE html>
+<%@ include file="/common/taglibs.jsp"%>
 
-<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-function" prefix="fn" %>
-
 <lams:html>
 <lams:head>
 	<title><fmt:message key="title.lams" /> :: <fmt:message key="label.questions.choice.title" /></title>
@@ -42,6 +37,10 @@
 		div#errorArea {
 			display: none;
 		}
+		
+		#collectionSelect {
+			float: right;
+		}
 	</style>
 	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
 	<script type="text/javascript">
@@ -84,6 +83,7 @@
 			} else {
 				$('#errorArea').show();
 			}
+
 		}
 		
 		$(document).ready(function(){
@@ -157,6 +157,20 @@
 	<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">
+					<c:forEach items="${collections}" var="collection">
+						<option value="${collection.uid}" ${empty collection.userId ? "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}"
@@ -186,6 +200,11 @@
 				</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" />
