Merged from jdong; lots of escaping fixes

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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 22903d9fcb6b500b941c7c2ec20793e01a250c2c..1b994b0e16ebf84e29e1b7df89c1c9298cb81e44 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -7,7 +7,7 @@
 <h2>QuickVotes</h2>
 
 <p><em>QuickVotes</em> are like polls: unstructured, non-anonymous and
-without the complex features of <em>HyperChad</em>. They are the
+without the complex features of <em>Selectricity</em>. They are the
 quickest way to make a decision or to compare between voting
 methods.</p>
 
@@ -17,17 +17,17 @@ methods.</p>
 
 <ul>
 <% for quickvote in @quickvotes %>
-<li><%= link_to (quickvote.shortdesc || "Unnamed"), quickvote_url(:votename => quickvote.name) %></li>
+<li><%= link_to (h(quickvote.shortdesc) || "Unnamed"), quickvote_url(:ident => quickvote.name) %></li>
 <% end %>
 </ul>
 
-<h2>HyperChad <em>Anywhere</em></h2>
+<h2>Selectricity <em>Anywhere</em></h2>
 
-<p>You can also access HyperChad entirely over email or via SMS/text
-messages from your mobile phone using HyperChad anywhere. Email <%=
+<p>You can also access Selectricity entirely over email or via SMS/text
+messages from your mobile phone using Selectricity anywhere. Email <%=
 link_to "vote\@mako.cc", "mailto:vote@mako.cc" %> with <tt>help</tt> in
 the body for more information or read the <%= link_to "documentation
-online", "hyperchad-anywhere.html"%>.</p>
+online", "selectricity-anywhere.html"%>.</p>
 
 </td>
 
@@ -43,7 +43,7 @@ ongoing election, you can log in to vote using your token here.</p>
 <%= form_tag :controller => 'voter', :action => 'index' %>
 <%= text_field :vote, :password %>
 <%= submit_tag "Log In" %>
-<%= end_form_tag %>
+
 
 <p><%= link_to 'Lost or forgot your token?', :controller => 'voter', :action => 'forgot_password' %></p>
 <% if session[:user] %>