fixed the string modification function and added support for a titlecase method

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

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index ad71fa65b686bc1fd3da70dba2f409bcfd207ced..e3644c87c2b7627c88398d5c8e45b23119789d63 100644 (file)
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -1,36 +1,77 @@
 <% %>
+<h1>Results</h1>
 
-<h1><em><%= @election.name %></em> Results</h1>
+<% if @election.shortdesc %>
+  <p><strong>Description:</strong></p>
+  <blockquote><em><%= @election.shortdesc %></em>
+    <% if @election.longdesc -%>
+      <br />
+      <%= h(@election.longdesc) -%>
+    <% end -%>
+  </blockquote>
+<% end %>
+
+<p><strong>Candidates/choices:</strong></p>
+
+<ol>
+  <% for candidate in @election.candidates.sort %>
+    <li><%= candidate.name.capitalize %></li>
+  <% end %>
+</ol>
+
+<p><strong>Number of voters:</strong></p>
+   <blockquote>
+     <%= @election.voters.length %> (see below for details) 
+   </blockquote>
+
+<h2>Winners</h2>
 
-<p>Total Votes: <strong><%= @election.voters.length %></strong></p>
 <div class="mainresultbox">
-<h2>Condorcet (w/ Cloneproof SSD) Results</h2>
+<center><h3>Condorcet (w/ Cloneproof SSD) Results</h3></center>
 <%= render :partial => 'result', :object => @ssd_result %>
 </div>
 
 <div class="resultbox">
-<h2>Plurality Results</h2>
+<h3>Plurality Results</h3>
 <%= render :partial => 'result', :object => @plurality_result %>
 </div>
 
 <div class="resultbox">
-<h2>Approval Result</h2>
+<h3>Approval Result</h3>
 <p><font size="-1">(Assuming top two choices are "approved.")</font></p>
 <%= render :partial => 'result', :object => @approval_result %>
 </div>
 
 <div class="resultbox">
-<h2>Simple Condorcet Results</h2>
+<h3>Simple Condorcet Results</h3>
 <%= render :partial => 'result', :object => @condorcet_result %>
 </div>
 
 <div class="resultbox">
-<h2>Borda Count Results</h2>
+<h3>Borda Count Results</h3>
 <%= render :partial => 'result', :object => @borda_result %>
 </div>
 
 <div class="resultbox">
-<h2>Instant Runoff (IRV) Results</h2>
+<h3>Instant Runoff (IRV) Results</h3>
 <%= render :partial => 'result', :object => @runoff_result %>
 </div>
-</div>
+
+<div class="clearbox"></div>
+
+<h2>Voters</h2>
+
+<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>