diff options
| author | kushalpandya <kushal@gitlab.com> | 2017-05-25 14:22:07 +0530 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-06-01 07:47:15 +0200 |
| commit | fc2cc1e235f9d760b9b69fe5911f8e4396ab8965 (patch) | |
| tree | 981b6e8e8c9df225e20352466eb46dd91437df54 | |
| parent | c1ef4347ed2f2767e045f0d145092abd7d525465 (diff) | |
| download | gitlab-ce-fc2cc1e235f9d760b9b69fe5911f8e4396ab8965.tar.gz | |
Remove test settings button, enhance Save changes button, include Integrations bundle
| -rw-r--r-- | app/views/projects/services/_form.html.haml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml index f1a80f1d5e1..b6ff2806793 100644 --- a/app/views/projects/services/_form.html.haml +++ b/app/views/projects/services/_form.html.haml @@ -1,3 +1,6 @@ +- content_for :page_specific_javascripts do + = webpack_bundle_tag('integrations') + .row.prepend-top-default.append-bottom-default .col-lg-3 %h4.prepend-top-0 @@ -6,15 +9,17 @@ %p= @service.description .col-lg-9 - = form_for(@service, as: :service, url: namespace_project_service_path(@project.namespace, @project, @service.to_param), method: :put, html: { class: 'form-horizontal' }) do |form| + = form_for(@service, as: :service, url: namespace_project_service_path(@project.namespace, @project, @service.to_param), method: :put, html: { class: 'gl-show-field-errors form-horizontal js-integration-settings-from' }) do |form| = render 'shared/service_settings', form: form, subject: @service .footer-block.row-content-block - = form.submit 'Save changes', class: 'btn btn-save' + %button.btn.btn-save{ type: 'submit' } + %i.fa.fa-spinner.fa-spin.hidden.js-btn-spinner{ "aria-hidden" => true } + %span.js-btn-label + Save changes - if @service.valid? && @service.activated? - unless @service.can_test? - disabled_class = 'disabled' - disabled_title = @service.disabled_title - = link_to 'Test settings', test_namespace_project_service_path(@project.namespace, @project, @service), class: "btn #{disabled_class}", title: disabled_title = link_to "Cancel", namespace_project_settings_integrations_path(@project.namespace, @project), class: "btn btn-cancel" |