Merge from jdong; new webstats

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

diff --git a/app/views/quickvote/index.rhtml b/app/views/quickvote/index.rhtml
index bb0b5a4705623d91e2cc7a5bb29ab4d771c07831..1179b7cb894833f9f98d9f93da46958169d32428 100644 (file)
--- a/app/views/quickvote/index.rhtml
+++ b/app/views/quickvote/index.rhtml
@@ -1,14 +1,14 @@
 <% %>
 
 <% if @voter.election.shortdesc %>
-  <h1><%= @voter.election.shortdesc %></h1>
+  <h1><%=h @voter.election.shortdesc %></h1>
 <% else %>
   <h1>QuickVote</h1>
 <% end %>
 
 <% if @voter.election.longdesc %>
   <p><strong>Description:</strong></p>
-  <blockquote><%= @voter.election.longdesc %></blockquote>
+  <blockquote><%=h @voter.election.longdesc %></blockquote>
 
 <h2>Vote</h2>
 <% end %>
@@ -17,28 +17,28 @@
   <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">
 <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>
 
 <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 },