X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/cdcad04af50c8bb3dce636f097a099ed1da79735..6aacfa3b17f012fbdaa191a89af9fc51d7250d79:/app/views/election/show.rhtml?ds=sidebyside

diff --git a/app/views/election/show.rhtml b/app/views/election/show.rhtml
index 04c71a6..2f62895 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? %>
@@ -45,18 +45,38 @@
 <ul> <li>Elections will end at <strong><%= @election.enddate
 %></strong>.</li> <li>Elections results <strong><% if
 @election.early_results %>will be<% else %>will not be<% end
-%></strong> will be visible while election is in progress.</li>
+%></strong> visible while election is in progress.</li>
 
 <% if @election.embeddable %>
 <li>Elections <strong>will be</strong> embeddable.</li>
 <% end %>
 
+<% if @election.kiosk %>
+<li>Selectricity's kiosk mode <strong>will be</strong> available.</li>
+<% end %>
+
+<% if @election.verifiable%>
+<li>Voters <strong>will be</strong> given tokens to verify their votes.</li>
+<% else %>
+<li>Elections <strong>will not be</strong> voter verifiable.</li>
+<% end %>
+
 </ul>
 
 <% if @election.active? and not @election.authenticated? %>
-<p><strong>Link</strong></p>
-<%= (link_to ("Go Vote!", 
-            :controller => 'voter', :action => 'index', :election_id => @election.id)).to_s %>
+<p><strong>Link to election:</strong></p>
+<ul>
+<li><%= (link_to ("Vote in election", 
+          :controller => 'voter', :action => 'index', :election_id => @election.id)).to_s %>
+     (<%= votepassword_url(:urlpassword => "open." + @election.id.to_s) %>)</li>
+
+<% if @election.kiosk %>
+<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 -%>
 
 <div class="normal-header">