merge everything back from mainline branch

[selectricity] / app / views / election / new_voters.rhtml

diff --git a/app/views/election/new_voters.rhtml b/app/views/election/new_voters.rhtml
old mode 100755 (executable)
new mode 100644 (file)
index b750085..5f06446
--- a/app/views/election/new_voters.rhtml
+++ b/app/views/election/new_voters.rhtml
@@ -1,8 +1,9 @@
 <% @edit = true %>
 <% @edit = true %>

-<h1><strong><%= @election.name %>:</strong> Enter List of Voter Email Addresses</h1>
+<h1><strong><%=h @election.name %>:</strong> Enter List of Voter Email Addresses</h1>

 
 <%= render :partial => 'voter_list' %>
 
 
 <%= render :partial => 'voter_list' %>
 

-<%= form_tag :action => 'new_voters', :id => @election.id %>
+<% form_tag(:action => 'new_voters', :id => @election.id) do %>

 <%= render :partial => 'voters_form' %>
 <%= render :partial => 'voters_form' %>

-<%= end_form_tag %>
+<% end %>
+<%= button_to "Done", :action => 'show', :id => @election.id %>