Merge jdong

[selectricity-live] / app / views / election / show.rhtml

diff --git a/app/views/election/show.rhtml b/app/views/election/show.rhtml
index 0051861e3475c418d9480a08cf7f0cc5208f9461..2a2316861f40fb95096ea7ada6b4fd1aee945572 100644 (file)
--- a/app/views/election/show.rhtml
+++ b/app/views/election/show.rhtml
@@ -1,4 +1,3 @@
-<% %>
 <h1>Vote Information</h1>
 
 <% if @election.active? %>
@@ -34,7 +33,7 @@
 <% end %>
 
 <h2>Candidates</h2> 
-
+<% %>
 <% unless @election.candidates.empty? %>
   <%= render :partial => 'candidate_list' %>
   <% unless @election.active %>
@@ -54,7 +53,7 @@
   <p><em>There are currently no voters registered.  <%= link_to "Add some!", :action => 'edit_voters', :id => @election.id unless @election.active %></em></p>
 <% end %>
 
-<% unless @election.active %>
+<% unless @election.active? %>
   <h2>Start Election</h2>
 
   <% if @election.start_blockers.length > 0 %>
@@ -65,7 +64,7 @@
     <% end %>
     </ul>
   <% else %>
-    <p>Please check eveything carefully on this page before starting this
+    <p>Please check everything carefully on this page before starting this
     vote. Once you begin the vote, you will <em>not</em> be able to add or
     change candidates, modify the voting lists, or change the end
     time.</p>