Merge from Justin

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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index e89063dc3331416a79749f44fcb583df4119df7c..0d59849a6997d2c621454e2491cca25284e3ed82 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,10 +17,24 @@ methods.</p>
 
 <ul>
 <% for quickvote in @quickvotes %>
-<li><%= link_to (quickvote.shortdesc || "Unnamed"), quickvote_url(:votename => quickvote.name) %></li>
+<li><%= link_to (quickvote.shortdesc || "Unnamed"), quickvote_url(:ident => quickvote.name) %></li>
 <% end %>
 </ul>
 
+<h2>Selectricity <em>Anywhere</em></h2>
+
+<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", "selectricity-anywhere.html"%>.</p>
+
+</td>
+
+<td width="6%"></td>
+
+<td width="47%" valign="top">
+
 <h2>Voters</h2>
 
 <p>If you have received an email with a token inviting you to vote in an
@@ -29,15 +43,9 @@ 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>
-</td>
-
-<td width="6%"></td>
-
-<td width="47%" valign="top">
 
+<p><%= link_to 'Lost or forgot your token?', :controller => 'voter', :action => 'forgot_password' %></p>
 <% if session[:user] %>
   <%= render_partial 'user_summary' %> 
 <% else %>