X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/adfcf4dd7d989d0560e2a8f6a590dd10c5a49a08..15870a550ddd18192efc71c1355a238e7c7c53e8:/app/views/election/show.rhtml?ds=inline diff --git a/app/views/election/show.rhtml b/app/views/election/show.rhtml index 87529d1..39621bf 100644 --- a/app/views/election/show.rhtml +++ b/app/views/election/show.rhtml @@ -2,13 +2,25 @@ Election Overview - -<% if @election.active? %> +<% if @election.enddate < Time.now %> +
Election is finished. <%= link_to "View results", + :controller => 'voter', :action => 'index', + :election_id => @election.id %>.
+ +<% elsif (@election.active? && @election.early_results? ) %> +
You have decided that the results + should be viewable while the election is in progress. + <%if @election.voters.select {|v| v.vote.confirmed?}.empty? %> + However, no one has voted yet. + <% else %> + <%= link_to "View results", :controller => 'election', :action => 'results', + :id => @election.id %>. + <% end %> +
+<% elsif @election.active? %>
Vote is in currently in progress. Return to this page for results on <%= @election.enddate %>.
-<% elsif @election.done? %> -
Election is finished. <%= link_to "View results", - :action => 'results', :id => @election.id %>.
+ <% else %>

<%= link_to "Edit General Information", @@ -33,14 +45,39 @@

+<% if @election.active? and not @election.authenticated? %> +

Link to election:

+ +<% end -%>
Candidates @@ -132,8 +169,7 @@

To embed your election, copy and paste the following code into your homepage:

-
-
<%= h("") %>
-
+
<%= h("") %>
<% end %>