Pref_tables now use the Schulze ssd_result object, and they own't display if

more than 7 candidates because it would look ugly :(.

diff --git a/app/views/quickvote/_pref_tables.rhtml b/app/views/quickvote/_pref_tables.rhtml
index 628ce55ca5d873474e149fdc4097109cf8512799..3479167d226296cc14a0864c47b1299d2efb452a 100644 (file)
--- a/app/views/quickvote/_pref_tables.rhtml
+++ b/app/views/quickvote/_pref_tables.rhtml
@@ -1,8 +1,9 @@
-<% candidates = @election.condorcet_result.ranked_candidates.flatten -%>
+<% candidates = @election.ssd_result.ranked_candidates.flatten -%>

 <% voters = @election.voters.size %>
 <% 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 -%>

 <!-- This table shows how many times each choice was ranked above the other, 
        with percentages-->
 <table class="preftable">
 <!-- This table shows how many times each choice was ranked above the other, 
        with percentages-->
 <table class="preftable">


@@ -30,7 +31,7 @@
  </tr>
 <% end -%>
 </table>
  </tr>
 <% end -%>
 </table>

-
+<br />

 <!-- This table generates a margin of victory -->
 <table class="preftable">
   <% candidates.each do |victor| %>
 <!-- This table generates a margin of victory -->
 <table class="preftable">
   <% candidates.each do |victor| %>


@@ -49,3 +50,5 @@
   </tr>
   <% end -%>
 </table>
   </tr>
   <% end -%>
 </table>

+<% end -%>
+

diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index 13626a13bd67f4a807535390e38f603e9ef76c8c..a77ca83e47927e7f4331a5423a06fd381b9597ab 100644 (file)
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -274,14 +274,15 @@ li.moveable {
 }
 
 .preftable th {
 }
 
 .preftable th {

+       font-family: verdana,arial,helvetica,sans-serif;

        border-width: 2px;
        border-color: #999999;
        border-style: solid;
        text-align: center;
        font-weight: bold;
        border-width: 2px;
        border-color: #999999;
        border-style: solid;
        text-align: center;
        font-weight: bold;

-       padding: 5px 5px 5px 15px;
+       padding: 5px 5px 5px 5px;

        background-color: #999999;
        background-color: #999999;

-       color: #fff;
+       color: #FFFFFF;

 }
 
 .preftable td {
 }
 
 .preftable td {