Commit b1107c11 authored by PaytonBurdette's avatar PaytonBurdette Committed by Andrew Fontaine

Migrate account limits checkboxes

Migrate the checkboxes to use
gitlab ui styles.

Changelog: changed
parent f659545e
= form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-account-settings'), html: { class: 'fieldset-form', id: 'account-settings' } do |f| = gitlab_ui_form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-account-settings'), html: { class: 'fieldset-form', id: 'account-settings' } do |f|
= form_errors(@application_setting) = form_errors(@application_setting)
%fieldset %fieldset
.form-group .form-group
.form-check .form-check
= f.check_box :gravatar_enabled, class: 'form-check-input' = f.gitlab_ui_checkbox_component :gravatar_enabled, _('Gravatar enabled')
= f.label :gravatar_enabled, class: 'form-check-label' do
= _('Gravatar enabled')
.form-group .form-group
= f.label :default_projects_limit, _('Default projects limit'), class: 'label-bold' = f.label :default_projects_limit, _('Default projects limit'), class: 'label-bold'
...@@ -39,15 +37,11 @@ ...@@ -39,15 +37,11 @@
.form-group .form-group
= f.label :user_oauth_applications, _('User OAuth applications'), class: 'label-bold' = f.label :user_oauth_applications, _('User OAuth applications'), class: 'label-bold'
.form-check .form-check
= f.check_box :user_oauth_applications, class: 'form-check-input' = f.gitlab_ui_checkbox_component :user_oauth_applications, _('Allow users to register any application to use GitLab as an OAuth provider')
= f.label :user_oauth_applications, class: 'form-check-label' do
= _('Allow users to register any application to use GitLab as an OAuth provider')
.form-group .form-group
= f.label :user_default_external, _('New users set to external'), class: 'label-bold' = f.label :user_default_external, _('New users set to external'), class: 'label-bold'
.form-check .form-check
= f.check_box :user_default_external, class: 'form-check-input' = f.gitlab_ui_checkbox_component :user_default_external, _('Newly-registered users are external by default')
= f.label :user_default_external, class: 'form-check-label' do
= _('Newly-registered users are external by default')
.gl-mt-3 .gl-mt-3
= _('Internal users') = _('Internal users')
= f.text_field :user_default_internal_regex, placeholder: _('Regex pattern'), class: 'form-control gl-form-input gl-mt-2' = f.text_field :user_default_internal_regex, placeholder: _('Regex pattern'), class: 'form-control gl-form-input gl-mt-2'
...@@ -58,21 +52,16 @@ ...@@ -58,21 +52,16 @@
.form-group .form-group
= f.label :deactivate_dormant_users, _('Dormant users'), class: 'label-bold' = f.label :deactivate_dormant_users, _('Dormant users'), class: 'label-bold'
.form-check .form-check
= f.check_box :deactivate_dormant_users, class: 'form-check-input' - dormant_users_help_link = help_page_path('user/admin_area/moderate_users', anchor: 'automatically-deactivate-dormant-users')
= f.label :deactivate_dormant_users, class: 'form-check-label' do - dormant_users_help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: dormant_users_help_link }
= _('Deactivate dormant users after 90 days of inactivity') = f.gitlab_ui_checkbox_component :deactivate_dormant_users, _('Deactivate dormant users after 90 days of inactivity'), help_text: _('Users can reactivate their account by signing in. %{link_start}Learn more%{link_end}').html_safe % { link_start: dormant_users_help_link_start, link_end: '</a>'.html_safe }
.help-block
= _('Users can reactivate their account by signing in.')
= link_to _('Learn more'), help_page_path('user/admin_area/moderate_users', anchor: 'automatically-deactivate-dormant-users'), target: '_blank', rel: 'noopener noreferrer'
.form-group .form-group
= f.label :personal_access_token_prefix, _('Personal Access Token prefix'), class: 'label-light' = f.label :personal_access_token_prefix, _('Personal Access Token prefix'), class: 'label-light'
= f.text_field :personal_access_token_prefix, placeholder: _('Maximum 20 characters'), class: 'form-control gl-form-input' = f.text_field :personal_access_token_prefix, placeholder: _('Maximum 20 characters'), class: 'form-control gl-form-input'
.form-group .form-group
= f.label :user_show_add_ssh_key_message, _('Prompt users to upload SSH keys'), class: 'label-bold' = f.label :user_show_add_ssh_key_message, _('Prompt users to upload SSH keys'), class: 'label-bold'
.form-check .form-check
= f.check_box :user_show_add_ssh_key_message, class: 'form-check-input' = f.gitlab_ui_checkbox_component :user_show_add_ssh_key_message, _("Inform users without uploaded SSH keys that they can't push over SSH until one is added")
= f.label :user_show_add_ssh_key_message, class: 'form-check-label' do
= _("Inform users without uploaded SSH keys that they can't push over SSH until one is added")
= render_if_exists 'admin/application_settings/updating_name_disabled_for_users', form: f = render_if_exists 'admin/application_settings/updating_name_disabled_for_users', form: f
= render_if_exists 'admin/application_settings/availability_on_namespace_setting', form: f = render_if_exists 'admin/application_settings/availability_on_namespace_setting', form: f
......
...@@ -4,6 +4,4 @@ ...@@ -4,6 +4,4 @@
.form-group .form-group
.form-check .form-check
= form.check_box :enforce_pat_expiration, class: 'form-check-input' = form.gitlab_ui_checkbox_component :enforce_pat_expiration, _('Enforce personal access token expiration')
= form.label :enforce_pat_expiration, class: 'form-check-label' do
= _('Enforce personal access token expiration')
...@@ -4,6 +4,4 @@ ...@@ -4,6 +4,4 @@
.form-group .form-group
.form-check .form-check
= form.check_box :enforce_ssh_key_expiration, class: 'form-check-input' = form.gitlab_ui_checkbox_component :enforce_ssh_key_expiration, _('Enforce SSH key expiration')
= form.label :enforce_ssh_key_expiration, class: 'form-check-label' do
= _('Enforce SSH key expiration')
...@@ -5,6 +5,4 @@ ...@@ -5,6 +5,4 @@
.form-group .form-group
= form.label :updating_name_disabled_for_users, _('User restrictions'), class: 'label-bold' = form.label :updating_name_disabled_for_users, _('User restrictions'), class: 'label-bold'
.form-check .form-check
= form.check_box :updating_name_disabled_for_users, class: 'form-check-input' = form.gitlab_ui_checkbox_component :updating_name_disabled_for_users, _("Prevent users from changing their profile name")
= form.label :updating_name_disabled_for_users, class: 'form-check-label' do
= _("Prevent users from changing their profile name")
...@@ -41248,7 +41248,7 @@ msgstr "" ...@@ -41248,7 +41248,7 @@ msgstr ""
msgid "Users can launch a development environment from a GitLab browser tab when the %{linkStart}Gitpod%{linkEnd} integration is enabled." msgid "Users can launch a development environment from a GitLab browser tab when the %{linkStart}Gitpod%{linkEnd} integration is enabled."
msgstr "" msgstr ""
msgid "Users can reactivate their account by signing in." msgid "Users can reactivate their account by signing in. %{link_start}Learn more%{link_end}"
msgstr "" msgstr ""
msgid "Users can render diagrams in AsciiDoc, Markdown, reStructuredText, and Textile documents using Kroki." msgid "Users can render diagrams in AsciiDoc, Markdown, reStructuredText, and Textile documents using Kroki."
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment