Remove useless puts calls; fix gmap api key for selectricity.org

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

diff --git a/app/views/quickvote/index.rhtml b/app/views/quickvote/index.rhtml
index 2c5bcd147067e28f9676a1c61041c380cb2f2117..856d74e154e3d2b0cd1bdca6159738e40dc8fdaf 100644 (file)
--- a/app/views/quickvote/index.rhtml
+++ b/app/views/quickvote/index.rhtml
@@ -1,18 +1,29 @@
-<% %>
-<h1>QuickVote: <em><%= @voter.election.name %></em></h1>
+<div id="title-header">
+       <span class="header">Quickvote</span>
+       <span class="subheader"><%=h @voter.election.description.capitalize %></span>
+</div>
 
-<p><strong>Description:</strong></p>
-<blockquote><%= @voter.election.description %></blockquote>
+<div class="main-content">
+
+<% if @voter.voted? %>
 
-<h2>Vote in Election</h2>
-<% 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 -->