Index: lams_tool_vote/web/authoring/BasicContent.jsp
===================================================================
diff -u -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de -r61e7bbf20d65e2ecb5e50f3154e52264003defa1
--- lams_tool_vote/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
+++ lams_tool_vote/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 61e7bbf20d65e2ecb5e50f3154e52264003defa1)
@@ -30,6 +30,7 @@
 </c:set>
 
 <script type="text/javascript">
+	
 <!-- Common Javascript functions for LAMS -->
 	/**
 	 * Launches the popup window for the instruction files
@@ -72,6 +73,27 @@
 		document.VoteMonitoringForm.questionIndex.value=questionIndex;
         submitMonitoringMethod('removeNomination');
 	}
+	
+	var noneDataFlowSelectedPreviously = document.getElementById("dataFlowNoneOption")==null 
+							   || document.getElementById("dataFlowNoneOption").selected=="selected";
+	
+	function onSelectDataInput(){
+		if (document.getElementById("firstNomination")!=null
+			&& noneDataFlowSelectedPreviously
+			&& !document.getElementById("dataFlowNoneOption").selected){
+				if (!confirm("<fmt:message key='msg.data.flow.clear.nominations' />")){
+					document.getElementById("dataFlowNoneOption").selected="selected";
+			}
+		}
+		noneDataFlowSelectedPreviously = document.getElementById("dataFlowNoneOption").selected;
+	}
+	
+	function resetDataInput(){
+		if (document.getElementById("dataFlowNoneOption")!=null){
+			document.getElementById("dataFlowNoneOption").selected=true;
+			noneDataFlowSelectedPreviously=true;
+		}
+	}
 
 </script>
 
@@ -115,18 +137,28 @@
 <p>
 	<c:if
 		test="${voteGeneralAuthoringDTO.activeModule == 'authoring' || voteGeneralAuthoringDTO.activeModule == 'defineLater'}">
-		<a
-			href="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newNominationBox&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}&reflectionSubject=${voteGeneralAuthoringDTO.reflectionSubject}"/>');"
+		<a  href="javascript:resetDataInput(); showMessage('<html:rewrite page="/authoring.do?dispatch=newNominationBox&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}&reflectionSubject=${voteGeneralAuthoringDTO.reflectionSubject}"/>');"
 			class="button-add-item"> <fmt:message
 				key="label.add.new.nomination" /> </a>
 	</c:if>
+	
 	<c:if
 		test="${voteGeneralAuthoringDTO.activeModule != 'authoring' && voteGeneralAuthoringDTO.activeModule != 'defineLater'}">
 		<a
-			href="javascript:showMessage('<html:rewrite page="/monitoring.do?dispatch=newNominationBox&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}&reflectionSubject=${voteGeneralAuthoringDTO.reflectionSubject}"/>');"
+			href="javascript:resetDataInput(); showMessage('<html:rewrite page="/monitoring.do?dispatch=newNominationBox&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}&reflectionSubject=${voteGeneralAuthoringDTO.reflectionSubject}"/>');"
 			class="button-add-item"> <fmt:message
 				key="label.add.new.nomination" /> </a>
 	</c:if>
+	
+	<c:if test="${not empty voteGeneralAuthoringDTO.dataFlowObjectNames}">
+		<span style="margin-left: 20px;"><fmt:message key="label.data.flow.choose" /></span>
+		<html:select property="assignedDataFlowObject" onchange="javascript:onSelectDataInput();">
+			<html:option styleId="dataFlowNoneOption" value="0"><fmt:message key="label.data.flow.none" /></html:option>
+			<c:forEach items="${voteGeneralAuthoringDTO.dataFlowObjectNames}" var="dataFlowObject" varStatus="status">
+				<html:option value="${status.index+1}">${dataFlowObject}</html:option>
+			</c:forEach>
+		</html:select>
+	</c:if>
 </p>
 
 <p>