X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/6b988cf46f0efdcad41e51c425e4ea2d462f5425..e6fe35a13a73266debac4ce0cc42121b6845ab83:/app/views/election/show.rhtml diff --git a/app/views/election/show.rhtml b/app/views/election/show.rhtml index 5de6081..39621bf 100644 --- a/app/views/election/show.rhtml +++ b/app/views/election/show.rhtml @@ -8,13 +8,13 @@ :election_id => @election.id %>. <% elsif (@election.active? && @election.early_results? ) %> -
The creator of this election has decided that the 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", :controller => 'voter', :action => 'results', - :id => "open" %>. + <%= link_to "View results", :controller => 'election', :action => 'results', + :id => @election.id %>. <% end %>
<% elsif @election.active? %> @@ -51,12 +51,32 @@
  • 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:

    + <% end -%>