From c0ac8681c26789bd51ae4bdda307f6f36f4479a0 Mon Sep 17 00:00:00 2001 From: MoisesMachado Date: Fri, 14 Dec 2007 18:43:40 +0000 Subject: [PATCH] ActionItem135: fixed the login page --- app/controllers/public/account_controller.rb | 2 +- app/views/account/login.rhtml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/public/account_controller.rb b/app/controllers/public/account_controller.rb index 2d4dd2c..583f0e0 100644 --- a/app/controllers/public/account_controller.rb +++ b/app/controllers/public/account_controller.rb @@ -15,7 +15,7 @@ class AccountController < PublicController def login @user = User.new return unless request.post? - self.current_user = User.authenticate(params[:user][:login], params[:user][:password]) + self.current_user = User.authenticate(params[:login], params[:password]) if logged_in? if params[:remember_me] == "1" self.current_user.remember_me diff --git a/app/views/account/login.rhtml b/app/views/account/login.rhtml index a876918..54818d6 100644 --- a/app/views/account/login.rhtml +++ b/app/views/account/login.rhtml @@ -2,9 +2,9 @@ <% labelled_form_for :user, @user do |f| %> -<%= f.text_field :login %> +<%= display_form_field(_('Login'), text_field_tag(:login) ) %> -<%= f.password_field :password %> +<%= display_form_field(_('Password'), password_field_tag(:password) ) %> <%= display_submit_tag 'Log in' %> -- libgit2 0.21.2