Mostly worked on the candidate adding feature to include pictures and

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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index bd30dfe21f51bc1865b9f9dbcb4f613f1d11ea75..2e4240e2c3e80a3396336329f65d38e41515515d 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -5,20 +5,30 @@
 <td width="47%" valign="top">
 <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>
-<%= render :controller => 'user', :action => 'login' %>
-hi!
+
+<% 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
+  existing vote. You can log in or create a new account below.</p>
+
+  <%= render_partial 'basic_login' %>
+<% end %>
 </td>
 </tr>
 </table>