diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-05-16 12:13:56 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-05-16 12:13:56 +0000 |
| commit | 025a1cad02fda8fb13e3a016da09311d499f64d0 (patch) | |
| tree | 955d3623c95f8ea3be57997f804e0d9e7dae7eff | |
| parent | bcc5135ba5c48130fc8afce035726057d0445e5b (diff) | |
| download | gitlab-ce-025a1cad02fda8fb13e3a016da09311d499f64d0.tar.gz | |
Resolve ""Username or email" label on login form does not point to its corresponding input field"
| -rw-r--r-- | app/views/devise/passwords/edit.html.haml | 4 | ||||
| -rw-r--r-- | app/views/devise/sessions/_new_base.html.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/devise/passwords/edit.html.haml b/app/views/devise/passwords/edit.html.haml index 5e189e6dc54..eb0e6701627 100644 --- a/app/views/devise/passwords/edit.html.haml +++ b/app/views/devise/passwords/edit.html.haml @@ -6,10 +6,10 @@ = devise_error_messages! = f.hidden_field :reset_password_token .form-group - = f.label 'New password', for: :password + = f.label 'New password', for: "user_password" = f.password_field :password, class: "form-control top", required: true, title: 'This field is required' .form-group - = f.label 'Confirm new password', for: :password_confirmation + = f.label 'Confirm new password', for: "user_password_confirmation" = f.password_field :password_confirmation, class: "form-control bottom", title: 'This field is required', required: true .clearfix = f.submit "Change your password", class: "btn btn-primary" diff --git a/app/views/devise/sessions/_new_base.html.haml b/app/views/devise/sessions/_new_base.html.haml index 21c751a23f8..4095f30c369 100644 --- a/app/views/devise/sessions/_new_base.html.haml +++ b/app/views/devise/sessions/_new_base.html.haml @@ -1,6 +1,6 @@ = form_for(resource, as: resource_name, url: session_path(resource_name), html: { class: 'new_user gl-show-field-errors', 'aria-live' => 'assertive'}) do |f| .form-group - = f.label "Username or email", for: :login + = f.label "Username or email", for: "user_login" = f.text_field :login, class: "form-control top", autofocus: "autofocus", autocapitalize: "off", autocorrect: "off", required: true, title: "This field is required." .form-group = f.label :password |