merged in changes from live version

diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb
index 92e1a1efcf3f5048ae3dacf18405213632e19aff..0599b70d02de8c996a7035f7f35c0a42990d2284 100644 (file)
--- a/app/controllers/graph_controller.rb
+++ b/app/controllers/graph_controller.rb
@@ -20,8 +20,8 @@ require 'date'
 class GraphController < ApplicationController  
   class GruffGraff
     
-    COLORS = ['#74CE00', '#005CD9', '#DC0D13', '#131313', '#A214A4', 'EFF80E',
-              '90E5E6', 'F58313', '437D3D', '0E026C']
+    COLORS = ['#74CE00', '#005CD9', '#DC0D13', '#131313', '#A214A4', '#EFF80E',
+              '#90E5E6', '#F58313', '#437D3D', '#0E026C']
     BACKGROUND_COLORS = ['#74CE00', '#FFFFFF'] #for green and white background
     
     def initialize(options)
@@ -189,9 +189,22 @@ class GraphController < ApplicationController
     @election.plurality_result.points.each do |candidate, votes|
       data[names[candidate]] = votes
     end
-     
+    size = "400x300"
+    size = "520x300" if @election.candidates.size >= 8
+
+   if @election.candidates.size >= 8
+     marker_font_size = 20
+     legend_font_size = 17
+   else
+     marker_font_size = 17
+     legend_font_size = 17
+   end
+ 
     pie = GruffGraff.new( :graph_type => Gruff::Pie,
                            :title => "Percentage of First Place Votes",
+                           :size => size,
+                           :marker_font_size => marker_font_size,
+                          :legend_font_size => legend_font_size,
                            :data => data)
     send_data(*pie.output)
                            

diff --git a/app/views/voter/review.rhtml b/app/views/voter/review.rhtml
index 425c952fff4099bd7a1b37ec26529bad85b44ea6..b831aef225471db68e2181fd2c1b8a670bc202a5 100644 (file)
--- a/app/views/voter/review.rhtml
+++ b/app/views/voter/review.rhtml
@@ -28,6 +28,7 @@ preferred to least preferred:</p>
 
   <p>If you choose, you will be able to go back<br />and change it up until
   the end of the voting period.</p>
+  
   <p><%= button_to 'Discard This Vote', votepassword_url(
                    :action => 'index', :urlpassword => @password) %></p>
 

diff --git a/app/views/voter/thanks.rhtml b/app/views/voter/thanks.rhtml
index 883b4fa78bc08ddd9b873c8b1710ebff5b8eaf5c..7562c61681faef0b4d03f3f0c36062dad0495d8d 100644 (file)
--- a/app/views/voter/thanks.rhtml
+++ b/app/views/voter/thanks.rhtml
@@ -9,7 +9,7 @@
 <p>Your unique token for this vote is: <strong><%= @voter.vote.token %></strong></p>
 
 <p>Please record this token for your records and keep it secret. This is
-<strong>not</strong> the same token that you recieved in email. At the
+<strong>not</strong> the same token that you received in email. At the
 end of the election, you will be able to use this token to verify that
 your vote was used in the election and that your vote was recorded
 correctly.</p>