-<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>
+1;3A
+
+ <% @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" %>