merged in support for full election results

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

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index 4c91538992c3aa50850e009e28ccd8ac2d4c2d32..8d8bf5f15d88b9413d534e6930ae8bf5314107d6 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>


@@ -28,12 +32,12 @@
      <%= @election.voters.reject {|v| not v.voted? }.length %>
    </blockquote>
 
      <%= @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 %>
 
            :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 %>