X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/269c76d5c3935d915a15dd8e9167321bdea5faf0..50d95cd1569a8452323d565cf2f34fc63672cff7:/app/views/election/show.rhtml

diff --git a/app/views/election/show.rhtml b/app/views/election/show.rhtml
index 6060fb1..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? %>
@@ -149,7 +149,7 @@
 <p>To embed your election, copy and paste the following code into your
 homepage:</p>
 
-<pre><%= h("<iframe src='") + votepassword_url(:urlpassword => "open." + @election.id.to_s, :embed => "true") + h("' width='330px' height='370px'>") %>
+<pre><%= h("<iframe src='") + votepassword_url(:urlpassword => "open." + @election.id.to_s, :embed => "true") + h("' width='330px' height='#{(@election.candidates.length+2)*53}px'>" ) %>
 <%= h("</iframe>") %></pre>
 
 <% end %>