File upload system for custom skins almost complete.

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

diff --git a/app/views/quickvote/index.rhtml b/app/views/quickvote/index.rhtml
index 1179b7cb894833f9f98d9f93da46958169d32428..320d85fbf830c7a95dafc3615343b2841d9e517d 100644 (file)
--- a/app/views/quickvote/index.rhtml
+++ b/app/views/quickvote/index.rhtml
@@ -1,19 +1,14 @@
-<% %>
-
-<% if @voter.election.shortdesc %>
-  <h1><%=h @voter.election.shortdesc %></h1>
-<% else %>
-  <h1>QuickVote</h1>
-<% end %>
+<div id="title-header">
+  <span class="header">Quickvote</span>
+  <span class="subheader"><%=h @voter.election.description.capitalize %></span>
+</div>

 
 

-<% if @voter.election.longdesc %>
-  <p><strong>Description:</strong></p>
-  <blockquote><%=h @voter.election.longdesc %></blockquote>
+<div class="clear-div"></div>

 
 

-<h2>Vote</h2>
-<% end %>
+<div class="main-content">

 
 <% if @voter.voted? %>
 
 <% if @voter.voted? %>

+

   <p>You have already voted. You can:</p>
   
   <ul>
   <p>You have already voted. You can:</p>
   
   <ul>


@@ -27,21 +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>
 
 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>
+<%= render :partial => 'common/sortable_vote' %>

 
 <%= button_to "Confirm Vote", quickaction_url( :action => 'confirm', :ident => @voter.election.name)  %>
 
 
 <%= 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 %>
 
 <% end %>

+</div> <!-- end main-content -->