X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/ac5e3489e8b886b7b8a7252ab56ddeb3d3bdadc7..2a72af9b37793ded87c42042bd431495d1475c39:/app/views/quickvote/results.rhtml

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index e3644c8..78e74e8 100644
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -1,9 +1,17 @@
-<% %>
-<h1>Results</h1>
+<% require 'whois/whois' %>
+
+<div id="title-header">
+  <span class="header">Quickvote</span>
+  <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>Description:</strong></p>
-  <blockquote><em><%= @election.shortdesc %></em>
+  <p><strong>Vote Description:</strong></p>
+  <blockquote><em><%=h @election.shortdesc %></em>
     <% if @election.longdesc -%>
       <br />
       <%= h(@election.longdesc) -%>
@@ -15,63 +23,29 @@
 
 <ol>
   <% for candidate in @election.candidates.sort %>
-    <li><%= candidate.name.capitalize %></li>
+    <li><%= white_list(candidate.name.capitalize) %></li>
   <% end %>
 </ol>
 
 <p><strong>Number of voters:</strong></p>
    <blockquote>
-     <%= @election.voters.length %> (see below for details) 
+     <%= @election.voters.reject {|v| not v.voted? }.length %>
    </blockquote>
 
-<h2>Winners</h2>
-
-<div class="mainresultbox">
-<center><h3>Condorcet (w/ Cloneproof SSD) Results</h3></center>
-<%= render :partial => 'result', :object => @ssd_result %>
-</div>
-
-<div class="resultbox">
-<h3>Plurality Results</h3>
-<%= render :partial => 'result', :object => @plurality_result %>
-</div>
+<%= render :partial => 'common/result_box',
+           :locals => { :method => @election.election_method } %>
 
-<div class="resultbox">
-<h3>Approval Result</h3>
-<p><font size="-1">(Assuming top two choices are "approved.")</font></p>
-<%= render :partial => 'result', :object => @approval_result %>
-</div>
+<% for result_type in @election.other_methods %>
 
-<div class="resultbox">
-<h3>Simple Condorcet Results</h3>
-<%= render :partial => 'result', :object => @condorcet_result %>
-</div>
+<%= render :partial => 'common/result_box',
+           :locals => { :method => result_type } %>
 
-<div class="resultbox">
-<h3>Borda Count Results</h3>
-<%= render :partial => 'result', :object => @borda_result %>
-</div>
+<% end %>
 
-<div class="resultbox">
-<h3>Instant Runoff (IRV) Results</h3>
-<%= render :partial => 'result', :object => @runoff_result %>
-</div>
 
-<div class="clearbox"></div>
+<div class="clear-div"></div>
 
-<h2>Voters</h2>
+<!--
+<%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %><br />
+-->
 
-<table border="1">
-<tr>
-<th>IP Address</th>
-<th>DNS/Host</th>
-<th>Vote</th>
-</tr>
-<% for voter in @election.voters %>
-  <tr>
-  <td><%= voter.ipaddress %></td>
-  <td><%= `host #{voter.ipaddress}`.sub(/^.*pointer (.*)\.$/, '\1') %></td>
-  <td><%= voter.vote.votestring %></td>
-  </tr>
-<% end %>
-</table>