Merge refactor

[selectricity] / app / views / quickvote / results.rhtml

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
old mode 100755 (executable)
new mode 100644 (file)
index 7152072..1fad7ea
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -28,7 +28,7 @@
 
 <div class="mainresultbox">
 <h3>Schulze Method Results</h3>
 
 <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="rbmoreinfo"
 <h4>About the Schulze Method</h4>


@@ -47,7 +47,7 @@ Beatpath Winner, Path Voting, and Path Winner.</p>
 
 <div class="resultbox">
 <h3>Plurality Results</h3>
 
 <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="rbmoreinfo"
 <h4>About Plurality Voting</h4>


@@ -67,7 +67,7 @@ voting.</p>
 <div class="resultbox">
 <h3>Approval Result</h3>
 <p><font size="-1">(This algorithm assumes that top two choices are "approved.")</font></p>
 <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="rbmoreinfo"
 <h4>About Approval Voting</h4>


@@ -85,7 +85,7 @@ accept or not.</p>
 
 <div class="resultbox">
 <h3>Simple Condorcet Results</h3>
 
 <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="rbmoreinfo"
 <h4>About Simple Cordorcet Voting</h4>


@@ -105,7 +105,7 @@ another Condorcet system.</p>
 
 <div class="resultbox">
 <h3>Borda Count Results</h3>
 
 <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>
 
 <div class="rbmoreinfo"
 <h4>About Borda Count</h4>


@@ -162,6 +162,8 @@ by several other names.</p>
 <% end %>
 </table>
 
 <% end %>
 </table>
 

-<img src="<% url_for(:action => 'day_votes', :id => @election)%>" />
-<%= image_tag( graph_url( :action => 'day_votes', :id => @election ) ) %>
-<%= image_tag( graph_url( :action => 'show' ) ) %>
+<%= 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 ) ) %>
+