Skip to content
代码片段 群组 项目
提交 f0f64232 编辑于 作者: Andrew Fontaine's avatar Andrew Fontaine
浏览文件

Merge branch 'eduardosanz/vue-password-tests-2' into 'master'

No related branches found
No related tags found
无相关合并请求
= form_tag(admin_session_path, method: :post, class: 'new_user gl-show-field-errors', 'aria-live': 'assertive') do = gitlab_ui_form_for(:user, url: admin_session_path, html: { class: 'gl-p-5 gl-show-field-errors', aria: { live: 'assertive' } }) do |f|
.form-group .form-group
= label_tag :user_password, _('Password'), class: 'label-bold' = f.label :password, _('Password')
= password_field_tag 'user[password]', nil, { class: 'form-control js-password', data: { id: 'user_password', name: 'user[password]', qa_selector: 'password_field', testid: 'password-field' } } = f.password_field :password, class: 'form-control js-password', data: { id: 'user_password', name: 'user[password]', qa_selector: 'password_field', testid: 'password-field' }
.submit-container = render Pajamas::ButtonComponent.new(type: :submit, variant: :confirm, block: true, button_options: { data: { qa_selector: 'enter_admin_mode_button' } }) do
= submit_tag _('Enter admin mode'), class: 'gl-button btn btn-confirm', data: { qa_selector: 'enter_admin_mode_button' } = _('Enter admin mode')
...@@ -12,6 +12,6 @@ ...@@ -12,6 +12,6 @@
= render_if_exists 'devise/sessions/new_smartcard' = render_if_exists 'devise/sessions/new_smartcard'
- if allow_admin_mode_password_authentication_for_web? - if allow_admin_mode_password_authentication_for_web?
.login-box.tab-pane.gl-p-5{ id: 'login-pane', role: 'tabpanel', class: active_when(!any_form_based_providers_enabled?) } .login-box.tab-pane{ id: 'login-pane', role: 'tabpanel', class: active_when(!any_form_based_providers_enabled?) }
.login-body .login-body
= render 'admin/sessions/new_base' = render 'admin/sessions/new_base'
- page_title _('Enter admin mode') - page_title _('Enter admin mode')
- add_page_specific_style 'page_bundles/login' - add_page_specific_style 'page_bundles/login'
.row.justify-content-center .row.gl-mt-5.justify-content-center
.col-md-5.new-session-forms-container .col-md-5.new-session-forms-container
.login-page .login-page
#signin-container{ class: ('borderless' if Feature.enabled?(:restyle_login_page, @project)) } #signin-container{ class: ('borderless' if Feature.enabled?(:restyle_login_page, @project)) }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
= f.text_field :username, name: :username, autocomplete: :username, class: 'form-control gl-form-input', title: _('This field is required.'), autofocus: 'autofocus', required: true = f.text_field :username, name: :username, autocomplete: :username, class: 'form-control gl-form-input', title: _('This field is required.'), autofocus: 'autofocus', required: true
.form-group .form-group
= f.label :password, _('Password') = f.label :password, _('Password')
= f.text_field :vue_password_placeholder, class: 'form-control gl-form-input js-password', data: { id: "#{:crowd}_password", name: 'password' } %input.form-control.gl-form-input.js-password{ data: { id: 'crowd_password', name: 'password' } }
- if render_remember_me - if render_remember_me
= f.gitlab_ui_checkbox_component :remember_me, _('Remember me'), checkbox_options: { name: :remember_me, autocomplete: 'off' } = f.gitlab_ui_checkbox_component :remember_me, _('Remember me'), checkbox_options: { name: :remember_me, autocomplete: 'off' }
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
= f.text_field :username, name: :username, autocomplete: :username, class: 'form-control gl-form-input', title: _('This field is required.'), autofocus: 'autofocus', data: { qa_selector: 'username_field' }, required: true = f.text_field :username, name: :username, autocomplete: :username, class: 'form-control gl-form-input', title: _('This field is required.'), autofocus: 'autofocus', data: { qa_selector: 'username_field' }, required: true
.form-group .form-group
= f.label :password, _('Password') = f.label :password, _('Password')
= f.text_field :vue_password_placeholder, class: 'form-control gl-form-input js-password', data: { id: "#{provider}_password", name: 'password', qa_selector: 'password_field' } %input.form-control.gl-form-input.js-password{ data: { id: "#{provider}_password", name: 'password', qa_selector: 'password_field' } }
- if render_remember_me - if render_remember_me
= f.gitlab_ui_checkbox_component :remember_me, _('Remember me'), checkbox_options: { name: :remember_me, autocomplete: 'off' } = f.gitlab_ui_checkbox_component :remember_me, _('Remember me'), checkbox_options: { name: :remember_me, autocomplete: 'off' }
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册