Commit test case fix that restores IE6 transparency

[selectricity] / app / controllers / graph_controller.rb

diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb
index b019aeb52b91e230eab971af3b4e47d8ccf5a1ac..413ebb0c10617d9e5ac38e2cc1a3ed0e74933008 100644 (file)
--- a/app/controllers/graph_controller.rb
+++ b/app/controllers/graph_controller.rb
@@ -108,14 +108,25 @@ class GraphController < ApplicationController
     @election.results unless @election.borda_result
     data, labels = get_borda_points(@election.borda_result)
     
     @election.results unless @election.borda_result
     data, labels = get_borda_points(@election.borda_result)
     

+    size = "400x300"
+    size = "580x300" if @election.candidates.size >= 5
+    
+   if @election.candidates.size >= 5
+     marker_font_size = 17
+   else
+     marker_font_size = 20
+   end
+    

     graph = GruffGraff.new( :graph_type => Gruff::Bar,
                             :data_name => @election.name,
                             :data => data,
                             :interval_labels => labels,
     graph = GruffGraff.new( :graph_type => Gruff::Bar,
                             :data_name => @election.name,
                             :data => data,
                             :interval_labels => labels,

+                            :size => size,

                             :title => "Points Per Candidate",
                             :marker_color => '#999999',
                             :title => "Points Per Candidate",
                             :marker_color => '#999999',

+                            :marker_font_size => marker_font_size,

                             :y_axis_label => "Points",
                             :y_axis_label => "Points",

-                            :x_axis_label => "Candidate")
+                            :x_axis_label => "Candidates")

     send_data(*graph.output)
   end
   #Acording to Tufte, small, concomparitive, highly labeled data sets usually
     send_data(*graph.output)
   end
   #Acording to Tufte, small, concomparitive, highly labeled data sets usually