Index: lams_tool_vote/web/monitoring/Edit.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Edit.jsp,v
diff -u -r1.10.2.1 -r1.10.2.2
--- lams_tool_vote/web/monitoring/Edit.jsp	16 Apr 2015 14:48:00 -0000	1.10.2.1
+++ lams_tool_vote/web/monitoring/Edit.jsp	26 May 2016 13:01:08 -0000	1.10.2.2
@@ -1,78 +1,35 @@
 <%@ 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) %>" />
 
-<table cellpadding="0">
-
+<table class="table table-condensed">
 	<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>
+		<td width="15%"><fmt:message key="label.authoring.title.col"></fmt:message></td>
+		<td><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>
+		<td><fmt:message key="label.authoring.instructions.col"></fmt:message></td>
+		<td><c:out value="${voteGeneralAuthoringDTO.activityInstructions}" escapeXml="false"/></td>
 	</tr>
 	
+<c:forEach items="${listQuestionDTO}" var="currentDTO" varStatus="status">
 	<tr>
-		<td colspan="2">
-			<div id="resourceListArea">
-			<div id="itemList">
-				<h2><fmt:message key="label.vote.nominations" />
-				<img src="${ctxPath}/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>
+			<fmt:message key="label.nomination" />:
 		</td>
-	</tr>
-
-	<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>
+			<c:out value="${currentDTO.question}" escapeXml="false"/> 
 		</td>
 	</tr>
+</c:forEach>
+
 </table>
+
+<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="btn btn-default">
+	<fmt:message key="label.edit"/>
+</html:link>