Merge jdong

[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..dcd601a9cf72b3501061a3b18bfb83126e30367b 100644 (file)
--- a/app/views/election/edit_candidates.rhtml
+++ b/app/views/election/edit_candidates.rhtml
@@ -1,4 +1,6 @@
-<h1><strong><%= @election.name %>:</strong> Edit Candidates</h1>
+<h2>Edit/Add Candidates</h2>
+
+<%= error_messages_for :candidate %>
 
 <% unless @election.candidates.empty? %>
   <p>The following are valid options or candidates in this election:</p>
@@ -11,6 +13,13 @@
 <% else %>
   <p>There are no candidates registered for this election.</p>
 <% end %>
+
 <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 %>