removed save line that was causing the new elections to fail

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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
old mode 100644 (file)
new mode 100755 (executable)
index 9fd332b..f2f5700
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -7,12 +7,34 @@
 <h2>QuickVotes</h2>
 
 <p><em>QuickVotes</em> are like polls: unstructured, non-anonymous and
 <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>
 
 <p><%= link_to "Create a QuickVote", :controller => 'quickvote', :action => 'create' %></p>
 
 quickest way to make a decision or to compare between voting
 methods.</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(:votename => 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
 <h2>Voters</h2>
 
 <p>If you have received an email with a token inviting you to vote in an


@@ -24,12 +46,6 @@ ongoing election, you can log in to vote using your token here.</p>
 <%= end_form_tag %>
 
 <p><%= link_to 'Lost or forgot your token?', :controller => 'voter', :action => 'forgot_password' %></p>
 <%= 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">
-

 <% if session[:user] %>
   <%= render_partial 'user_summary' %> 
 <% else %>
 <% if session[:user] %>
   <%= render_partial 'user_summary' %> 
 <% else %>