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.

diff --git a/app/views/quickvote/_result_box.rhtml b/app/views/quickvote/_result_box.rhtml
index 41d9d173532773edf1ecb086820687be4597ed34..917dbd4eea590d0ecbdec4da97361428e8783069 100644 (file)
--- a/app/views/quickvote/_result_box.rhtml
+++ b/app/views/quickvote/_result_box.rhtml
@@ -9,8 +9,11 @@
   <% end %></span>
 </div>
 
   <% end %></span>
 </div>
 

+<% unless @election.election_method == method -%>
+<%= render :partial => 'result', :object => @results[method]%>
+<% end -%>

 <%= render :partial => 'methodinfo_' + method,
 <%= render :partial => 'methodinfo_' + method,

-           :object => @results[@election.election_method] %>
+           :object => @results[method] %>

 
 </div>
 
 
 </div>
 

diff --git a/app/views/quickvote/_results_sidebar.rhtml b/app/views/quickvote/_results_sidebar.rhtml
index c60ed3ddfc1cf90a31e10cddf936a2e2d4283fc7..37776b802f0cdbff66f125921248b3b3f4bb3a87 100644 (file)
--- 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 ))%>
 
 <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 52810fe543d228a1b43391b82ddce41feffeab2f..3ba74f56b17383c35732a1730e80b625955703ec 100644 (file)
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -41,14 +41,6 @@
 
 <div class="clear-div"></div>
 
 
 <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 />
 -->
 <!--
 <%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %><br />
 -->