X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/cdcad04af50c8bb3dce636f097a099ed1da79735..99e1580f0d7707b8e2f8c08f8aae70c3d4906637:/app/views/election/show.rhtml?ds=sidebyside
diff --git a/app/views/election/show.rhtml b/app/views/election/show.rhtml
index 04c71a6..39621bf 100644
--- a/app/views/election/show.rhtml
+++ b/app/views/election/show.rhtml
@@ -2,18 +2,18 @@
-
-<% if @election.done? %>
+<% if @election.enddate < Time.now %>
Election is finished. <%= link_to "View results",
- :action => 'detailed_results', :id => @election.id %>.
+ :controller => 'voter', :action => 'index',
+ :election_id => @election.id %>.
-<% elsif (@election.active? && @election.viewable?) %>
- The creator of this election has decided that the results
+<% elsif (@election.active? && @election.early_results? ) %>
+
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", :action => 'detailed_results',
+ <%= link_to "View results", :controller => 'election', :action => 'results',
:id => @election.id %>.
<% end %>
@@ -45,18 +45,38 @@
- Elections will end at <%= @election.enddate
%>.
- Elections results <% if
@election.early_results %>will be<% else %>will not be<% end
-%> will be visible while election is in progress.
+%> visible while election is in progress.
<% if @election.embeddable %>
- Elections will be embeddable.
<% end %>
+<% if @election.kiosk %>
+- Selectricity's kiosk mode will be available.
+<% end %>
+
+<% if @election.verifiable%>
+- Voters will be given tokens to verify their votes.
+<% else %>
+- Elections will not be voter verifiable.
+<% end %>
+
<% if @election.active? and not @election.authenticated? %>
-
Link
-<%= (link_to ("Go Vote!",
- :controller => 'voter', :action => 'index', :election_id => @election.id)).to_s %>
+
Link to election:
+
+- <%= (link_to ("Vote in election",
+ :controller => 'voter', :action => 'index', :election_id => @election.id)).to_s %>
+ (<%= votepassword_url(:urlpassword => "open." + @election.id.to_s) %>)
+
+<% if @election.kiosk %>
+- <%= 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 %>
+
<% end -%>