Merged changes from jdong's branch into HEAD.

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

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index f53bf3f05be99ee3ef7ad6f543f3dd82fae05454..0cbd6d00e5f84b6091d19ca1bb55848518aa5c26 100644 (file)
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -144,7 +144,7 @@ by several other names.</p>
 
 <div class="clearbox"></div>
 
 
 <div class="clearbox"></div>
 

-<h2>Voters</h2>
+<h2>Voters <%= link_to "[Stalk Voters]", :controller => "quickvote", :action => "mapvoters", :id => @election.id %></h2>

 <table class="voterbox">
 <tr>
 <th>IP/Host</th>
 <table class="voterbox">
 <tr>
 <th>IP/Host</th>


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

+<%= render :partial => 'defeats_list' %>

 <%= render :partial => 'pref_table' %>
 
 <%= image_tag( graph_url( :action => 'votes_per_day', :id => @election ) ) %><br />
 <%= render :partial => 'pref_table' %>
 
 <%= image_tag( graph_url( :action => 'votes_per_day', :id => @election ) ) %><br />