Major integration of Courtland's design into the QuickVotes.

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

diff --git a/app/views/quickvote/index.rhtml b/app/views/quickvote/index.rhtml
index eb378456c3def1c16b3ef2b2a4e85e5940755552..a96fc41c609633882b514fb39db8d5067b31f936 100644 (file)
--- a/app/views/quickvote/index.rhtml
+++ b/app/views/quickvote/index.rhtml
@@ -1,25 +1,18 @@
-<% %>
-
-<% if @voter.election.shortdesc %>
-  <h1><%= @voter.election.shortdesc %></h1>
-<% else %>
-  <h1>QuickVote</h1>
-<% end %>
-
-<% if @voter.election.longdesc %>
-  <p><strong>Description:</strong></p>
-  <blockquote><%= @voter.election.longdesc %></blockquote>
+<div id="page-title">
+       <span class="header">Quickvote</span>
+       <span class="subheader"><%=h @voter.election.description.capitalize %></span>
+</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>

-    <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 %>
 
   </ul>
 <% else %>
 


@@ -31,17 +24,18 @@ bottom</em>. When you are done, press confirm to record your vote.</p>
 <ol id="rankings-list">
   <% for ranking in @voter.vote.rankings %>
     <li class="moveable" id="ranking_<%= ranking.candidate.id %>">
 <ol id="rankings-list">
   <% for ranking in @voter.vote.rankings %>
     <li class="moveable" id="ranking_<%= ranking.candidate.id %>">

-      <%= ranking.candidate.name.capitalize %></li>
+      <%=h ranking.candidate.name.capitalize %></li>

   <% end %>
 </ol>
 </div>
 
   <% end %>
 </ol>
 </div>
 

-<div class="clearbox"></div>
+<div class="clear-div"></div>

 
 

-<%= button_to "Confirm Vote", quickaction_url( :action => 'confirm', :votename => @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 %>
 
 <%= sortable_element 'rankings-list',
     :url => { :action => "sort_candidates" , :id => @voter.vote.id },
     :complete => visual_effect(:highlight, 'rankings-list') %> 
 
 <% end %>

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