diff --git a/app/views/account/_login_form.rhtml b/app/views/account/_login_form.rhtml index 7234f5e..cd111f4 100644 --- a/app/views/account/_login_form.rhtml +++ b/app/views/account/_login_form.rhtml @@ -1,15 +1,12 @@ <% labelled_form_for :user, @user, - :url => { :controller => 'account', :action => (params[:enterprise_code] ? 'activate_enterprise' : 'login') }, - :html => { :help => _('If you are a registered user, enter your username and password to be authenticated.')+'
'+_('To join on this environment, click on "I want to be an user!".')+''+_('If you forgot your password, click on "I forgot my password!" link.') } do |f| %> + :url => { :controller => 'account', :action => (params[:enterprise_code] ? 'activate_enterprise' : 'login') } do |f| %> <%= f.text_field :login, :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_login', - :help => _('Here goes the nickname that you give on the registration.'), :onchange => 'this.value = convToValidLogin( this.value )' %> <%= f.password_field :password, - :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_password', - :help => _('your password is personal, protect it.') %> + :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_password' %> <% if params[:enterprise_code] %> <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %> diff --git a/app/views/account/_signup_form.rhtml b/app/views/account/_signup_form.rhtml index 7516353..65accb2 100644 --- a/app/views/account/_signup_form.rhtml +++ b/app/views/account/_signup_form.rhtml @@ -9,9 +9,7 @@ <% end %> <% end %> -<% labelled_form_for :user, @user, - :html => { :help=>_('Fill all these fields to join in this environment. If you forgot your password, do not create a new account, click on the "I forgot my password!" link. ;-)'), :id => 'profile-data' - } do |f| -%> +<% labelled_form_for :user, @user do |f| %> <%= icaptcha_field() %> <%= hidden_field_tag :invitation_code, @invitation_code %> diff --git a/app/views/account/forgot_password.rhtml b/app/views/account/forgot_password.rhtml index e020971..9faeac2 100644 --- a/app/views/account/forgot_password.rhtml +++ b/app/views/account/forgot_password.rhtml @@ -2,9 +2,7 @@ <%= error_messages_for :change_password %> -<% labelled_form_for :change_password, @change_password, - :url => { :action => 'forgot_password' }, - :html => { :help => _('To change your password, please fill the form on this screen using your username and your e-mail. You will receive a message at that e-mail address with a web address you can access to create a new password.') } do |f| %> +<% labelled_form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do |f| %> <%= f.text_field :login, :onchange => 'this.value = convToValidLogin( this.value )' %> diff --git a/app/views/account/login.rhtml b/app/views/account/login.rhtml index b3897bc..ac98f5a 100644 --- a/app/views/account/login.rhtml +++ b/app/views/account/login.rhtml @@ -5,9 +5,7 @@ <% @user ||= User.new %> <% is_thickbox ||= false %> -<% labelled_form_for :user, @user, - :url => login_url, - :html => { :help => _('If you are a registered user, enter your username and password to be authenticated.')+''+_('To join on this environment, click on "I want to be an user!".')+''+_('If you forgot your password, click on "I forgot my password!" link.') } do |f| %> +<% labelled_form_for :user, @user, :url => login_url do |f| %> <%= f.text_field :login, :id => 'main_user_login', :onchange => 'this.value = convToValidLogin( this.value )' %> -- libgit2 0.21.2