diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-18 13:50:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-18 13:50:51 +0300 |
commit | db384e6b19af03b4c3c82a5760d83a3fd79f7982 (patch) | |
tree | 34beaef37df5f47ccbcf5729d7583aae093cffa0 /app/views/admin/users/_form.html.haml | |
parent | 54fd7b1bad233e3944434da91d257fa7f63c3996 (diff) |
Add latest changes from gitlab-org/gitlab@16-3-stable-eev16.3.0-rc42
Diffstat (limited to 'app/views/admin/users/_form.html.haml')
-rw-r--r-- | app/views/admin/users/_form.html.haml | 112 |
1 files changed, 56 insertions, 56 deletions
diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml index 8822d52c3c0..ffe7e128d60 100644 --- a/app/views/admin/users/_form.html.haml +++ b/app/views/admin/users/_form.html.haml @@ -2,42 +2,42 @@ = gitlab_ui_form_for [:admin, @user], html: { class: 'fieldset-form' } do |f| = form_errors(@user) - .gl-border-b.gl-pb-3.gl-mb-6 - .row - .col-lg-4 - %h4.gl-mt-0 + .settings-section + .settings-sticky-header + .settings-sticky-header-inner + %h4.gl-my-0 = _('Account') - .col-lg-8 - .form-group.gl-form-group{ role: 'group' } - = f.label :name, _('Name'), class: 'gl-display-block col-form-label' - = f.text_field :name, required: true, autocomplete: 'off', class: 'form-control gl-form-input' - - .form-group.gl-form-group{ role: 'group' } - = f.label :username, _('Username'), class: 'gl-display-block col-form-label' - = f.text_field :username, required: true, autocomplete: 'off', autocorrect: 'off', autocapitalize: 'off', spellcheck: false, class: 'form-control gl-form-input' - - .form-group.gl-form-group{ role: 'group' } - = f.label :email, _('Email'), class: 'gl-display-block col-form-label' - = f.text_field :email, required: true, autocomplete: 'off', class: 'form-control gl-form-input' - - .gl-border-b.gl-pb-3.gl-mb-6 - .row - .col-lg-4 - %h4.gl-mt-0 + + .form-group.gl-form-group{ role: 'group' } + = f.label :name, _('Name'), class: 'gl-display-block col-form-label' + = f.text_field :name, required: true, autocomplete: 'off', class: 'form-control gl-form-input gl-form-input-lg' + + .form-group.gl-form-group{ role: 'group' } + = f.label :username, _('Username'), class: 'gl-display-block col-form-label' + = f.text_field :username, required: true, autocomplete: 'off', autocorrect: 'off', autocapitalize: 'off', spellcheck: false, class: 'form-control gl-form-input gl-form-input-lg' + + .form-group.gl-form-group{ role: 'group' } + = f.label :email, _('Email'), class: 'gl-display-block col-form-label' + = f.text_field :email, required: true, autocomplete: 'off', class: 'form-control gl-form-input gl-form-input-lg' + + .settings-section + .settings-sticky-header + .settings-sticky-header-inner + %h4.gl-my-0 = _('Password') - .col-lg-8 - - if @user.new_record? - = render Pajamas::AlertComponent.new(variant: :info, dismissible: false, alert_options: { class: 'gl-mb-5' }) do |c| - - c.with_body do - = s_('AdminUsers|Reset link will be generated and sent to the user. User will be forced to set the password on first sign in.') - - else - .form-group.gl-form-group{ role: 'group' } - = f.label :password, _('Password'), class: 'gl-display-block col-form-label' - = f.password_field :password, disabled: f.object.force_random_password, autocomplete: 'new-password', class: 'form-control gl-form-input js-password-complexity-validation' - = render_if_exists 'shared/password_requirements_list' - .form-group.gl-form-group{ role: 'group' } - = f.label :password_confirmation, _('Password confirmation'), class: 'gl-display-block col-form-label' - = f.password_field :password_confirmation, disabled: f.object.force_random_password, autocomplete: 'new-password', class: 'form-control gl-form-input' + + - if @user.new_record? + = render Pajamas::AlertComponent.new(variant: :info, dismissible: false, alert_options: { class: 'gl-mb-5' }) do |c| + - c.with_body do + = s_('AdminUsers|Reset link will be generated and sent to the user. User will be forced to set the password on first sign in.') + - else + .form-group.gl-form-group{ role: 'group' } + = f.label :password, _('Password'), class: 'gl-display-block col-form-label' + = f.password_field :password, disabled: f.object.force_random_password, autocomplete: 'new-password', class: 'form-control gl-form-input js-password-complexity-validation gl-form-input-lg' + = render_if_exists 'shared/password_requirements_list' + .form-group.gl-form-group{ role: 'group' } + = f.label :password_confirmation, _('Password confirmation'), class: 'gl-display-block col-form-label' + = f.password_field :password_confirmation, disabled: f.object.force_random_password, autocomplete: 'new-password', class: 'form-control gl-form-input gl-form-input-lg' = render partial: 'access_levels', locals: { f: f } @@ -45,42 +45,42 @@ = render_if_exists 'admin/users/limits', f: f - .gl-border-b.gl-pb-6.gl-mb-6 - .row - .col-lg-4 + .settings-section + .settings-sticky-header + .settings-sticky-header-inner %h4.gl-mt-0 = _('Profile') - .col-lg-8 - .form-group.gl-form-group{ role: 'group' } - = f.label :avatar, s_('AdminUsers|Avatar'), class: 'gl-display-block col-form-label' - = f.file_field :avatar - .form-group.gl-form-group{ role: 'group' } - = f.label :skype, s_('AdminUsers|Skype'), class: 'gl-display-block col-form-label' - = f.text_field :skype, class: 'form-control gl-form-input' + .form-group.gl-form-group{ role: 'group' } + = f.label :avatar, s_('AdminUsers|Avatar'), class: 'gl-display-block col-form-label gl-form-input-lg' + = f.file_field :avatar + + .form-group.gl-form-group{ role: 'group' } + = f.label :skype, s_('AdminUsers|Skype'), class: 'gl-display-block col-form-label' + = f.text_field :skype, class: 'form-control gl-form-input gl-form-input-lg' - .form-group.gl-form-group{ role: 'group' } - = f.label :linkedin, s_('AdminUsers|Linkedin'), class: 'gl-display-block col-form-label' - = f.text_field :linkedin, class: 'form-control gl-form-input' + .form-group.gl-form-group{ role: 'group' } + = f.label :linkedin, s_('AdminUsers|Linkedin'), class: 'gl-display-block col-form-label' + = f.text_field :linkedin, class: 'form-control gl-form-input gl-form-input-lg' - .form-group.gl-form-group{ role: 'group' } - = f.label :twitter, _('Twitter'), class: 'gl-display-block col-form-label' - = f.text_field :twitter, class: 'form-control gl-form-input' + .form-group.gl-form-group{ role: 'group' } + = f.label :twitter, _('Twitter'), class: 'gl-display-block col-form-label' + = f.text_field :twitter, class: 'form-control gl-form-input gl-form-input-lg' - .form-group.gl-form-group{ role: 'group' } - = f.label :website_url, s_('AdminUsers|Website URL'), class: 'gl-display-block col-form-label' - = f.text_field :website_url, class: 'form-control gl-form-input' + .form-group.gl-form-group{ role: 'group' } + = f.label :website_url, s_('AdminUsers|Website URL'), class: 'gl-display-block col-form-label' + = f.text_field :website_url, class: 'form-control gl-form-input gl-form-input-lg' = render_if_exists 'admin/users/custom_attributes', f: f = render 'admin/users/admin_notes', f: f - %div + .settings-sticky-footer - if @user.new_record? - = f.submit _('Create user'), pajamas_button: true + = f.submit _('Create user'), pajamas_button: true, class: 'gl-mr-3' = render Pajamas::ButtonComponent.new(href: admin_users_path) do = _('Cancel') - else - = f.submit _('Save changes'), pajamas_button: true + = f.submit _('Save changes'), pajamas_button: true, class: 'gl-mr-3' = render Pajamas::ButtonComponent.new(href: admin_user_path(@user)) do = _('Cancel') |