Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AllNominations.jsp,v
diff -u -r1.47 -r1.48
--- lams_tool_vote/web/learning/AllNominations.jsp	17 Mar 2010 10:50:00 -0000	1.47
+++ lams_tool_vote/web/learning/AllNominations.jsp	9 Nov 2012 11:21:39 -0000	1.48
@@ -35,14 +35,19 @@
 <lams:head>
 	<html:base />
 	<lams:css />
-	<script type="text/javascript"
-		src="${lams}includes/javascript/common.js"></script>
-	<title><fmt:message key="activity.title" />
-	</title>
-
-	<script language="JavaScript" type="text/JavaScript">
-		function submitMethod(actionMethod) 
-		{
+	<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.js"></script>
+	<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/g.raphael.js"></script>
+	<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/g.pie.js"></script>
+	<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/g.bar.js"></script>
+	<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/chart.js"></script>
+	
+	<script type="text/javascript">
+	 	var TOOL_URL = '<lams:WebAppURL />';
+		
+		function submitMethod(actionMethod) {
 			if (actionMethod == 'learnerFinished') {
 				document.getElementById("finishButton").disabled = true;
 			}
@@ -162,24 +167,15 @@
 
 			<div>
 				<div class="float-right">
-
-					<c:set scope="request" var="viewURL">
-						<html:rewrite page="/chartGenerator?type=pie" />
-					</c:set>
-
 					<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:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+						onclick="javascript:drawChart('pie')">
 
-					<c:set scope="request" var="viewURL">
-						<html:rewrite page="/chartGenerator?type=bar" />
-					</c:set>
-
 					<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:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+						onclick="javascript:drawChart('bar')">
 				</div>
 				
 				<c:if test="${VoteLearningForm.allowTextEntry}">
@@ -233,6 +229,9 @@
 				</p>
 			</c:if>							
 
+			<div id="chartDiv" style="height: 220px; display: none;"></div>
+			
+
 			<div class="space-bottom-top">
 				<c:if test="${voteGeneralLearnerFlowDTO.reportViewOnly != 'true' }">
 					<html:submit property="refreshVotes" styleClass="button"
@@ -271,11 +270,4 @@
 	<div id="footer"></div>
 
 </body>
-</lams:html>
-
-
-
-
-
-
-
+</lams:html>
\ No newline at end of file