-<h1><strong><%= @election.name %>:</strong> Edit Candidates</h1>
+<%= render_partial 'progress', 'candidates' %>
+<h1>Edit/Add Candidates</h1>
+
+<%= error_messages_for :candidate %>
<% unless @election.candidates.empty? %>
<p>The following are valid options or candidates in this election:</p>
+1;3A
<% @election.candidates.each do |candidate| %>
<% @current_candidate = candidate %>
<% else %>
<p>There are no candidates registered for this election.</p>
<% end %>
+
<p>Please enter new candidates below.</p>
-<%= render :partial => 'candidates_form' %>
-<%= button_to "Done!", :action => 'show', :id => @election %>
+
+<% form_tag( { :action => :add_candidate, :id => @election.id },
+ :multipart => true ) do %>
+<%= render :partial => 'candidate_form' %>
+<%= submit_tag "Add Candidate" %>
+<% end %>
+
+<%= button_to "Done!", :action => 'new_voters', :id => @election %>