From: <jlsharps@mit.edu>
Date: Thu, 22 May 2008 19:50:14 +0000 (-0400)
Subject: minor changes to the election show page, still having trouble figuring out how to... 
X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/6ab290219a55a24ff6047d02cf6c9a03dc096195?ds=inline;hp=8e7066ecab24bf4f9795cf624e45804f27c5c005

minor changes to the election show page, still having trouble figuring out how to display results early for elections.
---

diff --git a/app/views/election/show.rhtml b/app/views/election/show.rhtml
index 04c71a6..701c607 100644
--- a/app/views/election/show.rhtml
+++ b/app/views/election/show.rhtml
@@ -2,19 +2,19 @@
   <span class="header">Election Overview</span>
   <span class="subheader"></span>
 </div>
-
-<% if @election.done? %>
+<% if @election.enddate < Time.now %>
 <div id="status">Election is finished. <%= link_to "View results",
-  :action => 'detailed_results', :id => @election.id %>.</div>
+  	:controller => 'voter', :action => 'index', 
+	:election_id => @election.id %>.</div>
 
-<% elsif (@election.active? && @election.viewable?) %>
+<% elsif (@election.active? && @election.early_results? ) %>
   <div id="status">The creator of this election has decided that the results
 	should be viewable while the election is in progress.
 	<%if @election.voters.empty? %>
 	However, no one has voted yet.
 	<% else %>
-	<%= link_to "View results", :action => 'detailed_results', 
-		:id => @election.id %>.
+	<%= link_to "View results", :controller => 'voter', :action => 'results', 
+		:id => "open" %>.
     <% end %>
   </div>
 <% elsif @election.active? %>