X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/01bd9222d9ddec98586fb7c30413ab298d07b8a7..269c76d5c3935d915a15dd8e9167321bdea5faf0:/app/views/election/show.rhtml
diff --git a/app/views/election/show.rhtml b/app/views/election/show.rhtml
index 5a46af9..6060fb1 100644
--- a/app/views/election/show.rhtml
+++ b/app/views/election/show.rhtml
@@ -3,12 +3,24 @@
-<% if @election.active? %>
+<% if @election.done? %>
+
Election is finished. <%= link_to "View results",
+ :action => 'detailed_results', :id => @election.id %>.
+
+<% elsif (@election.active? && @election.viewable?) %>
+ 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 %>.
+ <% 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",
@@ -41,7 +53,7 @@
-<% unless @election.authenticated -%>
+<% if @election.active? and not @election.authenticated? %>
Link
<%= (link_to ("Go Vote!",
:controller => 'voter', :action => 'index', :election_id => @election.id)).to_s %>