-<% -%>
- <%= start_form_tag :controller => 'user', :action => 'login' %>
- <table>
- <%= form_input :text_field, "Login ID", "login", :size => 30 %>
- <%= form_input :password_field, "Password", "password", :size => 30 %>
- </table>
+<% form_tag :controller => 'account', :action => 'login' do %>
- <div class="button-bar">
- <p><%= submit_tag 'Login' %></p>
-<!-- <p><%= link_to 'Register for an account', :controller =>
-'user', :action => 'signup' %></p> -->
- <p><%= link_to 'Lost or forgot your password?', :controller => 'user', :action => 'forgot_password' %></p>
+ <p><label for="login">Login</label></p>
+ <p><%= text_field_tag 'login' %></p>
+ <p><label for="password">Password</label></p>
+ <p><%= password_field_tag 'password' %></p>
- <p>Unfortunately, Selectricity is currently being tested and new
- accounts for full votes (i.e., non-<em>QuickVotes</em>) can not
- be automatically created. If you are interested in using
- Selectricity to
- run an organizational election, contact <a
- href="http://mako.cc/contact.html">Benjamin Mako Hill</a>.</p>
+ <p><%= submit_tag 'Log in' %></p>
+<% end %>
- </div>
- <%= end_form_tag %>
+<p><%= link_to 'Register for an account', :controller => 'account', :action => 'signup' %></p>
+
+<p><%= link_to 'Lost or forgot your password?', :controller => 'account', :action => 'forgot_password' %></p>