Add nil-guards to the graphs

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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index b005cb5ccd109facebb79bf52beb65542eefc7ec..0d59849a6997d2c621454e2491cca25284e3ed82 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -6,13 +6,34 @@
 
 <h2>QuickVotes</h2>
 
-<p><em>QuickVotes</em> are unstructured votes, more like polls, without
-the voter verifiability, anonymity, and other more complex features of
-HyperChad. They are the quickest way to make a decision using a variety
-of preferential and non-preficial election methods, or to compare
-between methods.</p>
+<p><em>QuickVotes</em> are like polls: unstructured, non-anonymous and
+without the complex features of <em>Selectricity</em>. They are the
+quickest way to make a decision or to compare between voting
+methods.</p>
 
-<p><%= link_to "Create QuickVote.", :controller => 'quickvote', :action => 'create' %></p>
+<p><%= link_to "Create a QuickVote", :controller => 'quickvote', :action => 'create' %></p>
+
+<p>Recent <em>QuickVotes</em> include:</p>
+
+<ul>
+<% for quickvote in @quickvotes %>
+<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>
 
@@ -22,20 +43,14 @@ 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 %>
-  <h2>Election Administrators</h2>
-  <p>You must have an account to start a new election or to administer an
+  <h2>Vote Administrators</h2>
+  <p>You must have an account to start a new vote or to administer an
   existing vote. You can log in or create a new account below.</p>
 
   <%= render_partial 'basic_login' %>