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.2.4 -r1.10.2.5
--- lams_tool_vote/web/learning/RevisitedDisplay.jsp	22 Feb 2016 11:12:34 -0000	1.10.2.4
+++ lams_tool_vote/web/learning/RevisitedDisplay.jsp	24 Feb 2016 18:04:24 -0000	1.10.2.5
@@ -1,30 +1,22 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<h2>
+<h4>
 	<fmt:message key="label.progressiveResults" />
-</h2>
+</h4>
 
 <!--present  a mini summary table here -->
-<table cellspacing="0" class="alternative-color">
+<table class="table table-hover table-stripped" id="voteSummary">
 	<tr>
-		<th>
-			<fmt:message key="label.nomination" />
-		</th>
-		<th>
-			<fmt:message key="label.total.votes" />
-		</th>
+		<th><fmt:message key="label.nomination" /></th>
+		<th class="text-center"><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>
+			<td class="text-left"><c:out value="${currentNomination.value}" escapeXml="false" /></td>
 
-			<td>
-
-				<c:forEach var="currentUserCount" items="${voteGeneralLearnerFlowDTO.mapStandardUserCount}">
+			<td class="text-center"><c:forEach var="currentUserCount"
+					items="${voteGeneralLearnerFlowDTO.mapStandardUserCount}">
 					<c:set var="currentUserKey" scope="request" value="${currentUserCount.key}" />
 					<c:if test="${currentNominationKey == currentUserKey}">
 
@@ -36,15 +28,15 @@
 									<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>
@@ -53,74 +45,88 @@
 								</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: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>
+				</c:forEach></td>
 		</tr>
 	</c:forEach>
 
 </table>
 
-<div>
-	<div class="float-right">
-		<c:set var="chartURL" value="${tool}chartGenerator.do?currentSessionId=${VoteLearningForm.toolSessionID}" />
-		<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', 'chartDiv', '${chartURL}')">
-		<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('pie', 'chartDiv', '${chartURL}')">
-	</div>
-				
+
+<div class="pull-right">
+	<c:set var="chartURL" value="${tool}chartGenerator.do?currentSessionId=${VoteLearningForm.toolSessionID}" />
+	<a title="<fmt:message key='label.tip.displayPieChart'/>" class="fa fa-pie-chart text-primary btn btn-md btn-primary"
+		onclick="javascript:drawChart('pie', 'chartDiv', '${chartURL}')"></a> <a
+		title="<fmt:message key='label.tip.displayBarChart'/>" class="fa fa-bar-chart text-primary btn btn-md btn-primary"
+		onclick="javascript:drawChart('bar', 'chartDiv', '${chartURL}')"></a>
+</div>
+
+<div id="textEntries">
 	<c:if test="${VoteLearningForm.allowTextEntry}">
-		<strong> <fmt:message key="label.open.votes"/> </strong>
+		<strong> <fmt:message key="label.open.votes" />
+		</strong>
 		<c:forEach var="vote" items="${requestScope.listUserEntriesContent}">
-			<div>
-			<c:choose>
-			<c:when test="${vote.visible}">
-				<c:out value="${vote.userEntry}" escapeXml="true" />
-			</c:when>
-			<c:otherwise>
-				<em>(<fmt:message key="label.hidden"/>)</em>
-			</c:otherwise>
-			</c:choose>
-			</div>
+			<c:if test="${vote.userEntry != ''}">
+				<div class="media">
+					<div class="media-left">
+						<i class="fa fa-xs fa-check text-success"></i>
+					</div>
+					<div class="media-body">
+						<c:choose>
+							<c:when test="${vote.visible}">
+								<c:out value="${vote.userEntry}" escapeXml="true" />
+							</c:when>
+							<c:otherwise>
+								<em>(<fmt:message key="label.hidden" />)
+								</em>
+							</c:otherwise>
+						</c:choose>
+					</div>
+				</div>
+			</c:if>
 		</c:forEach>
-		<div>&nbsp;</div>
 	</c:if>
-
+</div>
+<div id="nominations" class="voffset10">
 	<c:choose>
 		<c:when test="${fn:length(requestScope.listGeneralCheckedOptionsContent) > 1}">
-        	<strong><fmt:message key="label.learner.nominations" />  </strong>
+			<strong><fmt:message key="label.learner.nominations" /> </strong>
 		</c:when>
-	    <c:otherwise>
-			<strong><fmt:message key="label.learner.nomination" />  </strong>
+		<c:otherwise>
+			<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="false" />
+	<c:forEach var="entry" items="${requestScope.listGeneralCheckedOptionsContent}">
+		<div class="media">
+			<div class="media-left">
+				<i class="fa fa-xs fa-check text-success"></i>
+			</div>
+			<div class="media-body">
+				<c:out value="${entry}" escapeXml="false" />
+			</div>
 		</div>
 	</c:forEach>
-	
-	<div>
-		<c:out value="${VoteLearningForm.userEntry}" escapeXml="true"/>
-	</div>
 
-	<div id="chartDiv" style="height: 220px; display: none;"></div>
+	<c:if test="${not empty VoteLearningForm.userEntry}">
+		<div class="media">
+			<div class="media-left">
+				<i class="fa fa-xs fa-check text-success"></i>
+			</div>
+			<div class="media-body">
+				<c:out value="${VoteLearningForm.userEntry}" escapeXml="true" />
+			</div>
+		</div>
+	</c:if>
 </div>
+<div id="chartDiv" style="height: 220px; display: none;"></div>