Added processing and presentatin of results.

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

diff --git a/app/views/elections/show.rhtml b/app/views/elections/show.rhtml
index 0ef2fc594f7c7737a62319c1b94f812fc29ea667..954e480e4b9b2ac1c35340d135805483f5beb29e 100644 (file)
--- a/app/views/elections/show.rhtml
+++ b/app/views/elections/show.rhtml
@@ -1,3 +1,4 @@
+<% %>
 <h1>Information On <%= @election.name %></h1>
 
 <h2>Overview <%= link_to "edit", :action => 'edit', :id => @election.id %></h2> 
@@ -10,14 +11,8 @@
 
 <h2>Candidates <%= link_to "edit", :action => 'edit_candidates', :id => @election.id %></h2> 
 
-
-The following are valid options or candidates in this election:
-
-<ul>
-<% @election.candidates.each do |candidate| %>
-   <% @candidate = candidate %>
-   <%= render :partial => 'candidate_line' %>
-<% end %>
-</ul>
+<%= render :partial => 'candidate_list' %>
 
 <h2>Voters <%= link_to "edit", :action => 'edit_voters', :id => @election.id %></h2>
+
+<%= render :partial => 'voter_list' %>