<div class="mainresultbox">
<h3>Schulze Method Results</h3>
-<%= render :partial => 'result', :object => @ssd_result %>
+<%= render :partial => 'result', :object => @election.ssd_result %>
<div class="rbmoreinfo"
<h4>About the Schulze Method</h4>
<div class="resultbox">
<h3>Plurality Results</h3>
-<%= render :partial => 'result', :object => @plurality_result %>
+<%= render :partial => 'result', :object => @election.plurality_result %>
<div class="rbmoreinfo"
<h4>About Plurality Voting</h4>
<div class="resultbox">
<h3>Approval Result</h3>
<p><font size="-1">(This algorithm assumes that top two choices are "approved.")</font></p>
-<%= render :partial => 'result', :object => @approval_result %>
+<%= render :partial => 'result', :object => @election.approval_result %>
<div class="rbmoreinfo"
<h4>About Approval Voting</h4>
<div class="resultbox">
<h3>Simple Condorcet Results</h3>
-<%= render :partial => 'result', :object => @condorcet_result %>
+<%= render :partial => 'result', :object => @election.condorcet_result %>
<div class="rbmoreinfo"
<h4>About Simple Cordorcet Voting</h4>
<div class="resultbox">
<h3>Borda Count Results</h3>
-<%= render :partial => 'result', :object => @borda_result %>
+<%= render :partial => 'result', :object => @election.borda_result %>
<div class="rbmoreinfo"
<h4>About Borda Count</h4>
</tr>
<% end %>
</table>
-<img src="<% url_for(:controller => 'graphs', :action => 'day_votes', :id => @election ) %>" />
+
+<%= image_tag( graph_url( :action => 'votes_per_day', :id => @election ) ) %><br />
+<%= image_tag( graph_url( :action => 'votes_per_interval', :id => @election ))%><br />
+<%= image_tag( graph_url( :action => 'borda_bar', :id => @election ) ) %><br />
+<%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %>
+