-<ul>
-<% @election.candidates.each do |candidate| %>
- <% @candidate = candidate %>
- <%= render :partial => 'candidate_line' %>
+<div class="normal-header">
+ <span class="header">Enter New Candidate</span>
+ <span class="subheader"></span>
+</div>
+
+<%= error_messages_for :candidate %>
+
+<% form_tag( { :action => :add_candidate, :id => @election.id },
+ :multipart => true ) do %>
+<%= render :partial => 'candidate_form' %>
+<p><%= submit_tag "Add Candidate" %></p>
+<% end %>
+
+
+<div class="normal-header">
+ <span class="header">Current Candidates</span>
+ <span class="subheader"></span>
+</div>
+
+
+<% unless @election.candidates.empty? %>
+ <% @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>