<table width="auto" padding="5px">
<tr>
<td width="47%" valign="top">
+
+<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
+quickest way to make a decision or to compare between voting
+methods.</p>
+
+<p><%= link_to "Create a QuickVote", :controller => 'quickvote', :action => 'create' %></p>
+
<h2>Voters</h2>
-<p>Please enter your password/token to log in and vote:</p>
+<p>If you have received an email with a token inviting you to vote in an
+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">
-<h2>Vote Administrators</h2>
+<% if session[:user] %>
+ <%= render_partial 'user_summary' %>
+<% else %>
+ <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' %>
+<% end %>
</td>
</tr>
</table>