Merge branch 'services-ui' into 'master'
Updated services UI ![Screen_Shot_2016-05-17_at_10.38.10](/uploads/791ba27b3bbc18c9bde19ecf58ffea21/Screen_Shot_2016-05-17_at_10.38.10.png) See merge request !4177
This commit is contained in:
commit
d4d0fdb479
|
@ -1,18 +1,16 @@
|
||||||
%h3.page-title
|
.row.prepend-top-default.append-bottom-default
|
||||||
= @service.title
|
.col-lg-3
|
||||||
= boolean_to_icon @service.activated?
|
%h4.prepend-top-0
|
||||||
|
= @service.title
|
||||||
|
= boolean_to_icon @service.activated?
|
||||||
|
|
||||||
%p= @service.description
|
%p= @service.description
|
||||||
|
.col-lg-9
|
||||||
%hr
|
= form_for(@service, as: :service, url: namespace_project_service_path(@project.namespace, @project, @service.to_param), method: :put, html: { class: 'form-horizontal' }) do |form|
|
||||||
|
= render 'shared/service_settings', form: form
|
||||||
= 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.submit 'Save changes', class: 'btn btn-save'
|
||||||
= render 'shared/service_settings', form: form
|
|
||||||
|
- if @service.valid? && @service.activated?
|
||||||
.form-actions
|
- disabled = @service.can_test? ? '':'disabled'
|
||||||
= form.submit 'Save changes', class: 'btn btn-save'
|
= link_to 'Test settings', test_namespace_project_service_path(@project.namespace, @project, @service.to_param), class: "btn #{disabled}"
|
||||||
|
= link_to "Cancel", namespace_project_services_path(@project.namespace, @project), class: "btn btn-cancel"
|
||||||
- if @service.valid? && @service.activated?
|
|
||||||
- disabled = @service.can_test? ? '':'disabled'
|
|
||||||
= link_to 'Test settings', test_namespace_project_service_path(@project.namespace, @project, @service.to_param), class: "btn #{disabled}"
|
|
||||||
= link_to "Cancel", namespace_project_services_path(@project.namespace, @project), class: "btn btn-cancel"
|
|
||||||
|
|
|
@ -1,24 +1,32 @@
|
||||||
- page_title "Services"
|
- page_title "Services"
|
||||||
%h3.page-title Project services
|
|
||||||
%p.light Project services allow you to integrate GitLab with other applications
|
|
||||||
|
|
||||||
.table-holder
|
.row.prepend-top-default.append-bottom-default
|
||||||
%table.table
|
.col-lg-3
|
||||||
%thead
|
%h4.prepend-top-0
|
||||||
%tr
|
Project services
|
||||||
%th
|
%p Project services allow you to integrate GitLab with other applications
|
||||||
%th Service
|
.col-lg-9
|
||||||
%th Description
|
%table.table
|
||||||
%th Last edit
|
%colgroup
|
||||||
- @services.sort_by(&:title).each do |service|
|
%col
|
||||||
%tr
|
%col
|
||||||
%td
|
%col.hidden-xs
|
||||||
= boolean_to_icon service.activated?
|
%col{ width: "120" }
|
||||||
%td
|
%thead
|
||||||
= link_to edit_namespace_project_service_path(@project.namespace, @project, service.to_param) do
|
%tr
|
||||||
%strong= service.title
|
%th
|
||||||
%td
|
%th Service
|
||||||
= service.description
|
%th.hidden-xs Description
|
||||||
%td.light
|
%th Last edit
|
||||||
= time_ago_in_words service.updated_at
|
- @services.sort_by(&:title).each do |service|
|
||||||
ago
|
%tr
|
||||||
|
%td
|
||||||
|
= boolean_to_icon service.activated?
|
||||||
|
%td
|
||||||
|
= link_to edit_namespace_project_service_path(@project.namespace, @project, service.to_param) do
|
||||||
|
%strong= service.title
|
||||||
|
%td.hidden-xs
|
||||||
|
= service.description
|
||||||
|
%td.light
|
||||||
|
= time_ago_in_words service.updated_at
|
||||||
|
ago
|
||||||
|
|
Loading…
Reference in New Issue