Index: lams_tool_vote/web/monitoring/Edit.jsp
===================================================================
diff -u -r912402ce1d2514e9a8c8419813b1507df80ab63f -r5b17b810b5302c90b2daf6a5866bf4f6e85bef6a
--- lams_tool_vote/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision 912402ce1d2514e9a8c8419813b1507df80ab63f)
+++ lams_tool_vote/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision 5b17b810b5302c90b2daf6a5866bf4f6e85bef6a)
@@ -1,44 +1,78 @@
-	<%@ include file="/common/taglibs.jsp"%>
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
+<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 
-	<c:set var="lams"><lams:LAMSURL/></c:set>
-	<c:set var="tool"><lams:WebAppURL/></c:set>
+<table cellpadding="0">
 
-	<%@ include file="/common/messages.jsp"%>								
+	<tr>
+		<td colspan="2">
+			<div class="field-name">
+				<fmt:message key="label.authoring.title.col"></fmt:message>
+			</div>
+			<c:out value="${voteGeneralAuthoringDTO.activityTitle}" escapeXml="true"/> 								
+		</td>
+	</tr>
+						
+	<tr>
+		<td colspan="2">
+			<div class="field-name">
+				<fmt:message key="label.authoring.instructions.col"></fmt:message>
+			</div>
+			<c:out value="${voteGeneralAuthoringDTO.activityInstructions}" escapeXml="false"/> 																	
+		</td>
+	</tr>
 	
-	<c:if test="${editActivityDTO.monitoredContentInUse != 'true'}"> 			
-		<c:if test="${voteGeneralMonitoringDTO.defineLaterInEditMode != 'true'}"> 			
-			<jsp:include page="/authoring/BasicContentViewOnly.jsp" />
-		</c:if> 				
-		<c:if test="${voteGeneralMonitoringDTO.defineLaterInEditMode == 'true'}"> 			
-			<jsp:include page="/authoring/BasicContent.jsp" />
-		</c:if> 				
-	</c:if> 											
+	<tr>
+		<td colspan="2">
+			<div id="resourceListArea">
+			<div id="itemList">
+				<h2><fmt:message key="label.vote.nominations" />
+				<img src="${ctxPath}/includes/images/indicator.gif" style="display:none" id="resourceListArea_Busy" /></h2>
+			
+				<table id="itemTable" style="align:left;width:650px" >
+				    <c:set var="queIndex" scope="request" value="0"/>
+				    
+				    <c:forEach items="${listQuestionDTO}" var="currentDTO" varStatus="status">
+						<c:set var="queIndex" scope="request" value="${queIndex +1}"/>
+						<c:set var="question" scope="request" value="${currentDTO.question}"/>
+						<c:set var="displayOrder" scope="request" value="${currentDTO.displayOrder}"/>	
+					
+						<tr>
+							<td width="10%" class="field-name align-right">
+								<fmt:message key="label.nomination" />:
+							</td>
+					
+							<td width="60%" align="left">
+								<c:out value="${question}" escapeXml="false"/> 
+							</td>
+					
+							<td width="10%" class="align-right">
+							</td>
+							
+							<td width="10%" class="align-right">
+							</td>
+					
+							<td width="10%" class="align-right">
+							</td>
+						</tr>
+					</c:forEach>
+				
+				</table>
+			</div>								
+			</div>
+		</td>
+	</tr>
 
-	<c:if test="${editActivityDTO.monitoredContentInUse == 'true'}"> 			
-		<div class="warning">
-			<fmt:message key="error.content.inUse"/>
-		</div>
-		<br/>
-		<table>
-			<tr>
-			 <td width="10%" nowrap valign="top" class="field-name">
-			 	<fmt:message key="label.authoring.title"/>:
-			 </td>
-			  <td>
-			  	<c:out value="${voteGeneralMonitoringDTO.activityTitle}" escapeXml="true"/>
-			 </td>
-			</tr>
-			<tr>
-			 <td width="10%" nowrap valign="top" class="field-name">
-			 	<fmt:message key="label.authoring.instructions"/>:
-			 </td>
-			 <td>
-			 	<c:out value="${voteGeneralMonitoringDTO.activityInstructions}" escapeXml="false"/>
-			 </td>
-			</tr>			 
-		</table>
-		
-	</c:if> 																									
-
-		
-		
+	<tr>
+		<td colspan=2 class="align-right">
+			<c:url  var="authoringUrl" value="/authoringStarter.do">
+				<c:param name="toolContentID" value="${formBean.toolContentID}" />
+				<c:param name="contentFolderID" value="${formBean.contentFolderID}" />
+				<c:param name="mode" value="teacher" />
+			</c:url>
+			<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="button">
+				<fmt:message key="label.edit"/>
+			</html:link>
+		</td>
+	</tr>
+</table>