Both quickvotes and full-size elections use the same partial in views/voter

[selectricity] / app / views / quickvote / index.rhtml

diff --git a/app/views/quickvote/index.rhtml b/app/views/quickvote/index.rhtml
index 84211ff77eb4c25e55bb324630769d57145f7b96..e13ea942a45a7e175e6b0120efc0bec7741d04f1 100644 (file)
--- a/app/views/quickvote/index.rhtml
+++ b/app/views/quickvote/index.rhtml
@@ -1,26 +1,29 @@
-<% %>
+<div id="page-title">
+       <span class="header">Quickvote</span>
+       <span class="subheader"><%=h @voter.election.description.capitalize %></span>
+</div>
 
-<% if @voter.election.shortdesc %>
-  <h1><%= @voter.election.shortdesc %></h1>
-<% else %>
-  <h1>QuickVote</h1>
-<% end %>
+<div class="main-content">
 
-<% if @voter.election.longdesc %>
-  <p><strong>Description:</strong></p>
-  <blockquote><%= @voter.election.longdesc %></blockquote>
+<% if @voter.voted? %>
 
-<h2>Vote</h2>
-<% end %>
-
-<% if @voter.session_id %>
   <p>You have already voted. You can:</p>
   
   <ul>
-    <li><%= link_to "Change your vote.", quickaction_url( :votename => @voter.election.name, :action => 'change' ) %></li>
+    <li><%= link_to "Change your vote.", quickaction_url( :ident => @voter.election.name, :action => 'change' ) %></li>
 
-    <li><%= link_to "View election results.", quickaction_url( :votename => @voter.election.name, :action => 'results' ) %></li>
+    <li><%= link_to "View election results.", quickaction_url( :ident => @voter.election.name, :action => 'results' ) %></li>
   </ul>
 <% else %>
-  <%= render_partial 'voter/vote' %>
+
+<p>Drag and drop the items on the following list until they are in order
+from <em>most preferred at the top</em> to <em>least preferred at the
+bottom</em>. When you are done, press confirm to record your vote.</p>
+
+<%= render :partial => 'voter/sortable_vote' %>
+
+<%= button_to "Confirm Vote", quickaction_url( :action => 'confirm', :ident => @voter.election.name)  %>
+
+
 <% end %>
+</div> <!-- end main-content -->