Commit d4d0fdb4 authored by Jacob Schatz's avatar Jacob Schatz

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
parents 85495c8c 42879936
%h3.page-title .row.prepend-top-default.append-bottom-default
.col-lg-3
%h4.prepend-top-0
= @service.title = @service.title
= boolean_to_icon @service.activated? = 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|
= 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 = render 'shared/service_settings', form: form
.form-actions
= form.submit 'Save changes', class: 'btn btn-save' = form.submit 'Save changes', class: 'btn btn-save'
   
- if @service.valid? && @service.activated? - if @service.valid? && @service.activated?
......
- 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
.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 %table.table
%colgroup
%col
%col
%col.hidden-xs
%col{ width: "120" }
%thead %thead
%tr %tr
%th %th
%th Service %th Service
%th Description %th.hidden-xs Description
%th Last edit %th Last edit
- @services.sort_by(&:title).each do |service| - @services.sort_by(&:title).each do |service|
%tr %tr
...@@ -17,7 +25,7 @@ ...@@ -17,7 +25,7 @@
%td %td
= link_to edit_namespace_project_service_path(@project.namespace, @project, service.to_param) do = link_to edit_namespace_project_service_path(@project.namespace, @project, service.to_param) do
%strong= service.title %strong= service.title
%td %td.hidden-xs
= service.description = service.description
%td.light %td.light
= time_ago_in_words service.updated_at = time_ago_in_words service.updated_at
......
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