removed login information (a few people have found it)

[selectricity-live] / app / controllers / graph_controller.rb

diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb
index 413ebb0c10617d9e5ac38e2cc1a3ed0e74933008..0ef4e71a3ae145c78a19bcb1b1c7c88484c82e2b 100644 (file)
--- a/app/controllers/graph_controller.rb
+++ b/app/controllers/graph_controller.rb
@@ -2,7 +2,8 @@ require 'date'
 class GraphController < ApplicationController  
   class GruffGraff
     
-    COLORS = ['#74CE00', '#005CD9', '#DC0D13', '#131313', '#990033']
+    COLORS = ['#74CE00', '#005CD9', '#DC0D13', '#131313', '#A214A4', 'EFF80E',
+              '90E5E6', 'F58313', '437D3D', '0E026C']
     BACKGROUND_COLORS = ['#74CE00', '#FFFFFF'] #for green and white background
     
     def initialize(options)
@@ -45,6 +46,7 @@ class GraphController < ApplicationController
         end
       else #one dimensional array, just pass it in
       @graph.data( options.fetch(:data_name, "Data"), options[:data] )
+      @graph.hide_legend = true
       end
       
       # set the labels or create an empty hash
@@ -87,6 +89,8 @@ class GraphController < ApplicationController
     @election = Election.find(params[:id])
     data, labels, scale = get_votes_per_interval_data(@election)
     
+    hide_legend = true
+    
     graph = GruffGraff.new( :graph_type => Gruff::Line,
                             :data_name => @election.name,
                             :data => data,