X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/bf220bde847fd30e9bf0d00dd7c9aff31265c810..a38724bea6c09b479a93948b6ef4ef61edd24f39:/app/views/quickvote/results.rhtml?ds=inline

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index 52810fe..78e74e8 100644
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -5,6 +5,10 @@
   <span class="subheader">Results</span>
 </div>
 
+<div id="winner_box">
+<%= render :partial => 'common/result', :object => @results[@election.election_method] %>
+</div>
+
 <% if @election.shortdesc %>
   <p><strong>Vote Description:</strong></p>
   <blockquote><em><%=h @election.shortdesc %></em>
@@ -19,21 +23,21 @@
 
 <ol>
   <% for candidate in @election.candidates.sort %>
-    <li><%=h candidate.name.capitalize %></li>
+    <li><%= white_list(candidate.name.capitalize) %></li>
   <% end %>
 </ol>
 
 <p><strong>Number of voters:</strong></p>
    <blockquote>
-     <%= @election.voters.reject {|v| not v.voted? }.length %> (see below for details) 
+     <%= @election.voters.reject {|v| not v.voted? }.length %>
    </blockquote>
 
-<%= render :partial => 'result_box',
+<%= render :partial => 'common/result_box',
            :locals => { :method => @election.election_method } %>
 
 <% for result_type in @election.other_methods %>
 
-<%= render :partial => 'result_box',
+<%= render :partial => 'common/result_box',
            :locals => { :method => result_type } %>
 
 <% end %>
@@ -41,14 +45,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 />
 -->