X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/57a193789d1f48a856816c357483cfd7c621cd9d..ee280d9250b5b4c925cc6b4809ce40437d600e7d:/app/views/election/show.rhtml?ds=sidebyside

diff --git a/app/views/election/show.rhtml b/app/views/election/show.rhtml
index ff116f4..39621bf 100644
--- a/app/views/election/show.rhtml
+++ b/app/views/election/show.rhtml
@@ -8,13 +8,13 @@
 	:election_id => @election.id %>.</div>
 
 <% elsif (@election.active? && @election.early_results? ) %>
-  <div id="status">The creator of this election has decided that the results
+  <div id="status">You have decided that the results
 	should be viewable while the election is in progress.
-	<%if @election.voters.empty? %>
+	<%if @election.voters.select {|v| v.vote.confirmed?}.empty? %>
 	However, no one has voted yet.
 	<% else %>
-	<%= link_to "View results", :controller => 'voter', :action => 'results', 
-		:id => "open" %>.
+	<%= link_to "View results", :controller => 'election', :action => 'results', 
+		:id => @election.id %>.
     <% end %>
   </div>
 <% elsif @election.active? %>
@@ -71,9 +71,10 @@
      (<%= votepassword_url(:urlpassword => "open." + @election.id.to_s) %>)</li>
 
 <% if @election.kiosk %>
-<li><%= (link_to ("Kiosk mode",
-          :controller => 'voter', :action => 'index', :election_id => @election.id, :kiosk => true)).to_s %>
-     (<%= votepassword_url(:urlpassword => "open." + @election.id.to_s, :kiosk => true) %>)</li>
+<li><%= link_to("Kiosk mode",
+           kiosk_ready_url(:urlpassword => "open." + @election.id.to_s,
+                           :kiosk => true)) %>
+        (<%= kiosk_ready_url(:urlpassword => "open." + @election.id.to_s, :kiosk => true) %>)
   <% end %>
 </ul>
 <% end -%>