merged in changes from live version

diff --combined app/controllers/graph_controller.rb
index 92e1a1efcf3f5048ae3dacf18405213632e19aff,8f1ccb893a2cd4338b5da98387c05cf3bf0aeaf3..0599b70d02de8c996a7035f7f35c0a42990d2284
--- 1/app/controllers/graph_controller.rb
--- 2/app/controllers/graph_controller.rb
+++ b/app/controllers/graph_controller.rb
@@@ -1,27 -1,9 +1,27 @@@
 +# Selectricity: Voting Machinery for the Masses
 +# Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
 +# Copyright (C) 2007 Massachusetts Institute of Technology
 +#
 +# This program is free software: you can redistribute it and/or modify
 +# it under the terms of the GNU Affero General Public License as
 +# published by the Free Software Foundation, either version 3 of the
 +# License, or (at your option) any later version.
 +#
 +# This program is distributed in the hope that it will be useful, but
 +# WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 +# Affero General Public License for more details.
 +#
 +# You should have received a copy of the GNU Affero General Public
 +# License along with this program.  If not, see
 +# <http://www.gnu.org/licenses/>.
 +
  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 -171,22 +189,22 @@@
      @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 --combined app/views/voter/review.rhtml
index 425c952fff4099bd7a1b37ec26529bad85b44ea6,7ecaf5fb7a054d8647cd4360a2bc03d901d75bb3..b831aef225471db68e2181fd2c1b8a670bc202a5
--- 1/app/views/voter/review.rhtml
--- 2/app/views/voter/review.rhtml
+++ b/app/views/voter/review.rhtml
@@@ -24,12 -24,13 +24,13 @@@ preferred to least preferred:</p
  <p>Please select from one of the following pages.</p>
  
  <div style="text-align: center;">
 -  <p><%= button_to 'Confirm This Vote', :action => 'confirm', :id => @voter.password %></p>
 +  <p><%= button_to 'Confirm This Vote', :action => 'confirm', :id => @password %></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 => @voter.password) %></p>
 +                   :action => 'index', :urlpassword => @password) %></p>
  
    <p>You will be returned to the voting page to vote<br /> again, if you choose.</p>