From: <mako@atdot.cc>
Date: Mon, 31 Mar 2008 18:55:53 +0000 (-0400)
Subject: merge from live
X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/9129a21b28c88064edfcfc8a8fa23a640f29819c?hp=80ba04e050870cc01835cb1cc93bfd6645efcecd

merge from live
---

diff --git a/app/views/common/_methodinfo_condorcet.rhtml b/app/views/common/_methodinfo_condorcet.rhtml
index 5fb29e0..1cb5fae 100644
--- a/app/views/common/_methodinfo_condorcet.rhtml
+++ b/app/views/common/_methodinfo_condorcet.rhtml
@@ -17,8 +17,13 @@ another Condorcet system.</p>
 <% else %>
 
   There are too many candidates in your elections to show the result
-  tables.  <%= link_to "Click here", { :action => 'pref_tables', :id =>
-  @voter.password }, :popup => [] %> to view details.
+  tables. 
+
+  <% if not @election.type == QuickVote %>
+    <%= link_to "Click here", { :action => 'pref_tables', :id => @voter.password }, :popup => [] %>
+    to view details.
+  <% end %>
+  
 
 <% end -%>
 
diff --git a/app/views/common/_methodinfo_ssd.rhtml b/app/views/common/_methodinfo_ssd.rhtml
index 5ec8b89..25bc354 100644
--- a/app/views/common/_methodinfo_ssd.rhtml
+++ b/app/views/common/_methodinfo_ssd.rhtml
@@ -29,8 +29,12 @@ Beatpath Winner, Path Voting, and Path Winner.</p>
 <% else %>
 
   There are too many candidates in your elections to show the result
-  tables.  <%= link_to "Click here", { :action => 'pref_tables', :id =>
-  @voter.password }, :popup => [] %> to view details.
+  tables.
+
+  <% if not @election.type == QuickVote %>
+    <%= link_to "Click here", { :action => 'pref_tables', :id => @voter.password }, :popup => [] %>
+    to view details.
+  <% end %>
 
 <% end -%>