diff options
Diffstat (limited to 'app/views/admin/users')
| -rw-r--r-- | app/views/admin/users/_admin_notes.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/users/_head.html.haml | 14 | ||||
| -rw-r--r-- | app/views/admin/users/_user.html.haml | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/app/views/admin/users/_admin_notes.html.haml b/app/views/admin/users/_admin_notes.html.haml index a20b2fbffc4..7c3220e2cee 100644 --- a/app/views/admin/users/_admin_notes.html.haml +++ b/app/views/admin/users/_admin_notes.html.haml @@ -2,6 +2,6 @@ %legend= _('Admin notes') .form-group.row .col-sm-2.col-form-label - = f.label :note, s_('AdminNote|Note') + = f.label :note, s_('Admin|Note') .col-sm-10 = f.text_area :note, class: 'form-control gl-form-input gl-form-textarea' diff --git a/app/views/admin/users/_head.html.haml b/app/views/admin/users/_head.html.haml index 8a4a1a54c58..ade3581e5b9 100644 --- a/app/views/admin/users/_head.html.haml +++ b/app/views/admin/users/_head.html.haml @@ -20,20 +20,20 @@ .float-right - if impersonation_enabled? && @user != current_user && @user.can?(:log_in) - = link_to 'Impersonate', impersonate_admin_user_path(@user), method: :post, class: "btn btn-info gl-button btn-grouped", data: { qa_selector: 'impersonate_user_link' } + = link_to _('Impersonate'), impersonate_admin_user_path(@user), method: :post, class: "btn btn-info gl-button btn-grouped", data: { qa_selector: 'impersonate_user_link' } = link_to edit_admin_user_path(@user), class: "btn btn-default gl-button btn-grouped" do - = sprite_icon('pencil-square', css_class: 'gl-icon') + = sprite_icon('pencil-square', css_class: 'gl-icon gl-button-icon') = _('Edit') %hr %ul.nav-links.nav.nav-tabs = nav_link(path: 'users#show') do - = link_to "Account", admin_user_path(@user) + = link_to _("Account"), admin_user_path(@user) = nav_link(path: 'users#projects') do - = link_to "Groups and projects", projects_admin_user_path(@user) + = link_to _("Groups and projects"), projects_admin_user_path(@user) = nav_link(path: 'users#keys') do - = link_to "SSH keys", keys_admin_user_path(@user) + = link_to _("SSH keys"), keys_admin_user_path(@user) = nav_link(controller: :identities) do - = link_to "Identities", admin_user_identities_path(@user) + = link_to _("Identities"), admin_user_identities_path(@user) = nav_link(controller: :impersonation_tokens) do - = link_to "Impersonation Tokens", admin_user_impersonation_tokens_path(@user) + = link_to _("Impersonation Tokens"), admin_user_impersonation_tokens_path(@user) .gl-mb-3 diff --git a/app/views/admin/users/_user.html.haml b/app/views/admin/users/_user.html.haml index 224a3cea28d..f2920579057 100644 --- a/app/views/admin/users/_user.html.haml +++ b/app/views/admin/users/_user.html.haml @@ -39,18 +39,18 @@ = link_to s_('AdminUsers|Approve'), approve_admin_user_path(user), method: :put = link_to s_('AdminUsers|Reject'), reject_admin_user_path(user), method: :delete - else - %button.btn.btn-default-tertiary.js-confirm-modal-button{ data: user_unblock_data(user) } + %button.gl-button.btn.btn-default-tertiary.js-confirm-modal-button{ data: user_unblock_data(user) } = s_('AdminUsers|Unblock') - else - %button.btn.btn-default-tertiary.js-confirm-modal-button{ data: user_block_data(user, user_block_effects) } + %button.gl-button.btn.btn-default-tertiary.js-confirm-modal-button{ data: user_block_data(user, user_block_effects) } = s_('AdminUsers|Block') - if user.can_be_deactivated? %li - %button.btn.btn-default-tertiary.js-confirm-modal-button{ data: user_deactivation_data(user, user_deactivation_effects) } + %button.gl-button.btn.btn-default-tertiary.js-confirm-modal-button{ data: user_deactivation_data(user, user_deactivation_effects) } = s_('AdminUsers|Deactivate') - elsif user.deactivated? %li - %button.btn.btn-default-tertiary.js-confirm-modal-button{ data: user_activation_data(user) } + %button.gl-button.btn.btn-default-tertiary.js-confirm-modal-button{ data: user_activation_data(user) } = s_('AdminUsers|Activate') - if user.access_locked? %li @@ -59,13 +59,13 @@ %li.divider - if user.can_be_removed? %li - %button.js-delete-user-modal-button.btn.btn-default-tertiary.text-danger{ data: { 'gl-modal-action': 'delete', + %button.js-delete-user-modal-button.gl-button.btn.btn-danger-tertiary{ data: { 'gl-modal-action': 'delete', delete_user_url: admin_user_path(user), block_user_url: block_admin_user_path(user), username: sanitize_name(user.name) } } = s_('AdminUsers|Delete user') %li - %button.js-delete-user-modal-button.btn.btn-default-tertiary.text-danger{ data: { 'gl-modal-action': 'delete-with-contributions', + %button.js-delete-user-modal-button.gl-button.btn.btn-danger-tertiary{ data: { 'gl-modal-action': 'delete-with-contributions', delete_user_url: admin_user_path(user, hard_delete: true), block_user_url: block_admin_user_path(user), username: sanitize_name(user.name) } } |