Index: lams_tool_vote/web/learning/RevisitedDisplay.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/RevisitedDisplay.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_vote/web/learning/RevisitedDisplay.jsp	7 Apr 2014 23:55:57 -0000	1.10
+++ lams_tool_vote/web/learning/RevisitedDisplay.jsp	9 Sep 2014 16:45:00 -0000	1.11
@@ -1,152 +1,118 @@
-<%-- 
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-License Information: http://lamsfoundation.org/licensing/lams/2.0/
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2 as 
-  published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-  USA
-
-  http://www.gnu.org/licenses/gpl.txt
---%>
-
 <%@ include file="/common/taglibs.jsp"%>
 
-			<h2>
-				<fmt:message key="label.progressiveResults" />
-			</h2>
+<h2>
+	<fmt:message key="label.progressiveResults" />
+</h2>
 
-			<!--present  a mini summary table here -->
+<!--present  a mini summary table here -->
+<table cellspacing="0" class="alternative-color">
+	<tr>
+		<th>
+			<fmt:message key="label.nomination" />
+		</th>
+		<th>
+			<fmt:message key="label.total.votes" />
+		</th>
+	</tr>
 
-			<table cellspacing="0" class="alternative-color">
-				<tr>
-					<th>
-						<fmt:message key="label.nomination" />
-					</th>
-					<th>
-						<fmt:message key="label.total.votes" />
-					</th>
-				</tr>
+	<c:forEach var="currentNomination" items="${voteGeneralLearnerFlowDTO.mapStandardNominationsHTMLedContent}">
+		<c:set var="currentNominationKey" scope="request" value="${currentNomination.key}" />
+		<tr>
+			<td class="space">
+				<c:out value="${currentNomination.value}" escapeXml="false" />
+			</td>
 
-				<c:forEach var="currentNomination"
-					items="${voteGeneralLearnerFlowDTO.mapStandardNominationsHTMLedContent}">
-					<c:set var="currentNominationKey" scope="request"
-						value="${currentNomination.key}" />
-					<tr>
-						<td class="space">
-							<c:out value="${currentNomination.value}" escapeXml="false" />
-						</td>
+			<td>
 
-						<td>
+				<c:forEach var="currentUserCount" items="${voteGeneralLearnerFlowDTO.mapStandardUserCount}">
+					<c:set var="currentUserKey" scope="request" value="${currentUserCount.key}" />
+					<c:if test="${currentNominationKey == currentUserKey}">
 
-							<c:forEach var="currentUserCount"
-								items="${voteGeneralLearnerFlowDTO.mapStandardUserCount}">
-								<c:set var="currentUserKey" scope="request"
-									value="${currentUserCount.key}" />
-								<c:if test="${currentNominationKey == currentUserKey}">
+						<c:if test="${currentUserCount.value != '0' }">
+							<c:forEach var="currentQuestionUid" items="${voteGeneralLearnerFlowDTO.mapStandardQuestionUid}">
+								<c:set var="currentQuestionUidKey" scope="request" value="${currentQuestionUid.key}" />
+								<c:if test="${currentQuestionUidKey == currentUserKey}">
 
-									<c:if test="${currentUserCount.value != '0' }">
-										<c:forEach var="currentQuestionUid"
-											items="${voteGeneralLearnerFlowDTO.mapStandardQuestionUid}">
-											<c:set var="currentQuestionUidKey" scope="request"
-												value="${currentQuestionUid.key}" />
-											<c:if test="${currentQuestionUidKey == currentUserKey}">
-
-												<c:forEach var="currentSessionUid"
-													items="${voteGeneralLearnerFlowDTO.mapStandardToolSessionUid}">
-													<c:set var="currentSessionUidKey" scope="request"
-														value="${currentSessionUid.key}" />
-													<c:if
-														test="${currentSessionUidKey == currentQuestionUidKey}">
-
-														<c:if test="${currentNomination.value != 'Open Vote'}">
-															<c:set scope="request" var="viewURL">
-																<lams:WebAppURL />monitoring.do?method=getVoteNomination&questionUid=${currentQuestionUid.value}&sessionUid=${currentSessionUid.value}
+									<c:forEach var="currentSessionUid" items="${voteGeneralLearnerFlowDTO.mapStandardToolSessionUid}">
+										<c:set var="currentSessionUidKey" scope="request" value="${currentSessionUid.key}" />
+										<c:if test="${currentSessionUidKey == currentQuestionUidKey}">
+	
+											<c:if test="${currentNomination.value != 'Open Vote'}">
+												<c:set scope="request" var="viewURL">
+													<lams:WebAppURL />monitoring.do?method=getVoteNomination&questionUid=${currentQuestionUid.value}&sessionUid=${currentSessionUid.value}
 												</c:set>
-
-															<c:out value="${currentUserCount.value}" />
-
-														</c:if>
-														<c:if test="${currentNomination.value == 'Open Vote'}">
-															<c:out value="${currentUserCount.value}" />
-														</c:if>
-													</c:if>
-												</c:forEach>
+		
+												<c:out value="${currentUserCount.value}" />
 											</c:if>
-										</c:forEach>
-									</c:if>
-									<c:if test="${currentUserCount.value == '0' }">
-										<c:out value="${currentUserCount.value}" />
-									</c:if>
+											
+											<c:if test="${currentNomination.value == 'Open Vote'}">
+												<c:out value="${currentUserCount.value}" />
+											</c:if>
+										</c:if>
+									</c:forEach>
 								</c:if>
 							</c:forEach>
+						</c:if>
+									
+						<c:if test="${currentUserCount.value == '0' }">
+							<c:out value="${currentUserCount.value}" />
+						</c:if>
+					</c:if>
+				</c:forEach>
 
-							<c:forEach var="currentRate"
-								items="${voteGeneralLearnerFlowDTO.mapStandardRatesContent}">
-								<c:set var="currentRateKey" scope="request"
-									value="${currentRate.key}" />
-								<c:if test="${currentNominationKey == currentRateKey}"> 				
-																	 &nbsp(<fmt:formatNumber type="number" maxFractionDigits="2" value="${currentRate.value}" />
-									<fmt:message key="label.percent" />) 
-								</c:if>
-							</c:forEach>
-						</td>
-					</tr>
+				<c:forEach var="currentRate" items="${voteGeneralLearnerFlowDTO.mapStandardRatesContent}">
+					<c:set var="currentRateKey" scope="request" value="${currentRate.key}" />
+					<c:if test="${currentNominationKey == currentRateKey}"> 				
+						&nbsp(<fmt:formatNumber type="number" maxFractionDigits="2" value="${currentRate.value}" />
+						<fmt:message key="label.percent" />) 
+					</c:if>
 				</c:forEach>
+			</td>
+		</tr>
+	</c:forEach>
 
-			</table>
+</table>
 
-			<div>
-				<div class="float-right">
-					<img src='<c:out value="${tool}"/>images/piechart.gif' width="30"
-						title="<fmt:message key='label.tip.displayPieChart'/>"
-						style="cursor: pointer;" height="30" border="0"
-						onclick="javascript:drawChart('pie', 0, {'currentSessionId' : '${VoteLearningForm.toolSessionID}'})">
-					<img src='<c:out value="${tool}"/>images/columnchart.gif' width="30"
-						title="<fmt:message key='label.tip.displayBarChart'/>" 
-						style="cursor: pointer;" height="30" border="0"
-						onclick="javascript:drawChart('bar', 0, {'currentSessionId' : '${VoteLearningForm.toolSessionID}'})">
-				</div>
+<div>
+	<div class="float-right">
+		<img src='<c:out value="${tool}"/>images/piechart.gif' width="30"
+			title="<fmt:message key='label.tip.displayPieChart'/>"
+			style="cursor: pointer;" height="30" border="0"
+			onclick="javascript:drawChart('pie', 0, {'currentSessionId' : '${VoteLearningForm.toolSessionID}'})">
+		<img src='<c:out value="${tool}"/>images/columnchart.gif' width="30"
+			title="<fmt:message key='label.tip.displayBarChart'/>" 
+			style="cursor: pointer;" height="30" border="0"
+			onclick="javascript:drawChart('bar', 0, {'currentSessionId' : '${VoteLearningForm.toolSessionID}'})">
+	</div>
 				
-				<c:if test="${VoteLearningForm.allowTextEntry}">
-					<strong> <fmt:message key="label.open.votes"/> </strong>
-					<c:forEach var="vote"
-						items="${requestScope.listUserEntriesContent}">
-						<div>
-							<c:out value="${vote.userEntry}" escapeXml="true" />
-						</div>
-					</c:forEach>
-					<div>&nbsp;</div>
-				</c:if>
+	<c:if test="${VoteLearningForm.allowTextEntry}">
+		<strong> <fmt:message key="label.open.votes"/> </strong>
+		<c:forEach var="vote" items="${requestScope.listUserEntriesContent}">
+			<div>
+				<c:out value="${vote.userEntry}" escapeXml="true" />
+			</div>
+		</c:forEach>
+		<div>&nbsp;</div>
+	</c:if>
 
-				<c:choose>
-				 <c:when test="${fn:length(requestScope.listGeneralCheckedOptionsContent) > 1}">
-                                      <strong><fmt:message key="label.learner.nominations" />  </strong>
-				 </c:when>
-                                 <c:otherwise>
+	<c:choose>
+		<c:when test="${fn:length(requestScope.listGeneralCheckedOptionsContent) > 1}">
+        	<strong><fmt:message key="label.learner.nominations" />  </strong>
+		</c:when>
+	    <c:otherwise>
+			<strong><fmt:message key="label.learner.nomination" />  </strong>
+		</c:otherwise>
+	</c:choose>
 
-				     <strong><fmt:message key="label.learner.nomination" />  </strong>
-				 </c:otherwise>
-				</c:choose>
+	<c:forEach var="entry"items="${requestScope.listGeneralCheckedOptionsContent}">
+		<div>
+			<c:out value="${entry}" escapeXml="true" />
+		</div>
+	</c:forEach>
+	
+	<div>
+		<c:out value="${VoteLearningForm.userEntry}" escapeXml="true"/>
+	</div>
 
-				<c:forEach var="entry"
-					items="${requestScope.listGeneralCheckedOptionsContent}">
-					<div>
-						<c:out value="${entry}" escapeXml="true" />
-					</div>
-				</c:forEach>
-				<div>
-					<c:out value="${VoteLearningForm.userEntry}" escapeXml="true"/>
-				</div>
-
-				<div id="chartDiv0" style="height: 220px; display: none;"></div>
-		</div>
\ No newline at end of file
+	<div id="chartDiv0" style="height: 220px; display: none;"></div>
+</div>
\ No newline at end of file