merged from devel

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

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index ad71fa65b686bc1fd3da70dba2f409bcfd207ced..78e74e89191103180e249cece519720474be61b5 100644 (file)
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -1,36 +1,51 @@
-<% %>
+<% require 'whois/whois' %>
 
-<h1><em><%= @election.name %></em> Results</h1>
-
-<p>Total Votes: <strong><%= @election.voters.length %></strong></p>
-<div class="mainresultbox">
-<h2>Condorcet (w/ Cloneproof SSD) Results</h2>
-<%= render :partial => 'result', :object => @ssd_result %>
+<div id="title-header">
+  <span class="header">Quickvote</span>
+  <span class="subheader">Results</span>
 </div>
 
-<div class="resultbox">
-<h2>Plurality Results</h2>
-<%= render :partial => 'result', :object => @plurality_result %>
+<div id="winner_box">
+<%= render :partial => 'common/result', :object => @results[@election.election_method] %>
 </div>
 
-<div class="resultbox">
-<h2>Approval Result</h2>
-<p><font size="-1">(Assuming top two choices are "approved.")</font></p>
-<%= render :partial => 'result', :object => @approval_result %>
-</div>
+<% if @election.shortdesc %>
+  <p><strong>Vote Description:</strong></p>
+  <blockquote><em><%=h @election.shortdesc %></em>
+    <% if @election.longdesc -%>
+      <br />
+      <%= h(@election.longdesc) -%>
+    <% end -%>
+  </blockquote>
+<% end %>
 
-<div class="resultbox">
-<h2>Simple Condorcet Results</h2>
-<%= render :partial => 'result', :object => @condorcet_result %>
-</div>
+<p><strong>Candidates/choices:</strong></p>
 
-<div class="resultbox">
-<h2>Borda Count Results</h2>
-<%= render :partial => 'result', :object => @borda_result %>
-</div>
+<ol>
+  <% for candidate in @election.candidates.sort %>
+    <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 %>
+   </blockquote>
+
+<%= render :partial => 'common/result_box',
+           :locals => { :method => @election.election_method } %>
+
+<% for result_type in @election.other_methods %>
+
+<%= render :partial => 'common/result_box',
+           :locals => { :method => result_type } %>
+
+<% end %>
+
+
+<div class="clear-div"></div>
+
+<!--
+<%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %><br />
+-->
 
-<div class="resultbox">
-<h2>Instant Runoff (IRV) Results</h2>
-<%= render :partial => 'result', :object => @runoff_result %>
-</div>
-</div>