Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
diff -u -rb9f40a0836353109d362f2e1218cdf2b21163399 -r008562a82cd63f7b20fc555d0c6665f027df7c0c
--- lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision b9f40a0836353109d362f2e1218cdf2b21163399)
+++ lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision 008562a82cd63f7b20fc555d0c6665f027df7c0c)
@@ -45,142 +45,153 @@
 			<c:if test="${isLeadershipEnabled}">
 				<lams:LeaderDisplay idName="leaderEnabled" username="${voteLearningForm.groupLeaderName}" userId="${voteLearningForm.groupLeaderUserId}"/>
 			</c:if>
-
-			<div class="card-subheader">
-				<fmt:message key="label.progressiveResults" />
-			</div>
-
-			<!--present  a mini summary table here -->
-
-			<div class="ltable table-hover">
-				<div class="row">
-					<div class="col"><fmt:message key="label.nomination" /></div>
-					<div class="col-2 text-center"><fmt:message key="label.total.votes" /></div>
-				</div>
-
-				<c:forEach var="currentNomination" items="${voteGeneralLearnerFlowDTO.mapStandardNominationsHTMLedContent}">
-					<c:set var="currentNominationKey" scope="request" value="${currentNomination.key}" />
-					<div class="row">
-						<div class="col text-left">
-							<c:out value="${currentNomination.value}" escapeXml="false" />
-						</div>
-
-						<div class="col-2 text-center"><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: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: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>
-						</div>
+			
+			<div id="nominations">
+				<div class="card lcard">
+					<div class="card-header">
+						<c:choose>
+							<c:when test="${fn:length(requestScope.listGeneralCheckedOptionsContent) > 1}">
+								<fmt:message key="label.learner.nominations" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.learner.nomination" />
+							</c:otherwise>
+						</c:choose>
 					</div>
-				</c:forEach>
-			</div>
-
-			<div class="float-end">
-				<c:set var="chartURL" value="${tool}chartGenerator.do?currentSessionId=${voteLearningForm.toolSessionID}" />
-				<button type="button" title="<fmt:message key='label.tip.displayPieChart'/>"
-					class="fa fa-pie-chart text-primary btn btn-light"
-					onclick="javascript:drawChart('pie', 'chartDiv', '${chartURL}')"></button> 
-				<button type="button" title="<fmt:message key='label.tip.displayBarChart'/>"
-					class="fa fa-bar-chart text-primary btn btn-light"
-					onclick="javascript:drawChart('bar', 'chartDiv', '${chartURL}')"></button>
-			</div>
-			<div id="textEntries">
-				<c:if test="${voteLearningForm.allowTextEntry}">
-					<div class="card-subheader">
-						<fmt:message key="label.open.votes" />
-					</div>
-
-					<c:forEach var="vote" items="${requestScope.listUserEntriesContent}">
-						<c:if test="${vote.userEntry != ''}">
+					
+					<div class="card-body">
+						<c:forEach var="entry" items="${requestScope.listGeneralCheckedOptionsContent}">
 							<div class="d-flex">
 								<div class="flex-shrink-0">
 									<i class="fa fa-check text-success"></i>
 								</div>
 								<div class="flex-grow-1 ms-3">
-									<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>
+									<c:out value="${entry}" escapeXml="false" />
 								</div>
 							</div>
+						</c:forEach>
+		
+						<c:if test="${not empty voteLearningForm.userEntry}">
+							<div class="d-flex">
+								<div class="flex-shrink-0">
+									<i class="fa fa-check text-success"></i>
+								</div>
+								<div class="flex-grow-1 ms-3">
+									<c:out value="${voteLearningForm.userEntry}" escapeXml="true" />
+								</div>
+							</div>
 						</c:if>
-					</c:forEach>
-				</c:if>
+					</div>
+				</div>
 			</div>
-			<div id="nominations" class="mt-4">
-				<div class="card-subheader">
-					<c:choose>
-						<c:when test="${fn:length(requestScope.listGeneralCheckedOptionsContent) > 1}">
-							<fmt:message key="label.learner.nominations" />
-						</c:when>
-						<c:otherwise>
-							<fmt:message key="label.learner.nomination" />
-						</c:otherwise>
-					</c:choose>
+
+			<!--present  a mini summary table here -->
+			<div class="card lcard">
+				<div class="card-header">
+					<fmt:message key="label.progressiveResults" />
 				</div>
-				
-				<c:forEach var="entry" items="${requestScope.listGeneralCheckedOptionsContent}">
-					<div class="d-flex">
-						<div class="flex-shrink-0">
-							<i class="fa fa-check text-success"></i>
-						</div>
-						<div class="flex-grow-1 ms-3">
-							<c:out value="${entry}" escapeXml="false" />
-						</div>
-					</div>
-				</c:forEach>
 
-				<c:if test="${not empty voteLearningForm.userEntry}">
-					<div class="d-flex">
-						<div class="flex-shrink-0">
-							<i class="fa fa-check text-success"></i>
+				<div class="card-body">
+					<div class="ltable table-hover">
+						<div class="row">
+							<div class="col"><fmt:message key="label.nomination" /></div>
+							<div class="col-2 text-center"><fmt:message key="label.total.votes" /></div>
 						</div>
-						<div class="flex-grow-1 ms-3">
-							<c:out value="${voteLearningForm.userEntry}" escapeXml="true" />
-						</div>
+		
+						<c:forEach var="currentNomination" items="${voteGeneralLearnerFlowDTO.mapStandardNominationsHTMLedContent}">
+							<c:set var="currentNominationKey" scope="request" value="${currentNomination.key}" />
+							<div class="row">
+								<div class="col text-left">
+									<c:out value="${currentNomination.value}" escapeXml="false" />
+								</div>
+		
+								<div class="col-2 text-center"><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: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: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>
+								</div>
+							</div>
+						</c:forEach>
 					</div>
-				</c:if>
+					
+					<div id="textEntries">
+						<c:if test="${voteLearningForm.allowTextEntry}">
+							<div class="card-subheader">
+								<fmt:message key="label.open.votes" />
+							</div>
+		
+							<c:forEach var="vote" items="${requestScope.listUserEntriesContent}">
+								<c:if test="${vote.userEntry != ''}">
+									<div class="d-flex">
+										<div class="flex-shrink-0">
+											<i class="fa fa-check text-success"></i>
+										</div>
+										<div class="flex-grow-1 ms-3">
+											<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>
+						</c:if>
+					</div>
+		
+					<div class="float-end">
+						<c:set var="chartURL" value="${tool}chartGenerator.do?currentSessionId=${voteLearningForm.toolSessionID}" />
+						<button type="button" title="<fmt:message key='label.tip.displayPieChart'/>"
+							class="fa fa-pie-chart text-primary btn btn-light"
+							onclick="javascript:drawChart('pie', 'chartDiv', '${chartURL}')"></button> 
+						<button type="button" title="<fmt:message key='label.tip.displayBarChart'/>"
+							class="fa fa-bar-chart text-primary btn btn-light"
+							onclick="javascript:drawChart('bar', 'chartDiv', '${chartURL}')"></button>
+					</div>
+					
+					<div id="chartDiv" style="height: 220px; display: none;" class="mb-4"></div>
+				</div>
 			</div>
 
 			<c:if test="${voteGeneralLearnerFlowDTO.notebookEntry != null && voteGeneralLearnerFlowDTO.notebookEntry != ''}">			
@@ -191,8 +202,6 @@
 					notebookHeaderLabelKey="label.notebook.entries"/>
 			</c:if>
 
-			<div id="chartDiv" style="height: 220px; display: none;"></div>
-
 			<c:if test="${voteGeneralLearnerFlowDTO.reportViewOnly != 'true' }">
 				<div class="activity-bottom-buttons">
 					<c:if test="${voteGeneralLearnerFlowDTO.reflection != 'true' || !hasEditRight}">