From: <mako@atdot.cc>
Date: Thu, 27 Nov 2008 20:12:03 +0000 (-0500)
Subject: merged in changes from live version
X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/05ebed925ae2b5e7bf2a599536ba7d7ac15ffbf7?hp=79b260d1caad8ef8559a9d8a9c46068acafdf9fb

merged in changes from live version
---

diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb
index 92e1a1e..0599b70 100644
--- 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 425c952..b831aef 100644
--- 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 883b4fa..7562c61 100644
--- 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>