Merge head

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

diff --git a/app/views/quickvote/index.rhtml b/app/views/quickvote/index.rhtml
index a96fc41c609633882b514fb39db8d5067b31f936..d1018cf0a1da36563edf27d2f5fedf53b13bc06b 100644 (file)
--- a/app/views/quickvote/index.rhtml
+++ b/app/views/quickvote/index.rhtml
@@ -1,8 +1,10 @@
-<div id="page-title">
+<div id="title-header">
        <span class="header">Quickvote</span>
        <span class="subheader"><%=h @voter.election.description.capitalize %></span>
 </div>
 
+<div class="clear-div"></div>
+
 <div class="main-content">
 
 <% if @voter.voted? %>
@@ -20,22 +22,10 @@
 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="clear-div"></div>
+<%= render :partial => 'voter/sortable_vote' %>
 
 <%= 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 %>
 </div> <!-- end main-content -->