From: John Dong <jdong@mit.edu>
Date: Fri, 31 Aug 2007 19:22:55 +0000 (-0400)
Subject: Merge head
X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/37ccb3a5511504b6b58c3fe70135e016d0a61bfd?hp=2ee3731fd7cc776524f44005a99035d01168e6c0

Merge head
---

diff --git a/app/views/quickvote/_results_sidebar.rhtml b/app/views/quickvote/_results_sidebar.rhtml
index 37776b8..f346b2e 100644
--- a/app/views/quickvote/_results_sidebar.rhtml
+++ b/app/views/quickvote/_results_sidebar.rhtml
@@ -4,7 +4,7 @@
 <p>This election was run using:
 <strong><%= ELECTION_TYPES[@election.election_method] %></strong></p>
 
-<p>View results with other methods:<br />
+<p>View results using other methods:<br />
 <% type_hash = {}; ELECTION_TYPES.each {|k,v| type_hash[v] = k} %>
 <%= select_tag 'election_type_select', options_for_select(type_hash, @election.election_method) %></p>
 
diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index 3ba74f5..4c91538 100644
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -25,7 +25,7 @@
 
 <p><strong>Number of voters:</strong></p>
    <blockquote>
-     <%= @election.voters.reject {|v| not v.voted? }.length %> (see below for details) 
+     <%= @election.voters.reject {|v| not v.voted? }.length %>
    </blockquote>
 
 <%= render :partial => 'result_box',