Merge from head

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

diff --git a/app/views/site/_basic_login.rhtml b/app/views/site/_basic_login.rhtml
index c9fa4dcecbf1d55d67a069384c02356d66ce0d9d..12a63dd9110b89c7c442310ea62c38ab884481b0 100644 (file)
--- a/app/views/site/_basic_login.rhtml
+++ b/app/views/site/_basic_login.rhtml
@@ -1,13 +1,13 @@
-<% -%>
-  <%= 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>
-
-    <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>
-    </div>
-  <%= end_form_tag %>
+<% form_tag :controller => 'account', :action => 'login'  do %>
+
+  <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><%= submit_tag 'Log in' %></p>
+<% end %>
+
+<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>