Download as
Browse Code »

Commit a36dc5908da4ba7c4447228f8358824b5d019f99

Authored by Rodrigo Souto
Committed by Antonio Terceiro
1 parent 2421a751
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

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
  Diff comments   View file @a36dc59
1 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 4 <%= f.text_field :login,
6 5 :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_login',
7   - :help => _('Here goes the nickname that you give on the registration.'),
8 6 :onchange => 'this.value = convToValidLogin( this.value )' %>
9 7  
10 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 11 <% if params[:enterprise_code] %>
15 12 <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
... ...
app/views/account/_signup_form.rhtml
  Diff comments   View file @a36dc59
... ... @@ -9,9 +9,7 @@
9 9 <% end %>
10 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 13 <%= icaptcha_field() %>
16 14  
17 15 <%= hidden_field_tag :invitation_code, @invitation_code %>
... ...
app/views/account/forgot_password.rhtml
  Diff comments   View file @a36dc59
... ... @@ -2,9 +2,7 @@
2 2  
3 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 7 <%= f.text_field :login,
10 8 :onchange => 'this.value = convToValidLogin( this.value )' %>
... ...
app/views/account/login.rhtml
  Diff comments   View file @a36dc59
... ... @@ -5,9 +5,7 @@
5 5 <% @user ||= User.new %>
6 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 10 <%= f.text_field :login, :id => 'main_user_login', :onchange => 'this.value = convToValidLogin( this.value )' %>
13 11  
... ...