diff options
Diffstat (limited to 'app/views/admin/application_settings/_signin.html.haml')
| -rw-r--r-- | app/views/admin/application_settings/_signin.html.haml | 47 |
1 files changed, 26 insertions, 21 deletions
diff --git a/app/views/admin/application_settings/_signin.html.haml b/app/views/admin/application_settings/_signin.html.haml index 12a9f949750..156e7d3fb76 100644 --- a/app/views/admin/application_settings/_signin.html.haml +++ b/app/views/admin/application_settings/_signin.html.haml @@ -6,22 +6,22 @@ .form-check = f.check_box :password_authentication_enabled_for_web, class: 'form-check-input' = f.label :password_authentication_enabled_for_web, class: 'form-check-label' do - = _('Password authentication enabled for web interface') + = _('Allow password authentication for the web interface') .form-text.text-muted - = _('When disabled, an external authentication provider must be used.') + = _('When inactive, an external authentication provider must be used.') .form-group .form-check = f.check_box :password_authentication_enabled_for_git, class: 'form-check-input' = f.label :password_authentication_enabled_for_git, class: 'form-check-label' do - = _('Password authentication enabled for Git over HTTP(S)') + = _('Allow password authentication for Git over HTTP(S)') .form-text.text-muted - When disabled, a Personal Access Token + When inactive, a Personal Access Token - if Gitlab::Auth::Ldap::Config.enabled? or LDAP password must be used to authenticate. - if omniauth_enabled? && button_based_providers.any? %fieldset.form-group - %legend.gl-font-base.gl-mb-3.gl-border-none.gl-font-weight-bold= _('Enabled OAuth sign-in sources') + %legend.gl-font-base.gl-mb-3.gl-border-none.gl-font-weight-bold= _('Enabled OAuth authentication sources') = hidden_field_tag 'application_setting[enabled_oauth_sign_in_sources][]' - oauth_providers_checkboxes.each do |source| = source @@ -30,39 +30,44 @@ .form-check = f.check_box :require_two_factor_authentication, class: 'form-check-input' = f.label :require_two_factor_authentication, class: 'form-check-label' do - = _('Require all users to set up two-factor authentication') + = _('Enforce two-factor authentication') + %p.form-text.text-muted + = _('Enforce two-factor authentication for all user sign-ins.') + = link_to _('Learn more.'), help_page_path('security/two_factor_authentication.md'), target: '_blank', rel: 'noopener noreferrer' + .form-group + = f.label :two_factor_authentication, _('Two-factor grace period'), class: 'label-bold' + = f.number_field :two_factor_grace_period, min: 0, class: 'form-control gl-form-input', placeholder: '0' + .form-text.text-muted + = _('Maximum time that users are allowed to skip the setup of two-factor authentication (in hours). Set to 0 (zero) to enforce at next sign in.') .form-group = f.label :admin_mode, _('Admin Mode'), class: 'label-bold' = sprite_icon('lock', css_class: 'gl-icon') .form-check = f.check_box :admin_mode, class: 'form-check-input' = f.label :admin_mode, class: 'form-check-label' do - = _('Require additional authentication for administrative tasks') - .form-text.text-muted - = link_to _('Learn more.'), help_page_path('user/admin_area/settings/sign_in_restrictions', anchor: 'admin-mode') + = _('Enable admin mode') + %p.form-text.text-muted + = _('Require additional authentication for administrative tasks.') + = link_to _('Learn more.'), help_page_path('user/admin_area/settings/sign_in_restrictions', anchor: 'admin-mode'), target: '_blank', rel: 'noopener noreferrer' .form-group = f.label :unknown_sign_in, _('Email notification for unknown sign-ins'), class: 'label-bold' .form-check = f.check_box :notify_on_unknown_sign_in, class: 'form-check-input' = f.label :notify_on_unknown_sign_in, class: 'form-check-label' do - = _('Notify users by email when sign-in location is not recognized') - = link_to sprite_icon('question-o'), - 'https://docs.gitlab.com/ee/user/profile/unknown_sign_in_notification.html', - target: '_blank' - .form-group - = f.label :two_factor_authentication, _('Two-factor grace period (hours)'), class: 'label-bold' - = f.number_field :two_factor_grace_period, min: 0, class: 'form-control gl-form-input', placeholder: '0' - .form-text.text-muted= _('Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication') + = _('Enable email notification') + %p.form-text.text-muted + = _('Notify users by email when sign-in location is not recognized.') + = link_to _('Learn more.'), help_page_path('user/profile/unknown_sign_in_notification.md'), target: '_blank', rel: 'noopener noreferrer' .form-group = f.label :home_page_url, _('Home page URL'), class: 'label-bold' = f.text_field :home_page_url, class: 'form-control gl-form-input', placeholder: 'http://company.example.com', :'aria-describedby' => 'home_help_block' - %span.form-text.text-muted#home_help_block= _("We will redirect non-logged in users to this page") + %span.form-text.text-muted#home_help_block= _("Direct non-authenticated users to this page.") .form-group - = f.label :after_sign_out_path, _('After sign-out path'), class: 'label-bold' + = f.label :after_sign_out_path, _('Sign-out page URL'), class: 'label-bold' = f.text_field :after_sign_out_path, class: 'form-control gl-form-input', placeholder: 'http://company.example.com', :'aria-describedby' => 'after_sign_out_path_help_block' - %span.form-text.text-muted#after_sign_out_path_help_block= _("We will redirect users to this page after they sign out") + %span.form-text.text-muted#home_help_block= _("Direct users to this page after they sign out.") .form-group = f.label :sign_in_text, _('Sign-in text'), class: 'label-bold' = f.text_area :sign_in_text, class: 'form-control gl-form-input', rows: 4 - .form-text.text-muted Markdown enabled + %span.form-text.text-muted#home_help_block= _("Add text to the sign-in page. Markdown enabled.") = f.submit _('Save changes'), class: "gl-button btn btn-confirm" |