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
2 changed files with 45 additions and 39 deletions
|
@ -1,15 +1,13 @@
|
|||
%h3.page-title
|
||||
.row.prepend-top-default.append-bottom-default
|
||||
.col-lg-3
|
||||
%h4.prepend-top-0
|
||||
= @service.title
|
||||
= boolean_to_icon @service.activated?
|
||||
|
||||
%p= @service.description
|
||||
|
||||
%hr
|
||||
|
||||
.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|
|
||||
= render 'shared/service_settings', form: form
|
||||
|
||||
.form-actions
|
||||
= form.submit 'Save changes', class: 'btn btn-save'
|
||||
|
||||
- if @service.valid? && @service.activated?
|
||||
|
|
|
@ -1,14 +1,22 @@
|
|||
- 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
|
||||
.col-lg-3
|
||||
%h4.prepend-top-0
|
||||
Project services
|
||||
%p Project services allow you to integrate GitLab with other applications
|
||||
.col-lg-9
|
||||
%table.table
|
||||
%colgroup
|
||||
%col
|
||||
%col
|
||||
%col.hidden-xs
|
||||
%col{ width: "120" }
|
||||
%thead
|
||||
%tr
|
||||
%th
|
||||
%th Service
|
||||
%th Description
|
||||
%th.hidden-xs Description
|
||||
%th Last edit
|
||||
- @services.sort_by(&:title).each do |service|
|
||||
%tr
|
||||
|
@ -17,7 +25,7 @@
|
|||
%td
|
||||
= link_to edit_namespace_project_service_path(@project.namespace, @project, service.to_param) do
|
||||
%strong= service.title
|
||||
%td
|
||||
%td.hidden-xs
|
||||
= service.description
|
||||
%td.light
|
||||
= time_ago_in_words service.updated_at
|
||||
|
|
Loading…
Reference in a new issue