merge everything back from mainline branch

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

diff --git a/app/views/election/show.rhtml b/app/views/election/show.rhtml
index 87529d18c1c41633fcff130b10e5b83c0b881534..5de6081b298b5d8c89fa0539c4360498d158ec19 100644 (file)
--- a/app/views/election/show.rhtml
+++ b/app/views/election/show.rhtml
@@ -2,13 +2,25 @@
   <span class="header">Election Overview</span>
   <span class="subheader"></span>
 </div>
   <span class="header">Election Overview</span>
   <span class="subheader"></span>
 </div>

-
-<% if @election.active? %>
+<% if @election.enddate < Time.now %>
+<div id="status">Election is finished. <%= link_to "View results",
+       :controller => 'voter', :action => 'index', 
+       :election_id => @election.id %>.</div>
+
+<% elsif (@election.active? && @election.early_results? ) %>
+  <div id="status">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", :controller => 'voter', :action => 'results', 
+               :id => "open" %>.
+    <% end %>
+  </div>
+<% elsif @election.active? %>

   <div id="status">Vote is in currently in progress. Return to
         this page for results on <%= @election.enddate %>.</div>
   <div id="status">Vote is in currently in progress. Return to
         this page for results on <%= @election.enddate %>.</div>

-<% elsif @election.done? %>
-  <div id="status">Election is finished. <%= link_to "View results",
-  :action => 'results', :id => @election.id %>.</div>
+  

 <% else %>
   <p style="text-align: right;">
     <%= link_to "Edit General Information",
 <% else %>
   <p style="text-align: right;">
     <%= link_to "Edit General Information",


@@ -33,7 +45,7 @@
 <ul> <li>Elections will end at <strong><%= @election.enddate
 %></strong>.</li> <li>Elections results <strong><% if
 @election.early_results %>will be<% else %>will not be<% end
 <ul> <li>Elections will end at <strong><%= @election.enddate
 %></strong>.</li> <li>Elections results <strong><% if
 @election.early_results %>will be<% else %>will not be<% end

-%></strong> will be visible while election is in progress.</li>
+%></strong> visible while election is in progress.</li>

 
 <% if @election.embeddable %>
 <li>Elections <strong>will be</strong> embeddable.</li>
 
 <% if @election.embeddable %>
 <li>Elections <strong>will be</strong> embeddable.</li>


@@ -41,6 +53,11 @@
 
 </ul>
 
 
 </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 %>
+<% end -%>

 
 <div class="normal-header">
   <span class="header">Candidates</span>
 
 <div class="normal-header">
   <span class="header">Candidates</span>


@@ -132,8 +149,7 @@
 <p>To embed your election, copy and paste the following code into your
 homepage:</p>
 
 <p>To embed your election, copy and paste the following code into your
 homepage:</p>
 

-<blockquote>
-<tt><pre><%= h("<iframe src='") + votepassword_url(:urlpassword => "open." + @election.id.to_s) + h("'") + "<br />" + h(" width='330px' height='370px'></iframe>") %></pre></tt>
-</blockquote>
+<pre><%= h("<iframe src='") + votepassword_url(:urlpassword => "open." + @election.id.to_s, :embed => "true") + h("' width='330px' height='#{(@election.candidates.length+2)*53}px'>" ) %>
+<%= h("</iframe>") %></pre>

 
 <% end %>
 
 <% end %>