Merge head

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

diff --git a/app/views/quickvote/index.rhtml b/app/views/quickvote/index.rhtml
index bb0b5a4705623d91e2cc7a5bb29ab4d771c07831..e7cac3d88f13de8d89892e233a4de5e192f7522e 100644 (file)
--- a/app/views/quickvote/index.rhtml
+++ b/app/views/quickvote/index.rhtml
@@ -17,14 +17,14 @@
   <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 %>
 
 <p>Drag and drop the items on the following list until they are in order
-<em>from most preferred at the top to least preferred at the
+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">
@@ -38,7 +38,7 @@ bottom</em>. When you are done, press confirm to record your vote.</p>
 
 <div class="clearbox"></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 },