Commit a36dc5908da4ba7c4447228f8358824b5d019f99
Committed by
Antonio Terceiro
Antonio Terceiro
1 parent
2421a751
Exists in
master
and in
29 other branches
Substituting 'helps' -> More unnecessary stuff
* This patch includes another unnecessary stuff just discovered unnecessary.
Showing
4 changed files
with
5 additions
and
14 deletions
Show diff stats
app/views/account/_login_form.rhtml
| 1 | <% labelled_form_for :user, @user, | 1 | <% labelled_form_for :user, @user, |
| 2 | - :url => { :controller => 'account', :action => (params[:enterprise_code] ? 'activate_enterprise' : 'login') }, | ||
| 3 | - :html => { :help => _('If you are a registered user, enter your username and password to be authenticated.')+'<p/>'+_('To join on this environment, click on "<b>I want to be an user!</b>".')+'<p/>'+_('If you forgot your password, click on "<b>I forgot my password!</b>" link.') } do |f| %> | 2 | + :url => { :controller => 'account', :action => (params[:enterprise_code] ? 'activate_enterprise' : 'login') } do |f| %> |
| 4 | 3 | ||
| 5 | <%= f.text_field :login, | 4 | <%= f.text_field :login, |
| 6 | :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_login', | 5 | :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_login', |
| 7 | - :help => _('Here goes the nickname that you give on the registration.'), | ||
| 8 | :onchange => 'this.value = convToValidLogin( this.value )' %> | 6 | :onchange => 'this.value = convToValidLogin( this.value )' %> |
| 9 | 7 | ||
| 10 | <%= f.password_field :password, | 8 | <%= f.password_field :password, |
| 11 | - :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_password', | ||
| 12 | - :help => _('your password is personal, protect it.') %> | 9 | + :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_password' %> |
| 13 | 10 | ||
| 14 | <% if params[:enterprise_code] %> | 11 | <% if params[:enterprise_code] %> |
| 15 | <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %> | 12 | <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %> |
app/views/account/_signup_form.rhtml
| @@ -9,9 +9,7 @@ | @@ -9,9 +9,7 @@ | ||
| 9 | <% end %> | 9 | <% end %> |
| 10 | <% end %> | 10 | <% end %> |
| 11 | 11 | ||
| 12 | -<% labelled_form_for :user, @user, | ||
| 13 | - :html => { :help=>_('Fill all these fields to join in this environment. <p/> If you forgot your password, do not create a new account, click on the "<b>I forgot my password!</b>" link. ;-)'), :id => 'profile-data' | ||
| 14 | - } do |f| -%> | 12 | +<% labelled_form_for :user, @user do |f| %> |
| 15 | <%= icaptcha_field() %> | 13 | <%= icaptcha_field() %> |
| 16 | 14 | ||
| 17 | <%= hidden_field_tag :invitation_code, @invitation_code %> | 15 | <%= hidden_field_tag :invitation_code, @invitation_code %> |
app/views/account/forgot_password.rhtml
| @@ -2,9 +2,7 @@ | @@ -2,9 +2,7 @@ | ||
| 2 | 2 | ||
| 3 | <%= error_messages_for :change_password %> | 3 | <%= error_messages_for :change_password %> |
| 4 | 4 | ||
| 5 | -<% labelled_form_for :change_password, @change_password, | ||
| 6 | - :url => { :action => 'forgot_password' }, | ||
| 7 | - :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| %> | 5 | +<% labelled_form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do |f| %> |
| 8 | 6 | ||
| 9 | <%= f.text_field :login, | 7 | <%= f.text_field :login, |
| 10 | :onchange => 'this.value = convToValidLogin( this.value )' %> | 8 | :onchange => 'this.value = convToValidLogin( this.value )' %> |
app/views/account/login.rhtml
| @@ -5,9 +5,7 @@ | @@ -5,9 +5,7 @@ | ||
| 5 | <% @user ||= User.new %> | 5 | <% @user ||= User.new %> |
| 6 | <% is_thickbox ||= false %> | 6 | <% is_thickbox ||= false %> |
| 7 | 7 | ||
| 8 | -<% labelled_form_for :user, @user, | ||
| 9 | - :url => login_url, | ||
| 10 | - :html => { :help => _('If you are a registered user, enter your username and password to be authenticated.')+'<p/>'+_('To join on this environment, click on "<b>I want to be an user!</b>".')+'<p/>'+_('If you forgot your password, click on "<b>I forgot my password!</b>" link.') } do |f| %> | 8 | +<% labelled_form_for :user, @user, :url => login_url do |f| %> |
| 11 | 9 | ||
| 12 | <%= f.text_field :login, :id => 'main_user_login', :onchange => 'this.value = convToValidLogin( this.value )' %> | 10 | <%= f.text_field :login, :id => 'main_user_login', :onchange => 'this.value = convToValidLogin( this.value )' %> |
| 13 | 11 |