fixed up the results page in a number of ways

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

diff --git a/app/views/quickvote/_pref_tables.rhtml b/app/views/quickvote/_pref_tables.rhtml
index 628ce55ca5d873474e149fdc4097109cf8512799..b9d41ececcb6b2738dbc639ddf4785956eca4915 100644 (file)
--- a/app/views/quickvote/_pref_tables.rhtml
+++ b/app/views/quickvote/_pref_tables.rhtml
@@ -1,10 +1,17 @@
-<% candidates = @election.condorcet_result.ranked_candidates.flatten -%>
+<% candidates = @election.ssd_result.ranked_candidates.flatten -%>
 <% voters = @election.voters.size %>
-<% matrix = @election.condorcet_result.matrix %>
-<% victories = @election.condorcet_result.victories_and_ties %>
+<% matrix = @election.ssd_result.matrix %>
+<% victories = @election.ssd_result.victories_and_ties %>
+
+<% if candidates.size <= 7 -%>
+
+<p>Each number in the table below shows how many times the candidate on
+the left beat the matching candidate on the top. The winner is on the
+top of the left column.</p>
 
 <!-- This table shows how many times each choice was ranked above the other, 
        with percentages-->
+<div class="result_table">
 <table class="preftable">
   <tr>
        <td></td>
@@ -30,8 +37,14 @@
  </tr>
 <% end -%>
 </table>
-
+</div>
 <!-- This table generates a margin of victory -->
+
+<p>A simplification of the above data. The winner is on the left; each
+cell names the defeated candidate and the magnitude of the victory in
+parenthesis.</p>
+
+<div class="result_table">
 <table class="preftable">
   <% candidates.each do |victor| %>
   <tr>
@@ -49,3 +62,6 @@
   </tr>
   <% end -%>
 </table>
+</div>
+<% end -%>
+