Merge 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 9c689fcb55f084236dedd595a2c7f95065a11fe5..12a63dd9110b89c7c442310ea62c38ab884481b0 100644 (file)
--- a/app/views/site/_basic_login.rhtml
+++ b/app/views/site/_basic_login.rhtml
@@ -1,11 +1,11 @@
 <% form_tag :controller => 'account', :action => 'login'  do %>
 
   <p><label for="login">Login</label></p>
 <% form_tag :controller => 'account', :action => 'login'  do %>
 
   <p><label for="login">Login</label></p>

-  <p><%= text_field "Login", "login", :size => 30 %></p>
+  <p><%= text_field_tag 'login' %></p>

   <p><label for="password">Password</label></p>
   <p><label for="password">Password</label></p>

-  <p><%= password_field "Password", "password", :size => 30 %></p>
+  <p><%= password_field_tag 'password' %></p>

 
 

-  <p><%= submit_tag 'Login' %></p>
+  <p><%= submit_tag 'Log in' %></p>

 <% end %>
 
 <p><%= link_to 'Register for an account', :controller => 'account', :action => 'signup' %></p>
 <% end %>
 
 <p><%= link_to 'Register for an account', :controller => 'account', :action => 'signup' %></p>