kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Updated services UI

Browse source
This commit is contained in:
Phil Hughes 2016-05-17 10:38:01 +01:00
parent 28eea9bdfd
commit 97a7bdd251
2 changed files with 46 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/views/projects/services/_form.html.haml
View file

@ -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"

53
app/views/projects/services/index.html.haml
View file

@ -1,24 +1,33 @@
- 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-responsive
%th Last edit %table.table
- @services.sort_by(&:title).each do |service| %colgroup
%tr %col
%td %col
= boolean_to_icon service.activated? %col
%td %col{ width: "120" }
= link_to edit_namespace_project_service_path(@project.namespace, @project, service.to_param) do %thead
%strong= service.title %tr
%td %th
= service.description %th Service
%td.light %th Description
= time_ago_in_words service.updated_at %th Last edit
ago - @services.sort_by(&:title).each do |service|
%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
= service.description
%td.light
= time_ago_in_words service.updated_at
ago