Merge jdong

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

diff --git a/app/views/quickvote/index.rhtml b/app/views/quickvote/index.rhtml
index 2c5bcd147067e28f9676a1c61041c380cb2f2117..1179b7cb894833f9f98d9f93da46958169d32428 100644 (file)
--- a/app/views/quickvote/index.rhtml
+++ b/app/views/quickvote/index.rhtml
@@ -1,18 +1,47 @@
 <% %>
-<h1>QuickVote: <em><%= @voter.election.name %></em></h1>
 
-<p><strong>Description:</strong></p>
-<blockquote><%= @voter.election.description %></blockquote>
+<% if @voter.election.shortdesc %>
+  <h1><%=h @voter.election.shortdesc %></h1>
+<% else %>
+  <h1>QuickVote</h1>
+<% end %>
+
+<% if @voter.election.longdesc %>
+  <p><strong>Description:</strong></p>
+  <blockquote><%=h @voter.election.longdesc %></blockquote>
 
-<h2>Vote in Election</h2>
-<% if @voter.session_id %>
+<h2>Vote</h2>
+<% end %>
+
+<% if @voter.voted? %>
   <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>
+
+<div id="sortable_list">
+<ol id="rankings-list">
+  <% for ranking in @voter.vote.rankings %>
+    <li class="moveable" id="ranking_<%= ranking.candidate.id %>">
+      <%=h ranking.candidate.name.capitalize %></li>
+  <% end %>
+</ol>
+</div>
+
+<div class="clearbox"></div>
+
+<%= button_to "Confirm Vote", quickaction_url( :action => 'confirm', :ident => @voter.election.name)  %>
+
+<%= sortable_element 'rankings-list',
+    :url => { :action => "sort_candidates" , :id => @voter.vote.id },
+    :complete => visual_effect(:highlight, 'rankings-list') %> 
+
 <% end %>