Merge head

diff --git a/app/views/quickvote/_results_sidebar.rhtml b/app/views/quickvote/_results_sidebar.rhtml
index 37776b802f0cdbff66f125921248b3b3f4bb3a87..f346b2ef280e324cb57b3731c9e1f054cb4b2906 100644 (file)
--- 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 3ba74f56b17383c35732a1730e80b625955703ec..4c91538992c3aa50850e009e28ccd8ac2d4c2d32 100644 (file)
--- 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',