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
old mode 100755 (executable)
new mode 100644 (file)
index cc2c16a..837f755
--- a/app/views/election/edit_candidates.rhtml
+++ b/app/views/election/edit_candidates.rhtml
@@ -1,9 +1,11 @@
+<%= 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>
 <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 %>
 
   <% @election.candidates.each do |candidate| %>
     <% @current_candidate = candidate %>


@@ -16,10 +18,10 @@
 
 <p>Please enter new candidates below.</p>
 
 
 <p>Please enter new candidates below.</p>
 

-<%= form_tag( { :action => :add_candidate, :id => @election.id },
-              :multipart => true ) %>
+<% form_tag( { :action => :add_candidate, :id => @election.id },
+              :multipart => true ) do %>

 <%= render :partial => 'candidate_form' %>
 <%= submit_tag "Add Candidate" %>
 <%= render :partial => 'candidate_form' %>
 <%= submit_tag "Add Candidate" %>

-<%= end_form_tag %>
+<% end %>

 
 

-<%= button_to "Done!", :action => 'show', :id => @election %>
+<%= button_to "Done!", :action => 'new_voters', :id => @election %>