A few major changes:

[selectricity] / app / views / election / show.rhtml

diff --git a/app/views/election/show.rhtml b/app/views/election/show.rhtml
index 954e480e4b9b2ac1c35340d135805483f5beb29e..90c93eacad2082a19f0a50280667f31eb4e54083 100644 (file)
--- a/app/views/election/show.rhtml
+++ b/app/views/election/show.rhtml
@@ -1,18 +1,67 @@
 <% %>
 <h1>Information On <%= @election.name %></h1>
 
-<h2>Overview <%= link_to "edit", :action => 'edit', :id => @election.id %></h2> 
-
+<h2>Election Overview</h2> 
+ 
 <p><strong>Description</strong></p>
 
 <blockquote>
-<%= @election.description %>
+<%= h(@election.description) %>
 </blockquote>
 
-<h2>Candidates <%= link_to "edit", :action => 'edit_candidates', :id => @election.id %></h2> 
+<p><strong>Election End Date</strong></p>
+
+<blockquote>
+<%= @election.enddate %>
+</blockquote>
+
+<p><%= link_to "Edit election overview.", :action => 'edit', :id => @election.id %></p>
+
+<h2>Candidates</h2> 
+
+<% unless @election.candidates.empty? %>
+  <%= render :partial => 'candidate_list' %>
+  <p><%= link_to "Add, remove, or edit candidates.", :action => 'edit_candidates', :id => @election.id %></p>
+<% else %>
+  <p><em>There are currently no candidates registered for this election.
+  <%= link_to "Add some!", :action => 'edit_candidates', :id => @election.id %></em></p>
+
+<% end %>
+
+<h2>Voters</h2>
+
+<% unless @election.voters.empty? %>
+  <%= render :partial => 'voter_list' %>
+  <%= link_to "Add or remove voters.", :action => 'edit_voters', :id => @election.id %></em></p>
+<% else %>
+  <p><em>There are currently no voters registered for this election.
+  <%= link_to "Add some!", :action => 'edit_voters', :id => @election.id %></em></p>
+<% end %>
+
+<h2>Start Election</h2>
+
+<% if @election.start_blockers.length > 0 %>
+  <p>Your election cannot be started for the following reasons:</p>
+  <ul>
+  <% for reason in @election.start_blockers %>
+  <li><%= reason %></li>
+  <% end %>
+  </ul>
+<% else %>
+<p>Please check eveything carefully on this page before starting this
+election. Once you begin the election, you will <em>not</em> be able to
+add or change candidates, modify the voting lists, or change the
+election end time.</p>
+
+<p>When you begin the election, the following will happen:</p>
 
-<%= render :partial => 'candidate_list' %>
+<ul>
+  <li>The election will be "frozen" so that further edits to the
+      candidate list and voting list cannot occur.</li>
+  <li>All voters will be emailed notifying them that the election has
+      begun and of their unique login token.</li>
+</ul>
 
-<h2>Voters <%= link_to "edit", :action => 'edit_voters', :id => @election.id %></h2>
+<%= button_to 'Start Election!', :action => 'start_election', :id => @election.id %>
 
-<%= render :partial => 'voter_list' %>
+<% end %>