From: <jlsharps@mit.edu>
Date: Fri, 31 Aug 2007 16:29:09 +0000 (-0400)
Subject: The other election methods will now display the winner they elected in their own
X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/df1e1ca70a2c618eb376ea6b61207c726beac31d?ds=sidebyside;hp=--cc

The other election methods will now display the winner they elected in their own
partials when selected. The link to the voter map and host names has been moved
into the side-div and the link name was appended to include more info.
---

df1e1ca70a2c618eb376ea6b61207c726beac31d
diff --git a/app/views/quickvote/_result_box.rhtml b/app/views/quickvote/_result_box.rhtml
index 41d9d17..917dbd4 100644
--- a/app/views/quickvote/_result_box.rhtml
+++ b/app/views/quickvote/_result_box.rhtml
@@ -9,8 +9,11 @@
   <% end %></span>
 </div>
 
+<% unless @election.election_method == method -%>
+<%= render :partial => 'result', :object => @results[method]%>
+<% end -%>
 <%= render :partial => 'methodinfo_' + method,
-           :object => @results[@election.election_method] %>
+           :object => @results[method] %>
 
 </div>
 
diff --git a/app/views/quickvote/_results_sidebar.rhtml b/app/views/quickvote/_results_sidebar.rhtml
index c60ed3d..37776b8 100644
--- a/app/views/quickvote/_results_sidebar.rhtml
+++ b/app/views/quickvote/_results_sidebar.rhtml
@@ -34,4 +34,11 @@ Event.observe(method_select, 'change', show_results_for);
 
 <h2>Statistics</h2>
 <%= image_tag( graph_url( :action => 'votes_per_interval', :id => @election ))%>
+<br />
+<br />
+
+<h2>Voter Report</h2>
+
+<p><%= link_to "[View All Voters: Map and Other Info]", :controller => "quickvote",
+       :action => "list_voters", :id => @election.id %></p>
 
diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index 52810fe..3ba74f5 100644
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -41,14 +41,6 @@
 
 <div class="clear-div"></div>
 
-<div class="normal-header">
-  <span class="header">Voter Report</span>
-  <span class="subheader"></span>
-</div>
-
-<p><%= link_to "[View All Voters]", :controller => "quickvote", :action => "list_voters", :id => @election.id %></p>
-<br />
-
 <!--
 <%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %><br />
 -->