Commit c0fdd5f9 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'admin-regex-button-update' into 'master'

Upgrades all the buttons in the admin dir

See merge request gitlab-org/gitlab!44991
parents e6ce06cf a20d522c
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
= link_to _('Remove user & report'), admin_abuse_report_path(abuse_report, remove_user: true), = link_to _('Remove user & report'), admin_abuse_report_path(abuse_report, remove_user: true),
data: { confirm: _("USER %{user} WILL BE REMOVED! Are you sure?") % { user: user.name } }, remote: true, method: :delete, class: "gl-button btn btn-sm btn-block btn-danger js-remove-tr" data: { confirm: _("USER %{user} WILL BE REMOVED! Are you sure?") % { user: user.name } }, remote: true, method: :delete, class: "gl-button btn btn-sm btn-block btn-danger js-remove-tr"
- if user && !user.blocked? - if user && !user.blocked?
= link_to _('Block user'), block_admin_user_path(user), data: {confirm: _('USER WILL BE BLOCKED! Are you sure?')}, method: :put, class: "btn btn-sm btn-block" = link_to _('Block user'), block_admin_user_path(user), data: {confirm: _('USER WILL BE BLOCKED! Are you sure?')}, method: :put, class: "gl-button btn btn-sm btn-block"
- else - else
.btn.btn-sm.disabled.btn-block .btn.btn-sm.disabled.btn-block
= _('Already blocked') = _('Already blocked')
= link_to _('Remove report'), [:admin, abuse_report], remote: true, method: :delete, class: "btn btn-sm btn-block btn-close js-remove-tr" = link_to _('Remove report'), [:admin, abuse_report], remote: true, method: :delete, class: "gl-button btn btn-sm btn-block btn-close js-remove-tr"
...@@ -40,5 +40,5 @@ ...@@ -40,5 +40,5 @@
= render 'shared/tokens/scopes_form', prefix: 'doorkeeper_application', token: application, scopes: @scopes = render 'shared/tokens/scopes_form', prefix: 'doorkeeper_application', token: application, scopes: @scopes
.form-actions .form-actions
= f.submit 'Submit', class: "btn btn-success wide" = f.submit 'Submit', class: "gl-button btn btn-success wide"
= link_to "Cancel", admin_applications_path, class: "btn btn-cancel" = link_to "Cancel", admin_applications_path, class: "gl-button btn btn-cancel"
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
%p.light %p.light
System OAuth applications don't belong to any user and can only be managed by admins System OAuth applications don't belong to any user and can only be managed by admins
%hr %hr
%p= link_to 'New application', new_admin_application_path, class: 'btn btn-success' %p= link_to 'New application', new_admin_application_path, class: 'gl-button btn btn-success'
%table.table %table.table
%thead %thead
%tr %tr
...@@ -23,6 +23,6 @@ ...@@ -23,6 +23,6 @@
%td= @application_counts[application.id].to_i %td= @application_counts[application.id].to_i
%td= application.trusted? ? 'Y': 'N' %td= application.trusted? ? 'Y': 'N'
%td= application.confidential? ? 'Y': 'N' %td= application.confidential? ? 'Y': 'N'
%td= link_to 'Edit', edit_admin_application_path(application), class: 'btn btn-link' %td= link_to 'Edit', edit_admin_application_path(application), class: 'gl-button btn btn-link'
%td= render 'delete_form', application: application %td= render 'delete_form', application: application
= paginate @applications, theme: 'gitlab' = paginate @applications, theme: 'gitlab'
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
.input-group .input-group
%input.label.label-monospace.monospace{ id: "application_id", type: "text", autocomplete: 'off', value: @application.uid, readonly: true } %input.label.label-monospace.monospace{ id: "application_id", type: "text", autocomplete: 'off', value: @application.uid, readonly: true }
.input-group-append .input-group-append
= clipboard_button(target: '#application_id', title: _("Copy ID"), class: "btn btn btn-default") = clipboard_button(target: '#application_id', title: _("Copy ID"), class: "gl-button btn btn-default")
%tr %tr
%td %td
= _('Secret') = _('Secret')
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
.input-group .input-group
%input.label.label-monospace.monospace{ id: "secret", type: "text", autocomplete: 'off', value: @application.secret, readonly: true } %input.label.label-monospace.monospace{ id: "secret", type: "text", autocomplete: 'off', value: @application.secret, readonly: true }
.input-group-append .input-group-append
= clipboard_button(target: '#secret', title: _("Copy secret"), class: "btn btn btn-default") = clipboard_button(target: '#secret', title: _("Copy secret"), class: "gl-button btn btn-default")
%tr %tr
%td %td
= _('Callback URL') = _('Callback URL')
...@@ -45,5 +45,5 @@ ...@@ -45,5 +45,5 @@
= render "shared/tokens/scopes_list", token: @application = render "shared/tokens/scopes_list", token: @application
.form-actions .form-actions
= link_to 'Edit', edit_admin_application_path(@application), class: 'btn btn-primary wide float-left' = link_to 'Edit', edit_admin_application_path(@application), class: 'gl-button btn btn-primary wide float-left'
= render 'delete_form', application: @application, submit_btn_css: 'btn btn-danger gl-ml-3' = render 'delete_form', application: @application, submit_btn_css: 'btn btn-danger gl-ml-3'
...@@ -29,10 +29,10 @@ ...@@ -29,10 +29,10 @@
.gl-alert-body .gl-alert-body
= render 'shared/group_tips' = render 'shared/group_tips'
.form-actions .form-actions
= f.submit _('Create group'), class: "btn btn-success" = f.submit _('Create group'), class: "gl-button btn btn-success"
= link_to _('Cancel'), admin_groups_path, class: "btn btn-cancel" = link_to _('Cancel'), admin_groups_path, class: "gl-button btn btn-cancel"
- else - else
.form-actions .form-actions
= f.submit _('Save changes'), class: "btn btn-success", data: { qa_selector: 'save_changes_button' } = f.submit _('Save changes'), class: "gl-button btn btn-success", data: { qa_selector: 'save_changes_button' }
= link_to _('Cancel'), admin_group_path(@group), class: "btn btn-cancel" = link_to _('Cancel'), admin_group_path(@group), class: "gl-button btn btn-cancel"
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
= search_field_tag :name, project_name, class: "form-control search-text-input js-search-input", autofocus: true, spellcheck: false, placeholder: 'Search by name', data: { qa_selector: 'group_search_field' } = search_field_tag :name, project_name, class: "form-control search-text-input js-search-input", autofocus: true, spellcheck: false, placeholder: 'Search by name', data: { qa_selector: 'group_search_field' }
= sprite_icon('search', css_class: 'search-icon') = sprite_icon('search', css_class: 'search-icon')
= render "shared/groups/dropdown", options_hash: admin_groups_sort_options_hash = render "shared/groups/dropdown", options_hash: admin_groups_sort_options_hash
= link_to new_admin_group_path, class: "btn btn-success" do = link_to new_admin_group_path, class: "gl-button btn btn-success" do
= _('New group') = _('New group')
%ul.content-list %ul.content-list
= render @groups = render @groups
......
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
.gl-mt-3 .gl-mt-3
= select_tag :access_level, options_for_select(@group.access_level_roles), class: "project-access-select select2" = select_tag :access_level, options_for_select(@group.access_level_roles), class: "project-access-select select2"
%hr %hr
= button_tag _('Add users to group'), class: "btn btn-success" = button_tag _('Add users to group'), class: "gl-button btn btn-success"
= render 'shared/members/requests', membership_source: @group, requesters: @requesters, force_mobile_view: true = render 'shared/members/requests', membership_source: @group, requesters: @requesters, force_mobile_view: true
.card .card
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
%code#health-check-token= Gitlab::CurrentSettings.health_check_access_token %code#health-check-token= Gitlab::CurrentSettings.health_check_access_token
.gl-mt-3 .gl-mt-3
= button_to _("Reset health check access token"), reset_health_check_token_admin_application_settings_path, = button_to _("Reset health check access token"), reset_health_check_token_admin_application_settings_path,
method: :put, class: 'btn btn-default', method: :put, class: 'gl-button btn btn-default',
data: { confirm: _('Are you sure you want to reset the health check token?') } data: { confirm: _('Are you sure you want to reset the health check token?') }
%p.light %p.light
#{ _('Health information can be retrieved from the following endpoints. More information is available') } #{ _('Health information can be retrieved from the following endpoints. More information is available') }
......
...@@ -14,5 +14,5 @@ ...@@ -14,5 +14,5 @@
= f.text_field :extern_uid, class: 'form-control', required: true = f.text_field :extern_uid, class: 'form-control', required: true
.form-actions .form-actions
= f.submit _('Save changes'), class: "btn btn-success" = f.submit _('Save changes'), class: "gl-button btn btn-success"
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
%td %td
= identity.extern_uid = identity.extern_uid
%td %td
= link_to edit_admin_user_identity_path(@user, identity), class: 'btn btn-sm btn-grouped' do = link_to edit_admin_user_identity_path(@user, identity), class: 'gl-button btn btn-sm btn-grouped' do
= _("Edit") = _("Edit")
= link_to [:admin, @user, identity], method: :delete, = link_to [:admin, @user, identity], method: :delete,
class: 'btn btn-sm btn-danger', class: 'gl-button btn btn-sm btn-danger',
data: { confirm: _("Are you sure you want to remove this identity?") } do data: { confirm: _("Are you sure you want to remove this identity?") } do
= _('Delete') = _('Delete')
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
- page_title _("Identities"), @user.name, _("Users") - page_title _("Identities"), @user.name, _("Users")
= render 'admin/users/head' = render 'admin/users/head'
= link_to _('New identity'), new_admin_user_identity_path, class: 'float-right btn btn-success' = link_to _('New identity'), new_admin_user_identity_path, class: 'float-right gl-button btn btn-success'
- if @identities.present? - if @identities.present?
.table-holder .table-holder
%table.table %table.table
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
= dropdown_content = dropdown_content
= dropdown_loading = dropdown_loading
= render 'shared/projects/dropdown' = render 'shared/projects/dropdown'
= link_to new_project_path, class: 'btn btn-success' do = link_to new_project_path, class: 'gl-button btn btn-success' do
New Project New Project
= button_tag "Search", class: "btn btn-primary btn-search hide" = button_tag "Search", class: "gl-button btn btn-primary btn-search hide"
= render 'projects' = render 'projects'
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
.form-group.row .form-group.row
.offset-sm-3.col-sm-9 .offset-sm-3.col-sm-9
= f.submit _('Transfer'), class: 'btn btn-primary' = f.submit _('Transfer'), class: 'gl-button btn btn-primary'
.card.repository-check .card.repository-check
.card-header .card-header
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
= link_to sprite_icon('question-o'), help_page_path('administration/repository_checks') = link_to sprite_icon('question-o'), help_page_path('administration/repository_checks')
.form-group .form-group
= f.submit _('Trigger repository check'), class: 'btn btn-primary' = f.submit _('Trigger repository check'), class: 'gl-button btn btn-primary'
.col-md-6 .col-md-6
- if @group - if @group
......
...@@ -65,15 +65,15 @@ ...@@ -65,15 +65,15 @@
.table-section.table-button-footer.section-10 .table-section.table-button-footer.section-10
.btn-group.table-action-buttons .btn-group.table-action-buttons
.btn-group .btn-group
= link_to admin_runner_path(runner), class: 'btn btn-default has-tooltip', title: _('Edit'), ref: 'tooltip', aria: { label: _('Edit') }, data: { placement: 'top', container: 'body'} do = link_to admin_runner_path(runner), class: 'gl-button btn btn-default has-tooltip', title: _('Edit'), ref: 'tooltip', aria: { label: _('Edit') }, data: { placement: 'top', container: 'body'} do
= sprite_icon('pencil') = sprite_icon('pencil')
.btn-group .btn-group
- if runner.active? - if runner.active?
= link_to [:pause, :admin, runner], method: :get, class: 'btn btn-default btn-svg has-tooltip', title: _('Pause'), ref: 'tooltip', aria: { label: _('Pause') }, data: { placement: 'top', container: 'body', confirm: _('Are you sure?') } do = link_to [:pause, :admin, runner], method: :get, class: 'gl-button btn btn-default btn-svg has-tooltip', title: _('Pause'), ref: 'tooltip', aria: { label: _('Pause') }, data: { placement: 'top', container: 'body', confirm: _('Are you sure?') } do
= sprite_icon('pause') = sprite_icon('pause')
- else - else
= link_to [:resume, :admin, runner], method: :get, class: 'btn btn-default btn-svg has-tooltip gl-px-3', title: _('Resume'), ref: 'tooltip', aria: { label: _('Resume') }, data: { placement: 'top', container: 'body'} do = link_to [:resume, :admin, runner], method: :get, class: 'gl-button btn btn-default btn-svg has-tooltip gl-px-3', title: _('Resume'), ref: 'tooltip', aria: { label: _('Resume') }, data: { placement: 'top', container: 'body'} do
= sprite_icon('play') = sprite_icon('play')
.btn-group .btn-group
= link_to [:admin, runner], method: :delete, class: 'btn btn-danger has-tooltip', title: _('Remove'), ref: 'tooltip', aria: { label: _('Remove') }, data: { placement: 'top', container: 'body', confirm: _('Are you sure?') } do = link_to [:admin, runner], method: :delete, class: 'gl-button btn btn-danger has-tooltip', title: _('Remove'), ref: 'tooltip', aria: { label: _('Remove') }, data: { placement: 'top', container: 'body', confirm: _('Are you sure?') } do
= sprite_icon('close') = sprite_icon('close')
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
.filtered-search-box .filtered-search-box
= dropdown_tag(_('Recent searches'), = dropdown_tag(_('Recent searches'),
options: { wrapper_class: 'filtered-search-history-dropdown-wrapper', options: { wrapper_class: 'filtered-search-history-dropdown-wrapper',
toggle_class: 'btn filtered-search-history-dropdown-toggle-button', toggle_class: 'gl-button btn filtered-search-history-dropdown-toggle-button',
dropdown_class: 'filtered-search-history-dropdown', dropdown_class: 'filtered-search-history-dropdown',
content_class: 'filtered-search-history-dropdown-content' }) do content_class: 'filtered-search-history-dropdown-content' }) do
.js-filtered-search-history-dropdown{ data: { full_path: admin_runners_path } } .js-filtered-search-history-dropdown{ data: { full_path: admin_runners_path } }
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
#js-dropdown-hint.filtered-search-input-dropdown-menu.dropdown-menu.hint-dropdown #js-dropdown-hint.filtered-search-input-dropdown-menu.dropdown-menu.hint-dropdown
%ul.filter-dropdown{ data: { dynamic: true, dropdown: true } } %ul.filter-dropdown{ data: { dynamic: true, dropdown: true } }
%li.filter-dropdown-item{ data: {hint: "#{'{{hint}}'}", tag: "#{'{{tag}}'}", action: "#{'{{hint === \'search\' ? \'submit\' : \'\' }}'}" } } %li.filter-dropdown-item{ data: {hint: "#{'{{hint}}'}", tag: "#{'{{tag}}'}", action: "#{'{{hint === \'search\' ? \'submit\' : \'\' }}'}" } }
= button_tag class: %w[btn btn-link] do = button_tag class: %w[gl-button btn btn-link] do
-# Encapsulate static class name `{{icon}}` inside #{} to bypass -# Encapsulate static class name `{{icon}}` inside #{} to bypass
-# haml lint's ClassAttributeWithStaticValue -# haml lint's ClassAttributeWithStaticValue
%svg %svg
...@@ -78,21 +78,21 @@ ...@@ -78,21 +78,21 @@
%ul{ data: { dropdown: true } } %ul{ data: { dropdown: true } }
- Ci::Runner::AVAILABLE_STATUSES.each do |status| - Ci::Runner::AVAILABLE_STATUSES.each do |status|
%li.filter-dropdown-item{ data: { value: status } } %li.filter-dropdown-item{ data: { value: status } }
= button_tag class: %w[btn btn-link] do = button_tag class: %w[gl-button btn btn-link] do
= status.titleize = status.titleize
#js-dropdown-admin-runner-type.filtered-search-input-dropdown-menu.dropdown-menu #js-dropdown-admin-runner-type.filtered-search-input-dropdown-menu.dropdown-menu
%ul{ data: { dropdown: true } } %ul{ data: { dropdown: true } }
- Ci::Runner::AVAILABLE_TYPES.each do |runner_type| - Ci::Runner::AVAILABLE_TYPES.each do |runner_type|
%li.filter-dropdown-item{ data: { value: runner_type } } %li.filter-dropdown-item{ data: { value: runner_type } }
= button_tag class: %w[btn btn-link] do = button_tag class: %w[gl-button btn btn-link] do
= runner_type.titleize = runner_type.titleize
#js-dropdown-admin-runner-type.filtered-search-input-dropdown-menu.dropdown-menu #js-dropdown-admin-runner-type.filtered-search-input-dropdown-menu.dropdown-menu
%ul{ data: { dropdown: true } } %ul{ data: { dropdown: true } }
- Ci::Runner::AVAILABLE_TYPES.each do |runner_type| - Ci::Runner::AVAILABLE_TYPES.each do |runner_type|
%li.filter-dropdown-item{ data: { value: runner_type } } %li.filter-dropdown-item{ data: { value: runner_type } }
= button_tag class: %w[btn btn-link] do = button_tag class: %w[gl-button btn btn-link] do
= runner_type.titleize = runner_type.titleize
#js-dropdown-runner-tag.filtered-search-input-dropdown-menu.dropdown-menu #js-dropdown-runner-tag.filtered-search-input-dropdown-menu.dropdown-menu
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
= project.full_name = project.full_name
%td %td
.float-right .float-right
= link_to 'Disable', admin_namespace_project_runner_project_path(project.namespace, project, runner_project), method: :delete, class: 'btn btn-danger btn-sm' = link_to 'Disable', admin_namespace_project_runner_project_path(project.namespace, project, runner_project), method: :delete, class: 'gl-button btn btn-danger btn-sm'
%table.table.unassigned-projects %table.table.unassigned-projects
%thead %thead
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
.float-right .float-right
= form_for project.runner_projects.new, url: admin_namespace_project_runner_projects_path(project.namespace, project), method: :post do |f| = form_for project.runner_projects.new, url: admin_namespace_project_runner_projects_path(project.namespace, project), method: :post do |f|
= f.hidden_field :runner_id, value: @runner.id = f.hidden_field :runner_id, value: @runner.id
= f.submit 'Enable', class: 'btn btn-sm' = f.submit 'Enable', class: 'gl-button btn btn-sm'
= paginate_without_count @projects = paginate_without_count @projects
.col-md-6 .col-md-6
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
- text, status = @domain.unverified? ? [_('Unverified'), 'badge-danger'] : [_('Verified'), 'badge-success'] - text, status = @domain.unverified? ? [_('Unverified'), 'badge-danger'] : [_('Verified'), 'badge-success']
.badge{ class: status } .badge{ class: status }
= text = text
= link_to sprite_icon("redo"), verify_admin_serverless_domain_path(@domain.id), method: :post, class: "btn has-tooltip", title: _("Retry verification") = link_to sprite_icon("redo"), verify_admin_serverless_domain_path(@domain.id), method: :post, class: "gl-button btn has-tooltip", title: _("Retry verification")
.col-sm-6 .col-sm-6
= f.label :serverless_domain_dns, _('DNS'), class: 'label-bold' = f.label :serverless_domain_dns, _('DNS'), class: 'label-bold'
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
%span.form-text.text-muted %span.form-text.text-muted
= _("Upload a private key for your certificate") = _("Upload a private key for your certificate")
= f.submit @domain.persisted? ? _('Save changes') : _('Add domain'), class: "btn btn-success js-serverless-domain-submit", disabled: @domain.persisted? = f.submit @domain.persisted? ? _('Save changes') : _('Add domain'), class: "gl-button btn btn-success js-serverless-domain-submit", disabled: @domain.persisted?
- if @domain.persisted? - if @domain.persisted?
%button.gl-button.btn.btn-danger{ type: 'button', data: { toggle: 'modal', target: "#modal-delete-domain" } } %button.gl-button.btn.btn-danger{ type: 'button', data: { toggle: 'modal', target: "#modal-delete-domain" } }
= _('Delete domain') = _('Delete domain')
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
= _("You are about to delete %{domain} from your instance. This domain will no longer be available to any Knative application.").html_safe % { domain: "<code>#{@domain.domain}</code>".html_safe } = _("You are about to delete %{domain} from your instance. This domain will no longer be available to any Knative application.").html_safe % { domain: "<code>#{@domain.domain}</code>".html_safe }
.modal-footer .modal-footer
%a{ href: '#', data: { dismiss: 'modal' }, class: 'btn btn-default' } %a{ href: '#', data: { dismiss: 'modal' }, class: 'gl-button btn btn-default' }
= _('Cancel') = _('Cancel')
= link_to _('Delete domain'), = link_to _('Delete domain'),
......
...@@ -4,4 +4,4 @@ ...@@ -4,4 +4,4 @@
= password_field_tag 'user[password]', nil, class: 'form-control', required: true, title: _('This field is required.'), data: { qa_selector: 'password_field' } = password_field_tag 'user[password]', nil, class: 'form-control', required: true, title: _('This field is required.'), data: { qa_selector: 'password_field' }
.submit-container.move-submit-down .submit-container.move-submit-down
= submit_tag _('Enter Admin Mode'), class: 'btn btn-success', data: { qa_selector: 'enter_admin_mode_button' } = submit_tag _('Enter Admin Mode'), class: 'gl-button btn btn-success', data: { qa_selector: 'enter_admin_mode_button' }
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
= _("Enter the code from the two-factor app on your mobile device. If you've lost your device, you may enter one of your recovery codes.") = _("Enter the code from the two-factor app on your mobile device. If you've lost your device, you may enter one of your recovery codes.")
.submit-container.move-submit-down .submit-container.move-submit-down
= submit_tag 'Verify code', class: 'btn btn-success' = submit_tag 'Verify code', class: 'gl-button btn btn-success'
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
.btn.btn-sm.disabled .btn.btn-sm.disabled
Submitted as ham Submitted as ham
- else - else
= link_to 'Submit as ham', mark_as_ham_admin_spam_log_path(spam_log), method: :post, class: 'btn btn-sm btn-warning' = link_to 'Submit as ham', mark_as_ham_admin_spam_log_path(spam_log), method: :post, class: 'gl-button btn btn-sm btn-warning'
- if user && !user.blocked? - if user && !user.blocked?
= link_to 'Block user', block_admin_user_path(user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "btn btn-sm" = link_to 'Block user', block_admin_user_path(user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "gl-button btn btn-sm"
- else - else
.btn.btn-sm.disabled .btn.btn-sm.disabled
Already blocked Already blocked
= link_to 'Remove log', [:admin, spam_log], remote: true, method: :delete, class: "btn btn-sm btn-close js-remove-tr" = link_to 'Remove log', [:admin, spam_log], remote: true, method: :delete, class: "gl-button btn btn-sm btn-close js-remove-tr"
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
.form-actions .form-actions
- if @user.new_record? - if @user.new_record?
= f.submit 'Create user', class: "btn gl-button btn-success" = f.submit 'Create user', class: "btn gl-button btn-success"
= link_to 'Cancel', admin_users_path, class: "btn btn-cancel" = link_to 'Cancel', admin_users_path, class: "gl-button btn btn-cancel"
- else - else
= f.submit 'Save changes', class: "btn gl-button btn-success" = f.submit 'Save changes', class: "btn gl-button btn-success"
= link_to 'Cancel', admin_user_path(@user), class: "btn gl-button btn-cancel" = link_to 'Cancel', admin_user_path(@user), class: "btn gl-button btn-cancel"
...@@ -26,4 +26,4 @@ ...@@ -26,4 +26,4 @@
.col-sm-10 .col-sm-10
= admin_email_select_tag(:recipients) = admin_email_select_tag(:recipients)
.form-actions .form-actions
= submit_tag _('Send message'), class: 'btn btn-success', disabled: admin_emails_are_currently_rate_limited? = submit_tag _('Send message'), class: 'gl-button btn btn-success', disabled: admin_emails_are_currently_rate_limited?
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
%h3{ :class => "page-title gl-mb-5!" } %h3{ :class => "page-title gl-mb-5!" }
= _("Geo Nodes") = _("Geo Nodes")
- if @nodes.any? - if @nodes.any?
= link_to s_("GeoNodes|New node"), new_admin_geo_node_path, class: 'btn btn-success ml-auto qa-new-node-link' = link_to s_("GeoNodes|New node"), new_admin_geo_node_path, class: 'gl-button btn btn-success ml-auto qa-new-node-link'
%p.page-subtitle.light %p.page-subtitle.light
= s_('GeoNodes|With %{geo} you can install a special read-only and replicated instance anywhere. Before you add nodes, follow the %{instructions} in the exact order they appear.').html_safe % { geo: link_to('GitLab Geo', help_page_path('administration/geo/index.md'), target: '_blank'), instructions: link_to('setup instructions', help_page_path('administration/geo/setup/index.md'), target: '_blank') } = s_('GeoNodes|With %{geo} you can install a special read-only and replicated instance anywhere. Before you add nodes, follow the %{instructions} in the exact order they appear.').html_safe % { geo: link_to('GitLab Geo', help_page_path('administration/geo/index.md'), target: '_blank'), instructions: link_to('setup instructions', help_page_path('administration/geo/setup/index.md'), target: '_blank') }
......
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
%strong.text-truncate.flex-fill %strong.text-truncate.flex-fill
= link_to project_registry.project.full_name, admin_namespace_project_path(project_registry.project.namespace, project_registry.project) = link_to project_registry.project.full_name, admin_namespace_project_path(project_registry.project.namespace, project_registry.project)
- unless project_registry.pending_verification? - unless project_registry.pending_verification?
= link_to(reverify_admin_geo_project_path(project_registry), method: :post, class: 'btn btn-default btn-sm mr-2') do = link_to(reverify_admin_geo_project_path(project_registry), method: :post, class: 'gl-button btn btn-default btn-sm mr-2') do
= s_('Geo|Reverify') = s_('Geo|Reverify')
- unless project_registry.resync_repository? - unless project_registry.resync_repository?
= link_to(resync_admin_geo_project_path(project_registry), method: :post, class: 'btn btn-default-primary btn-sm') do = link_to(resync_admin_geo_project_path(project_registry), method: :post, class: 'gl-button btn btn-default-primary btn-sm') do
= s_('Geo|Resync') = s_('Geo|Resync')
= render partial: "registry_#{project_registry.synchronization_state}", locals: { project_registry: project_registry } = render partial: "registry_#{project_registry.synchronization_state}", locals: { project_registry: project_registry }
......
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
%strong.text-truncate.flex-fill %strong.text-truncate.flex-fill
= link_to project_registry.project.full_name, admin_namespace_project_path(project_registry.project.namespace, project_registry.project) = link_to project_registry.project.full_name, admin_namespace_project_path(project_registry.project.namespace, project_registry.project)
- if project_registry.candidate_for_redownload? - if project_registry.candidate_for_redownload?
= link_to(force_redownload_admin_geo_project_path(project_registry), method: :post, class: 'btn btn-default btn-sm mr-2') do = link_to(force_redownload_admin_geo_project_path(project_registry), method: :post, class: 'gl-button btn btn-default btn-sm mr-2') do
= s_('Geo|Redownload') = s_('Geo|Redownload')
= link_to(resync_admin_geo_project_path(project_registry), method: :post, class: 'btn btn-default-primary btn-sm') do = link_to(resync_admin_geo_project_path(project_registry), method: :post, class: 'gl-button btn btn-default-primary btn-sm') do
= s_('Geo|Resync') = s_('Geo|Resync')
= render partial: 'registry_failed', locals: { project_registry: project_registry } = render partial: 'registry_failed', locals: { project_registry: project_registry }
......
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
%strong.text-truncate.flex-fill %strong.text-truncate.flex-fill
= link_to project_registry.project.full_name, admin_namespace_project_path(project_registry.project.namespace, project_registry.project) = link_to project_registry.project.full_name, admin_namespace_project_path(project_registry.project.namespace, project_registry.project)
- unless project_registry.pending_verification? - unless project_registry.pending_verification?
= link_to(reverify_admin_geo_project_path(project_registry), method: :post, class: 'btn btn-default btn-sm mr-2') do = link_to(reverify_admin_geo_project_path(project_registry), method: :post, class: 'gl-button btn btn-default btn-sm mr-2') do
= s_('Geo|Reverify') = s_('Geo|Reverify')
- unless project_registry.resync_repository? - unless project_registry.resync_repository?
= link_to(resync_admin_geo_project_path(project_registry), method: :post, class: 'btn btn-default-primary btn-sm') do = link_to(resync_admin_geo_project_path(project_registry), method: :post, class: 'gl-button btn btn-default-primary btn-sm') do
= s_('Geo|Resync') = s_('Geo|Resync')
= render partial: 'registry_pending', locals: { project_registry: project_registry } = render partial: 'registry_pending', locals: { project_registry: project_registry }
......
%strong.text-truncate.flex-fill %strong.text-truncate.flex-fill
= s_('Geo|Project (ID: %{project_id}) no longer exists on the primary. It is safe to remove this entry, as this will not remove any data on disk.') % { project_id: project_registry.project_id } = s_('Geo|Project (ID: %{project_id}) no longer exists on the primary. It is safe to remove this entry, as this will not remove any data on disk.') % { project_id: project_registry.project_id }
= button_tag s_('Geo|Remove'), type: "button", class: 'btn btn-danger btn-inverted js-confirm-modal-button', data: remove_tracking_entry_modal_data(admin_geo_project_path(project_registry)) = button_tag s_('Geo|Remove'), type: "button", class: 'gl-button btn btn-danger btn-inverted js-confirm-modal-button', data: remove_tracking_entry_modal_data(admin_geo_project_path(project_registry))
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
- else - else
%strong.text-truncate.flex-fill %strong.text-truncate.flex-fill
= link_to project_registry.project.full_name, admin_namespace_project_path(project_registry.project.namespace, project_registry.project) = link_to project_registry.project.full_name, admin_namespace_project_path(project_registry.project.namespace, project_registry.project)
= link_to(reverify_admin_geo_project_path(project_registry), method: :post, class: 'btn btn-default btn-sm mr-2') do = link_to(reverify_admin_geo_project_path(project_registry), method: :post, class: 'gl-button btn btn-default btn-sm mr-2') do
= s_('Geo|Reverify') = s_('Geo|Reverify')
= link_to(resync_admin_geo_project_path(project_registry), method: :post, class: 'btn btn-default-primary btn-sm') do = link_to(resync_admin_geo_project_path(project_registry), method: :post, class: 'gl-button btn btn-default-primary btn-sm') do
= s_('Geo|Resync') = s_('Geo|Resync')
= render partial: 'registry_synced', locals: { project_registry: project_registry } = render partial: 'registry_synced', locals: { project_registry: project_registry }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
%strong.text-truncate.flex-fill %strong.text-truncate.flex-fill
= upload_registry.file = upload_registry.file
- unless upload_registry.upload - unless upload_registry.upload
= button_tag s_('Geo|Remove'), type: "button", class: 'btn btn-danger btn-inverted js-confirm-modal-button', data: remove_tracking_entry_modal_data(admin_geo_upload_path(upload_registry)) = button_tag s_('Geo|Remove'), type: "button", class: 'gl-button btn btn-danger btn-inverted js-confirm-modal-button', data: remove_tracking_entry_modal_data(admin_geo_upload_path(upload_registry))
.card-body .card-body
.container.m-0.p-0 .container.m-0.p-0
.row .row
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
%strong= @license.licensee['Name'] %strong= @license.licensee['Name']
= "(#{@license.licensee['Email']})" = "(#{@license.licensee['Email']})"
%div %div
= link_to 'View details', admin_license_path, class: "btn btn-secondary" = link_to 'View details', admin_license_path, class: "gl-button btn btn-secondary"
.d-flex.gl-mb-5 .d-flex.gl-mb-5
.col-sm-6.d-flex.pl-0 .col-sm-6.d-flex.pl-0
.info-well.dark-well.gl-mb-0 .info-well.dark-well.gl-mb-0
......
...@@ -50,8 +50,8 @@ ...@@ -50,8 +50,8 @@
%p= html_escape(_('Your license will be included in your GitLab backup and will survive upgrades, so in normal usage you should never need to re-upload your %{code_open}.gitlab-license%{code_close} file.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe } %p= html_escape(_('Your license will be included in your GitLab backup and will survive upgrades, so in normal usage you should never need to re-upload your %{code_open}.gitlab-license%{code_close} file.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe }
%p= _('Still, we recommend keeping a backup saved somewhere. Otherwise, if you ever need it and have lost it, you will need to request GitLab Inc. to send it to you again.') %p= _('Still, we recommend keeping a backup saved somewhere. Otherwise, if you ever need it and have lost it, you will need to request GitLab Inc. to send it to you again.')
%br %br
= link_to _('Download license'), download_admin_license_path, class: 'btn btn-info' = link_to _('Download license'), download_admin_license_path, class: 'gl-button btn btn-info'
= link_to _('Customer Portal'), 'https://customers.gitlab.com', class: 'btn btn-info btn-inverted', data: { track_event: 'click_text', track_label: 'license_dashboard', track_property: 'customer_portal' }, target: '_blank', rel: 'noopener noreferrer' = link_to _('Customer Portal'), 'https://customers.gitlab.com', class: 'gl-button btn btn-info btn-inverted', data: { track_event: 'click_text', track_label: 'license_dashboard', track_property: 'customer_portal' }, target: '_blank', rel: 'noopener noreferrer'
.card.border-danger .card.border-danger
.card-header.bg-danger.text-white .card-header.bg-danger.text-white
......
= link_to _('Buy License'), ::EE::SUBSCRIPTIONS_PLANS_URL, target: '_blank', rel: 'noopener noreferrer nofollow', class: 'btn btn-success btn-inverted float-right btn-buy-license' = link_to _('Buy License'), ::EE::SUBSCRIPTIONS_PLANS_URL, target: '_blank', rel: 'noopener noreferrer nofollow', class: 'gl-button btn btn-success btn-inverted float-right btn-buy-license'
= link_to _('Upload New License'), new_admin_license_path, class: 'btn float-right btn-upload-license gl-mr-3', data: { qa_selector: 'license_upload_link' } = link_to _('Upload New License'), new_admin_license_path, class: 'gl-button btn float-right btn-upload-license gl-mr-3', data: { qa_selector: 'license_upload_link' }
...@@ -25,4 +25,4 @@ ...@@ -25,4 +25,4 @@
= license_key = license_key
.modal-footer.form-actions .modal-footer.form-actions
%button.btn.btn-default{ type: 'button', data: { dismiss: 'modal' } } Cancel %button.btn.btn-default{ type: 'button', data: { dismiss: 'modal' } } Cancel
= f.submit 'Install license', class: 'btn btn-primary' = f.submit 'Install license', class: 'gl-button btn btn-primary'
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
= s_('License|You do not have a license.') = s_('License|You do not have a license.')
- if License.eligible_for_trial? - if License.eligible_for_trial?
%p.trial-description= s_('License|You can start a free trial of GitLab Ultimate without any obligation or payment details.') %p.trial-description= s_('License|You can start a free trial of GitLab Ultimate without any obligation or payment details.')
= link_to 'Start free trial', new_trial_url, target: '_blank', class: "btn btn-success btn-start-trial gl-mt-3" = link_to 'Start free trial', new_trial_url, target: '_blank', class: "gl-button btn btn-success btn-start-trial gl-mt-3"
- else - else
%p.trial-description %p.trial-description
= s_('License|Your free trial of GitLab Ultimate expired on %{trial_ends_on}.').html_safe % {trial_ends_on: License.trial_ends_on} = s_('License|Your free trial of GitLab Ultimate expired on %{trial_ends_on}.').html_safe % {trial_ends_on: License.trial_ends_on}
= s_('License|You can restore access to the Gold features at any time by upgrading.') = s_('License|You can restore access to the Gold features at any time by upgrading.')
= link_to s_('License|Buy license'), ::EE::SUBSCRIPTIONS_PLANS_URL, target: '_blank', rel: 'noopener noreferrer nofollow', class: "btn btn-success btn-buy-license" = link_to s_('License|Buy license'), ::EE::SUBSCRIPTIONS_PLANS_URL, target: '_blank', rel: 'noopener noreferrer nofollow', class: "gl-button btn btn-success btn-buy-license"
...@@ -48,4 +48,4 @@ ...@@ -48,4 +48,4 @@
= _('Unless otherwise agreed to in writing with GitLab, by clicking "Upload License" you agree that your use of GitLab Software is subject to the %{eula_link_start}Terms of Service%{eula_link_end}.').html_safe % { eula_link_start: eula_link_start, eula_url: eula_url, eula_link_end: '</a>'.html_safe } = _('Unless otherwise agreed to in writing with GitLab, by clicking "Upload License" you agree that your use of GitLab Software is subject to the %{eula_link_start}Terms of Service%{eula_link_end}.').html_safe % { eula_link_start: eula_link_start, eula_url: eula_url, eula_link_end: '</a>'.html_safe }
.form-actions .form-actions
= f.submit 'Upload License', class: 'btn btn-primary', disabled: true, id: 'js-upload-license' = f.submit 'Upload License', class: 'gl-button btn btn-primary', disabled: true, id: 'js-upload-license'
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
- if @license&.trial? - if @license&.trial?
= render 'upload_buy_license' = render 'upload_buy_license'
- else - else
= link_to _('Upload New License'), new_admin_license_path, class: 'btn btn-success float-right', data: { qa_selector: 'license_upload_link' } = link_to _('Upload New License'), new_admin_license_path, class: 'gl-button btn btn-success float-right', data: { qa_selector: 'license_upload_link' }
%hr %hr
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
.card-header .card-header
= s_('Geo|Geo Status') = s_('Geo|Geo Status')
.float-right .float-right
= link_to(reverify_admin_geo_project_path(@project.project_registry), method: :post, class: 'btn btn-default btn-sm mr-2') do = link_to(reverify_admin_geo_project_path(@project.project_registry), method: :post, class: 'gl-button btn btn-default btn-sm mr-2') do
= s_('Geo|Reverify') = s_('Geo|Reverify')
= link_to(resync_admin_geo_project_path(@project.project_registry), method: :post, class: 'btn btn-default-primary btn-sm') do = link_to(resync_admin_geo_project_path(@project.project_registry), method: :post, class: 'gl-button btn btn-default-primary btn-sm') do
= s_('Geo|Resync') = s_('Geo|Resync')
= render partial: "admin/geo/projects/registry_#{@project.project_registry.synchronization_state}", locals: { project_registry: @project.project_registry } = render partial: "admin/geo/projects/registry_#{@project.project_registry.synchronization_state}", locals: { project_registry: @project.project_registry }
...@@ -32,4 +32,4 @@ ...@@ -32,4 +32,4 @@
= b.check_box(class: "form-check-input") = b.check_box(class: "form-check-input")
= b.label(class: "form-check-label") = b.label(class: "form-check-label")
= f.submit _('Save changes'), class: "btn btn-success" = f.submit _('Save changes'), class: "gl-button btn btn-success"
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