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