Merge head

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

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index e3644c87c2b7627c88398d5c8e45b23119789d63..52810fe543d228a1b43391b82ddce41feffeab2f 100644 (file)
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -1,9 +1,13 @@
-<% %>
-<h1>Results</h1>
+<% require 'whois/whois' %>
+
+<div id="title-header">
+  <span class="header">Quickvote</span>
+  <span class="subheader">Results</span>
+</div>

 
 <% if @election.shortdesc %>
 
 <% 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) -%>
     <% if @election.longdesc -%>
       <br />
       <%= h(@election.longdesc) -%>


@@ -15,63 +19,37 @@
 
 <ol>
   <% for candidate in @election.candidates.sort %>
 
 <ol>
   <% for candidate in @election.candidates.sort %>

-    <li><%= candidate.name.capitalize %></li>
+    <li><%=h 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.length %> (see below for details) 
+     <%= @election.voters.reject {|v| not v.voted? }.length %> (see below for details) 

    </blockquote>
 
    </blockquote>
 

-<h2>Winners</h2>
+<%= render :partial => 'result_box',
+           :locals => { :method => @election.election_method } %>

 
 

-<div class="mainresultbox">
-<center><h3>Condorcet (w/ Cloneproof SSD) Results</h3></center>
-<%= render :partial => 'result', :object => @ssd_result %>
-</div>
+<% for result_type in @election.other_methods %>

 
 

-<div class="resultbox">
-<h3>Plurality Results</h3>
-<%= render :partial => 'result', :object => @plurality_result %>
-</div>
+<%= render :partial => 'result_box',
+           :locals => { :method => result_type } %>

 
 

-<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>
+<% end %>

 
 

-<div class="resultbox">
-<h3>Simple Condorcet Results</h3>
-<%= render :partial => 'result', :object => @condorcet_result %>
-</div>

 
 

-<div class="resultbox">
-<h3>Borda Count Results</h3>
-<%= render :partial => 'result', :object => @borda_result %>
-</div>
+<div class="clear-div"></div>

 
 

-<div class="resultbox">
-<h3>Instant Runoff (IRV) Results</h3>
-<%= render :partial => 'result', :object => @runoff_result %>
+<div class="normal-header">
+  <span class="header">Voter Report</span>
+  <span class="subheader"></span>

 </div>
 
 </div>
 

-<div class="clearbox"></div>
+<p><%= link_to "[View All Voters]", :controller => "quickvote", :action => "list_voters", :id => @election.id %></p>
+<br />

 
 

-<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>