From: <jlsharps@mit.edu>
Date: Fri, 31 Aug 2007 15:58:32 +0000 (-0400)
Subject: Pref_tables now use the Schulze ssd_result object, and they own't display if
X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/2b0073e486a86c2546b58a7ffc10d641f73d196a?hp=93411779cbf694455f1d2abfc2c9d00227e9f322

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 628ce55..3479167 100644
--- 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 %>
-<% 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">
@@ -30,7 +31,7 @@
  </tr>
 <% end -%>
 </table>
-
+<br />
 <!-- This table generates a margin of victory -->
 <table class="preftable">
   <% candidates.each do |victor| %>
@@ -49,3 +50,5 @@
   </tr>
   <% end -%>
 </table>
+<% end -%>
+
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index 13626a1..a77ca83 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -274,14 +274,15 @@ li.moveable {
 }
 
 .preftable th {
+	font-family: verdana,arial,helvetica,sans-serif;
 	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;
-	color: #fff;
+	color: #FFFFFF;
 }
 
 .preftable td {