Merge from jdong

diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb
index 814eb363c437a0074abea9113fdc7e30e4a1a455..ff29d8ecb91e742f3bcd7113a48c2db2116c36ad 100644 (file)
--- a/app/controllers/graph_controller.rb
+++ b/app/controllers/graph_controller.rb
@@ -133,7 +133,7 @@ class GraphController < ApplicationController
       data[names[candidate]] = votes
     end
      
-    pie = GruffGraff.new ( :graph_type => Gruff::Pie,
+    pie = GruffGraff.new( :graph_type => Gruff::Pie,
                            :title => "Percentage of First Place Votes",
                            :data => data)
     send_data(*pie.output)

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index bb74bba558278331eb15c27b640e9121bd016cf9..046228ddb3acba669a94934c12cfb96a56cf8c2c 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -5,10 +5,10 @@
   <p>If you have received an email with a token inviting you to vote in
   an ongoing election, you can log in to vote using your token below.</p>
 
-  <%= form_tag :controller => 'voter', :action => 'index' %>
+  <% form_tag(:controller => 'voter', :action => 'index') do %>
   <p><%= text_field :vote, :password %></p>
   <p><%= submit_tag "Log In" %></p>
-  <%= end_form_tag %>
+  <% end %>
 
   <p><%= link_to 'Lost or forgot your token?', :controller => 'voter', :action => 'forgot_password' %></p>