Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AllNominations.jsp,v
diff -u -r1.57 -r1.58
--- lams_tool_vote/web/learning/AllNominations.jsp	9 Sep 2014 16:45:00 -0000	1.57
+++ lams_tool_vote/web/learning/AllNominations.jsp	17 Jul 2015 09:52:32 -0000	1.58
@@ -13,18 +13,16 @@
 <lams:head>
 	<html:base />
 	<lams:css />
+	<link type="text/css" href="${lams}/css/chart.css" rel="stylesheet" />
+	
 	<title><fmt:message key="activity.title" /></title>
+	
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/raphael.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.raphael.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.pie.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.bar.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/chart.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/d3.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/chart.js"></script>
 	
 	<script type="text/javascript">
-		var chartDataUrl = '<lams:WebAppURL />chartGenerator.do';
-		
 		function submitMethod(actionMethod) {
 			if (actionMethod == 'learnerFinished') {
 				document.getElementById("finishButton").disabled = true;
@@ -152,15 +150,15 @@
 
 			<div>
 				<div class="float-right">
+					<c:set var="chartURL" value="${tool}chartGenerator.do?currentSessionId=${formBean.toolSessionID}" />
 					<img src='<c:out value="${tool}"/>images/piechart.gif' width="30"
 						title="<fmt:message key='label.tip.displayPieChart'/>"
 						style="cursor: pointer; height: 30px; border: none"
-						onclick="javascript:drawChart('pie', 0, {'currentSessionId' : '${formBean.toolSessionID}'})">
-
+						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('bar', 0, {'currentSessionId' : '${formBean.toolSessionID}'})">
+						onclick="javascript:drawChart('bar', 'chartDiv', '${chartURL}')">
 				</div>
 				
 				<c:if test="${VoteLearningForm.allowTextEntry}">
@@ -208,7 +206,7 @@
 				</p>
 			</c:if>							
 
-			<div id="chartDiv0" style="height: 220px; display: none;"></div>
+			<div id="chartDiv" style="height: 220px; display: none;"></div>
 
 			<div class="space-bottom-top">
 				<c:if test="${voteGeneralLearnerFlowDTO.reportViewOnly != 'true' }">