Suppress description of voter-verifiability unless election is verifiable.

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

diff --git a/app/views/election/show.rhtml b/app/views/election/show.rhtml
index 5de6081b298b5d8c89fa0539c4360498d158ec19..39621bfbf329b1457a2752b7aa0dd7348be41177 100644 (file)
--- a/app/views/election/show.rhtml
+++ b/app/views/election/show.rhtml
@@ -8,13 +8,13 @@
        :election_id => @election.id %>.</div>
 
 <% elsif (@election.active? && @election.early_results? ) %>
        :election_id => @election.id %>.</div>
 
 <% elsif (@election.active? && @election.early_results? ) %>

-  <div id="status">The creator of this election has decided that the results
+  <div id="status">You have decided that the results

        should be viewable while the election is in progress.
        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 %>
        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 %>
   </div>
 <% elsif @election.active? %>
     <% end %>
   </div>
 <% elsif @election.active? %>


@@ -51,12 +51,32 @@
 <li>Elections <strong>will be</strong> embeddable.</li>
 <% end %>
 
 <li>Elections <strong>will be</strong> embeddable.</li>
 <% end %>
 

+<% if @election.kiosk %>
+<li>Selectricity's kiosk mode <strong>will be</strong> available.</li>
+<% end %>
+
+<% if @election.verifiable%>
+<li>Voters <strong>will be</strong> given tokens to verify their votes.</li>
+<% else %>
+<li>Elections <strong>will not be</strong> voter verifiable.</li>
+<% end %>
+

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

-<p><strong>Link</strong></p>
-<%= (link_to ("Go Vote!", 
-            :controller => 'voter', :action => 'index', :election_id => @election.id)).to_s %>
+<p><strong>Link to election:</strong></p>
+<ul>
+<li><%= (link_to ("Vote in election", 
+          :controller => 'voter', :action => 'index', :election_id => @election.id)).to_s %>
+     (<%= votepassword_url(:urlpassword => "open." + @election.id.to_s) %>)</li>
+
+<% if @election.kiosk %>
+<li><%= 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 %>
+</ul>

 <% end -%>
 
 <div class="normal-header">
 <% end -%>
 
 <div class="normal-header">