Commit 9113ba83 authored by Sam Beckham's avatar Sam Beckham Committed by Illya Klymov

Upgrades buttons in app/views/[opqr]

Where [opqr] is regex for all the folders in that directory starting
with that letter. This upgrades the buttons in those directories to use
the newer gitlab ui classes

Note, this excludes the larger `app/views/projects` directory
parent 181e2e7d
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
%p %p
#{_('Status')}: #{current_user.two_factor_enabled? ? _('Enabled') : _('Disabled')} #{_('Status')}: #{current_user.two_factor_enabled? ? _('Enabled') : _('Disabled')}
- if current_user.two_factor_enabled? - if current_user.two_factor_enabled?
= link_to _('Manage two-factor authentication'), profile_two_factor_auth_path, class: 'btn btn-info' = link_to _('Manage two-factor authentication'), profile_two_factor_auth_path, class: 'gl-button btn btn-info'
- else - else
.gl-mb-3 .gl-mb-3
= link_to _('Enable two-factor authentication'), profile_two_factor_auth_path, class: 'btn btn-success', data: { qa_selector: 'enable_2fa_button' } = link_to _('Enable two-factor authentication'), profile_two_factor_auth_path, class: 'gl-button btn btn-success', data: { qa_selector: 'enable_2fa_button' }
%hr %hr
- if display_providers_on_profile? - if display_providers_on_profile?
......
...@@ -30,6 +30,6 @@ ...@@ -30,6 +30,6 @@
= link_to(revoke_session_path(active_session), = link_to(revoke_session_path(active_session),
{ data: { confirm: _('Are you sure? The device will be signed out of GitLab and all remember me tokens revoked.') }, { data: { confirm: _('Are you sure? The device will be signed out of GitLab and all remember me tokens revoked.') },
method: :delete, method: :delete,
class: "btn btn-danger gl-ml-3" }) do class: "gl-button btn btn-danger gl-ml-3" }) do
%span.sr-only= _('Revoke') %span.sr-only= _('Revoke')
= _('Revoke') = _('Revoke')
...@@ -24,4 +24,4 @@ ...@@ -24,4 +24,4 @@
= _('Never') = _('Never')
%td %td
= link_to _('Remove'), profile_chat_name_path(chat_name), method: :delete, class: 'btn btn-danger float-right', data: { confirm: _('Are you sure you want to revoke this nickname?') } = link_to _('Remove'), profile_chat_name_path(chat_name), method: :delete, class: 'gl-button btn btn-danger float-right', data: { confirm: _('Are you sure you want to revoke this nickname?') }
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
.actions .actions
= form_tag profile_chat_names_path, method: :post do = form_tag profile_chat_names_path, method: :post do
= hidden_field_tag :token, @chat_name_token.token = hidden_field_tag :token, @chat_name_token.token
= submit_tag _("Authorize"), class: "btn btn-success wide float-left" = submit_tag _("Authorize"), class: "gl-button btn btn-success wide float-left"
= form_tag deny_profile_chat_names_path, method: :delete do = form_tag deny_profile_chat_names_path, method: :delete do
= hidden_field_tag :token, @chat_name_token.token = hidden_field_tag :token, @chat_name_token.token
= submit_tag _("Deny"), class: "btn btn-danger gl-ml-3" = submit_tag _("Deny"), class: "gl-button btn btn-danger gl-ml-3"
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
= f.label :email, _('Email'), class: 'label-bold' = f.label :email, _('Email'), class: 'label-bold'
= f.text_field :email, class: 'form-control', data: { qa_selector: 'email_address_field' } = f.text_field :email, class: 'form-control', data: { qa_selector: 'email_address_field' }
.gl-mt-3 .gl-mt-3
= f.submit _('Add email address'), class: 'btn btn-success', data: { qa_selector: 'add_email_address_button' } = f.submit _('Add email address'), class: 'gl-button btn btn-success', data: { qa_selector: 'add_email_address_button' }
%hr %hr
%h4.gl-mt-0 %h4.gl-mt-0
= _('Linked emails (%{email_count})') % { email_count: @emails.load.size + 1 } = _('Linked emails (%{email_count})') % { email_count: @emails.load.size + 1 }
...@@ -56,8 +56,8 @@ ...@@ -56,8 +56,8 @@
%span.badge.badge-info= s_('Profiles|Notification email') %span.badge.badge-info= s_('Profiles|Notification email')
- unless email.confirmed? - unless email.confirmed?
- confirm_title = "#{email.confirmation_sent_at ? _('Resend confirmation email') : _('Send confirmation email')}" - confirm_title = "#{email.confirmation_sent_at ? _('Resend confirmation email') : _('Send confirmation email')}"
= link_to confirm_title, resend_confirmation_instructions_profile_email_path(email), method: :put, class: 'btn btn-sm btn-warning gl-ml-3' = link_to confirm_title, resend_confirmation_instructions_profile_email_path(email), method: :put, class: 'gl-button btn btn-sm btn-warning gl-ml-3'
= link_to profile_email_path(email), data: { confirm: _('Are you sure?'), qa_selector: 'delete_email_link'}, method: :delete, class: 'btn btn-sm btn-danger gl-ml-3' do = link_to profile_email_path(email), data: { confirm: _('Are you sure?'), qa_selector: 'delete_email_link'}, method: :delete, class: 'gl-button btn btn-sm btn-danger gl-ml-3' do
%span.sr-only= _('Remove') %span.sr-only= _('Remove')
= sprite_icon('remove') = sprite_icon('remove')
...@@ -7,4 +7,4 @@ ...@@ -7,4 +7,4 @@
= f.text_area :key, class: "form-control", rows: 8, required: true, placeholder: _("Don't paste the private part of the GPG key. Paste the public part which begins with '-----BEGIN PGP PUBLIC KEY BLOCK-----'.") = f.text_area :key, class: "form-control", rows: 8, required: true, placeholder: _("Don't paste the private part of the GPG key. Paste the public part which begins with '-----BEGIN PGP PUBLIC KEY BLOCK-----'.")
.gl-mt-3 .gl-mt-3
= f.submit s_('Profiles|Add key'), class: "btn btn-success" = f.submit s_('Profiles|Add key'), class: "gl-button btn btn-success"
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
.float-right .float-right
%span.key-created-at %span.key-created-at
= s_('Profiles|Created %{time_ago}'.html_safe) % { time_ago:time_ago_with_tooltip(key.created_at)} = s_('Profiles|Created %{time_ago}'.html_safe) % { time_ago:time_ago_with_tooltip(key.created_at)}
= link_to profile_gpg_key_path(key), data: { confirm: _('Are you sure? Removing this GPG key does not affect already signed commits.') }, method: :delete, class: "btn btn-danger gl-ml-3" do = link_to profile_gpg_key_path(key), data: { confirm: _('Are you sure? Removing this GPG key does not affect already signed commits.') }, method: :delete, class: "gl-button btn btn-danger gl-ml-3" do
%span.sr-only= _('Remove') %span.sr-only= _('Remove')
= sprite_icon('remove') = sprite_icon('remove')
= link_to revoke_profile_gpg_key_path(key), data: { confirm: _('Are you sure? All commits that were signed with this GPG key will be unverified.') }, method: :put, class: "btn btn-danger gl-ml-3" do = link_to revoke_profile_gpg_key_path(key), data: { confirm: _('Are you sure? All commits that were signed with this GPG key will be unverified.') }, method: :put, class: "gl-button btn btn-danger gl-ml-3" do
%span.sr-only= _('Revoke') %span.sr-only= _('Revoke')
= _('Revoke') = _('Revoke')
...@@ -24,4 +24,4 @@ ...@@ -24,4 +24,4 @@
%button.btn.btn-success.js-add-ssh-key-validation-confirm-submit= _("Yes, add it") %button.btn.btn-success.js-add-ssh-key-validation-confirm-submit= _("Yes, add it")
.gl-mt-3 .gl-mt-3
= f.submit s_('Profiles|Add key'), class: "btn btn-success js-add-ssh-key-validation-original-submit qa-add-key-button" = f.submit s_('Profiles|Add key'), class: "gl-button btn btn-success js-add-ssh-key-validation-original-submit qa-add-key-button"
...@@ -30,6 +30,6 @@ ...@@ -30,6 +30,6 @@
= f.label :password_confirmation, _('Password confirmation'), class: 'label-bold' = f.label :password_confirmation, _('Password confirmation'), class: 'label-bold'
= f.password_field :password_confirmation, required: true, class: 'form-control', data: { qa_selector: 'confirm_password_field' } = f.password_field :password_confirmation, required: true, class: 'form-control', data: { qa_selector: 'confirm_password_field' }
.gl-mt-3.gl-mb-3 .gl-mt-3.gl-mb-3
= f.submit _('Save password'), class: "btn btn-success gl-mr-3", data: { qa_selector: 'save_password_button' } = f.submit _('Save password'), class: "gl-button btn btn-success gl-mr-3", data: { qa_selector: 'save_password_button' }
- unless @user.password_automatically_set? - unless @user.password_automatically_set?
= link_to _('I forgot my password'), reset_profile_password_path, method: :put = link_to _('I forgot my password'), reset_profile_password_path, method: :put
...@@ -28,4 +28,4 @@ ...@@ -28,4 +28,4 @@
.col-sm-10 .col-sm-10
= f.password_field :password_confirmation, required: true, class: 'form-control' = f.password_field :password_confirmation, required: true, class: 'form-control'
.form-actions .form-actions
= f.submit _('Set new password'), class: 'btn btn-success' = f.submit _('Set new password'), class: 'gl-button btn btn-success'
...@@ -143,4 +143,4 @@ ...@@ -143,4 +143,4 @@
.col-lg-4.profile-settings-sidebar .col-lg-4.profile-settings-sidebar
.col-lg-8 .col-lg-8
.form-group .form-group
= f.submit _('Save changes'), class: 'btn btn-success' = f.submit _('Save changes'), class: 'gl-button btn btn-success'
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
.form-text.text-muted= s_("Profiles|The maximum file size allowed is 200KB.") .form-text.text-muted= s_("Profiles|The maximum file size allowed is 200KB.")
- if @user.avatar? - if @user.avatar?
%hr %hr
= link_to s_("Profiles|Remove avatar"), profile_avatar_path, data: { confirm: s_("Profiles|Avatar will be removed. Are you sure?") }, method: :delete, class: 'btn btn-danger btn-inverted' = link_to s_("Profiles|Remove avatar"), profile_avatar_path, data: { confirm: s_("Profiles|Avatar will be removed. Are you sure?") }, method: :delete, class: 'gl-button btn btn-danger btn-inverted'
%hr %hr
.row .row
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
.col-lg-8 .col-lg-8
= f.fields_for :status, @user.status do |status_form| = f.fields_for :status, @user.status do |status_form|
- emoji_button = button_tag type: :button, - emoji_button = button_tag type: :button,
class: 'js-toggle-emoji-menu emoji-menu-toggle-button btn has-tooltip', class: 'js-toggle-emoji-menu emoji-menu-toggle-button gl-button btn has-tooltip',
title: s_("Profiles|Add status emoji") do title: s_("Profiles|Add status emoji") do
- if @user.status - if @user.status
= emoji_icon @user.status.emoji = emoji_icon @user.status.emoji
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
= sprite_icon('smile', css_class: 'award-control-icon-super-positive') = sprite_icon('smile', css_class: 'award-control-icon-super-positive')
- reset_message_button = button_tag type: :button, - reset_message_button = button_tag type: :button,
id: 'js-clear-user-status-button', id: 'js-clear-user-status-button',
class: 'clear-user-status btn has-tooltip', class: 'clear-user-status gl-button btn has-tooltip',
title: s_("Profiles|Clear status") do title: s_("Profiles|Clear status") do
= sprite_icon("close") = sprite_icon("close")
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
-# TODO: might need an entry in user/profile.md to describe some of these settings -# TODO: might need an entry in user/profile.md to describe some of these settings
-# https://gitlab.com/gitlab-org/gitlab-foss/issues/60070 -# https://gitlab.com/gitlab-org/gitlab-foss/issues/60070
%h5= ("Time zone") %h5= ("Time zone")
= dropdown_tag(_("Select a timezone"), options: { toggle_class: 'btn js-timezone-dropdown input-lg', title: _("Select a timezone"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: timezone_data } } ) = dropdown_tag(_("Select a timezone"), options: { toggle_class: 'gl-button btn js-timezone-dropdown input-lg', title: _("Select a timezone"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: timezone_data } } )
%input.hidden{ :type => 'hidden', :id => 'user_timezone', :name => 'user[timezone]', value: @user.timezone } %input.hidden{ :type => 'hidden', :id => 'user_timezone', :name => 'user[timezone]', value: @user.timezone }
%hr %hr
...@@ -119,8 +119,8 @@ ...@@ -119,8 +119,8 @@
.help-block .help-block
= s_("Profiles|Choose to show contributions of private projects on your public profile without any project, repository or organization information") = s_("Profiles|Choose to show contributions of private projects on your public profile without any project, repository or organization information")
.gl-mt-3.gl-mb-3 .gl-mt-3.gl-mb-3
= f.submit s_("Profiles|Update profile settings"), class: 'btn btn-success' = f.submit s_("Profiles|Update profile settings"), class: 'gl-button btn btn-success'
= link_to _("Cancel"), user_path(current_user), class: 'btn btn-cancel' = link_to _("Cancel"), user_path(current_user), class: 'gl-button btn btn-cancel'
.modal.modal-profile-crop{ data: { cropper_css_path: ActionController::Base.helpers.stylesheet_path('lazy_bundles/cropper.css') } } .modal.modal-profile-crop{ data: { cropper_css_path: ActionController::Base.helpers.stylesheet_path('lazy_bundles/cropper.css') } }
.modal-dialog .modal-dialog
......
...@@ -9,5 +9,5 @@ ...@@ -9,5 +9,5 @@
%span.monospace{ data: { qa_selector: 'code_content' } }= code %span.monospace{ data: { qa_selector: 'code_content' } }= code
.d-flex .d-flex
= link_to _('Proceed'), profile_account_path, class: 'btn btn-success gl-mr-3', data: { qa_selector: 'proceed_button' } = link_to _('Proceed'), profile_account_path, class: 'gl-button btn btn-success gl-mr-3', data: { qa_selector: 'proceed_button' }
= link_to _('Download codes'), "data:text/plain;charset=utf-8,#{CGI.escape(@codes.join("\n"))}", download: "gitlab-recovery-codes.txt", class: 'btn btn-default' = link_to _('Download codes'), "data:text/plain;charset=utf-8,#{CGI.escape(@codes.join("\n"))}", download: "gitlab-recovery-codes.txt", class: 'gl-button btn btn-default'
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
= link_to _('Disable two-factor authentication'), profile_two_factor_auth_path, = link_to _('Disable two-factor authentication'), profile_two_factor_auth_path,
method: :delete, method: :delete,
data: { confirm: webauthn_enabled ? _('Are you sure? This will invalidate your registered applications and U2F / WebAuthn devices.') : _('Are you sure? This will invalidate your registered applications and U2F devices.') }, data: { confirm: webauthn_enabled ? _('Are you sure? This will invalidate your registered applications and U2F / WebAuthn devices.') : _('Are you sure? This will invalidate your registered applications and U2F devices.') },
class: 'btn btn-danger gl-mr-3' class: 'gl-button btn btn-danger gl-mr-3'
= form_tag codes_profile_two_factor_auth_path, {style: 'display: inline-block', method: :post} do |f| = form_tag codes_profile_two_factor_auth_path, {style: 'display: inline-block', method: :post} do |f|
= submit_tag _('Regenerate recovery codes'), class: 'btn' = submit_tag _('Regenerate recovery codes'), class: 'btn'
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
= label_tag :pin_code, _('Pin code'), class: "label-bold" = label_tag :pin_code, _('Pin code'), class: "label-bold"
= text_field_tag :pin_code, nil, class: "form-control", required: true, data: { qa_selector: 'pin_code_field' } = text_field_tag :pin_code, nil, class: "form-control", required: true, data: { qa_selector: 'pin_code_field' }
.gl-mt-3 .gl-mt-3
= submit_tag _('Register with two-factor app'), class: 'btn btn-success', data: { qa_selector: 'register_2fa_app_button' } = submit_tag _('Register with two-factor app'), class: 'gl-button btn btn-success', data: { qa_selector: 'register_2fa_app_button' }
%hr %hr
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
%span.gl-text-gray-500 %span.gl-text-gray-500
= _("no name set") = _("no name set")
%td= registration[:created_at].to_date.to_s(:medium) %td= registration[:created_at].to_date.to_s(:medium)
%td= link_to _('Delete'), registration[:delete_path], method: :delete, class: "btn btn-danger float-right", data: { confirm: _('Are you sure you want to delete this device? This action cannot be undone.') } %td= link_to _('Delete'), registration[:delete_path], method: :delete, class: "gl-button btn btn-danger float-right", data: { confirm: _('Are you sure you want to delete this device? This action cannot be undone.') }
- else - else
.settings-message.text-center .settings-message.text-center
......
...@@ -22,4 +22,4 @@ ...@@ -22,4 +22,4 @@
- if partial_exists? "registrations/welcome/button" - if partial_exists? "registrations/welcome/button"
= render "registrations/welcome/button" = render "registrations/welcome/button"
- else - else
= f.submit _('Get started!'), class: 'btn-register btn btn-block gl-mb-0 gl-p-3', data: { qa_selector: 'get_started_button' } = f.submit _('Get started!'), class: 'btn-register gl-button btn btn-block gl-mb-0 gl-p-3', data: { qa_selector: 'get_started_button' }
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