turned off memcache as it was causing trouble

[selectricity] / app / views / quickvote / _results_sidebar.rhtml

diff --git a/app/views/quickvote/_results_sidebar.rhtml b/app/views/quickvote/_results_sidebar.rhtml
index 37776b802f0cdbff66f125921248b3b3f4bb3a87..30047a48347921ca790773ab2c6b5bb81623f103 100644 (file)
--- a/app/views/quickvote/_results_sidebar.rhtml
+++ b/app/views/quickvote/_results_sidebar.rhtml
@@ -1,10 +1,9 @@
-<h2>Winner</h2>
-<%= render :partial => 'result', :object => @results[@election.election_method] %>
+<h2>Method</h2>
 
 <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>
 
@@ -39,6 +38,6 @@ Event.observe(method_select, 'change', show_results_for);
 
 <h2>Voter Report</h2>
 
-<p><%= link_to "[View All Voters: Map and Other Info]", :controller => "quickvote",
+<p><%= link_to "[Map/List of Voters]", :controller => "quickvote",
        :action => "list_voters", :id => @election.id %></p>