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=-c

Merge head
---

37ccb3a5511504b6b58c3fe70135e016d0a61bfd
diff --combined app/views/quickvote/_results_sidebar.rhtml
index d71d01f,37776b8..f346b2e
--- a/app/views/quickvote/_results_sidebar.rhtml
+++ b/app/views/quickvote/_results_sidebar.rhtml
@@@ -4,7 -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>
  
@@@ -34,4 -34,11 +34,11 @@@ Event.observe(method_select, 'change', 
  
  <h2>Statistics</h2>
  <%= image_tag( graph_url( :action => 'votes_per_interval', :id => @election ))%>
+ <br />
+ <br />
+ 
+ <h2>Voter Report</h2>
+ 
+ <p><%= link_to "[View All Voters: Map and Other Info]", :controller => "quickvote",
+        :action => "list_voters", :id => @election.id %></p>
  
diff --combined app/views/quickvote/results.rhtml
index c0de537,3ba74f5..4c91538
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@@ -25,7 -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',
@@@ -41,14 -41,6 +41,6 @@@
  
  <div class="clear-div"></div>
  
- <div class="normal-header">
-   <span class="header">Voter Report</span>
-   <span class="subheader"></span>
- </div>
- 
- <p><%= link_to "[View All Voters]", :controller => "quickvote", :action => "list_voters", :id => @election.id %></p>
- <br />
- 
  <!--
  <%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %><br />
  -->