merged in changes from devel

[selectricity-live] / app / views / election / edit_candidates.rhtml

diff --git a/app/views/election/edit_candidates.rhtml b/app/views/election/edit_candidates.rhtml
index dbcc3f8bad3b49a550c4c5159195bdf3542c17e8..dcd601a9cf72b3501061a3b18bfb83126e30367b 100644 (file)
--- a/app/views/election/edit_candidates.rhtml
+++ b/app/views/election/edit_candidates.rhtml
@@ -1,4 +1,4 @@
-<h1><strong><%= @election.name %>:</strong> Edit/Add Candidates</h1>
+<h2>Edit/Add Candidates</h2>
 
 <%= error_messages_for :candidate %>
 
@@ -16,10 +16,10 @@
 
 <p>Please enter new candidates below.</p>
 
-<%= form_tag( { :action => :add_candidate, :id => @election.id },
-              :multipart => true ) %>
+<% form_tag( { :action => :add_candidate, :id => @election.id },
+              :multipart => true ) do %>
 <%= render :partial => 'candidate_form' %>
 <%= submit_tag "Add Candidate" %>
-<%= end_form_tag %>
+<% end %>
 
-<%= button_to "Done!", :action => 'show', :id => @election %>
+<%= button_to "Done!", :action => 'new_voters', :id => @election %>