merged back from live

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

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index 5fd5f9e4bc0d15cf5cd8defe0a71a97be85a167b..78e74e89191103180e249cece519720474be61b5 100644 (file)
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -6,7 +6,7 @@
 </div>
 
 <div id="winner_box">
-<%= render :partial => 'result', :object => @results[@election.election_method] %>
+<%= render :partial => 'common/result', :object => @results[@election.election_method] %>
 </div>
 
 <% if @election.shortdesc %>
@@ -23,7 +23,7 @@
 
 <ol>
   <% for candidate in @election.candidates.sort %>
-    <li><%=h candidate.name.capitalize %></li>
+    <li><%= white_list(candidate.name.capitalize) %></li>
   <% end %>
 </ol>
 
@@ -32,12 +32,12 @@
      <%= @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 %>