Clean up a deprecation warning and another warning.

[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 b5f06ff31856dd1e0822ed12cf5388f353a7509f..837f75560760d0ea03d0b6a652eaf25106682bbc 100644 (file)
--- a/app/views/election/edit_candidates.rhtml
+++ b/app/views/election/edit_candidates.rhtml
@@ -1,7 +1,11 @@
-<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>
 
 <% 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 %>
 
   <% @election.candidates.each do |candidate| %>
     <% @current_candidate = candidate %>


@@ -11,6 +15,13 @@
 <% else %>
   <p>There are no candidates registered for this election.</p>
 <% end %>
 <% else %>
   <p>There are no candidates registered for this election.</p>
 <% end %>

+

 <p>Please enter new candidates below.</p>
 <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 %>