switched license to agpl-3

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

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index 52810fe543d228a1b43391b82ddce41feffeab2f..78e74e89191103180e249cece519720474be61b5 100644 (file)
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -5,6 +5,10 @@
   <span class="subheader">Results</span>
 </div>
 
   <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>
 <% 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 %>
 
 <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>
   <% 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>
 
    </blockquote>
 

-<%= render :partial => 'result_box',
+<%= render :partial => 'common/result_box',

            :locals => { :method => @election.election_method } %>
 
 <% for result_type in @election.other_methods %>
 
            :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 %>
            :locals => { :method => result_type } %>
 
 <% end %>


@@ -41,14 +45,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 />
 -->