Commit 6ea6ab7c8d152ce17f6321a984a213b17d7f5e7e
1 parent
c0c5d94b
Exists in
master
and in
4 other branches
Restyled services page in order to make it more usable
Showing
4 changed files
with
35 additions
and
20 deletions
Show diff stats
app/assets/images/service-disabled-gitlab-ci.png
2.13 KB
app/assets/images/service-gitlab-ci.png
2.34 KB
app/views/services/_gitlab_ci.html.haml
| 1 | 1 | %h3.page_title |
| 2 | - Services → GitLab CI Integration | |
| 3 | - | |
| 2 | + GitLab CI | |
| 3 | + %small Continuous integration server from GitLab | |
| 4 | 4 | .right |
| 5 | - .thumbnail | |
| 6 | - - if @service.active | |
| 7 | - = image_tag 'service-gitlab-ci.png', class: 'small' | |
| 8 | - - else | |
| 9 | - = image_tag 'service-disabled-gitlab-ci.png', class: 'small' | |
| 5 | + - if @service.active | |
| 6 | + %small.cgreen Enabled | |
| 7 | + - else | |
| 8 | + %small.btn Disabled | |
| 10 | 9 | |
| 11 | -%hr | |
| 12 | 10 | |
| 13 | 11 | |
| 12 | +.back_link | |
| 13 | + = link_to project_services_path(@project) do | |
| 14 | + ← to services | |
| 15 | + | |
| 16 | +%hr | |
| 14 | 17 | = form_for(@service, :as => :service, :url => project_service_path(@project, :gitlab_ci), :method => :put) do |f| |
| 15 | 18 | - if @service.errors.any? |
| 16 | 19 | .alert-message.block-message.error | ... | ... |
app/views/services/index.html.haml
| 1 | 1 | = render "projects/project_head" |
| 2 | 2 | %h3.page_title Services |
| 3 | -%hr | |
| 4 | - | |
| 5 | -.row | |
| 6 | - .span6 | |
| 7 | - .padded | |
| 8 | - %p.slead Continuous integration server from GitLab | |
| 9 | - .thumbnail.left | |
| 10 | - = link_to edit_project_service_path(@project, :gitlab_ci) do | |
| 11 | - - if @gitlab_ci_service.try :active | |
| 12 | - = image_tag 'service-gitlab-ci.png' | |
| 13 | - - else | |
| 14 | - = image_tag 'service-disabled-gitlab-ci.png' | |
| 3 | +%br | |
| 15 | 4 | |
| 5 | +%ul.unstyled.ui-box | |
| 6 | + %li.wll | |
| 7 | + %h4 | |
| 8 | + = link_to edit_project_service_path(@project, :gitlab_ci) do | |
| 9 | + GitLab CI | |
| 10 | + %small Continuous integration server from GitLab | |
| 11 | + .right | |
| 12 | + - if @gitlab_ci_service.active | |
| 13 | + %small.cgreen Enabled | |
| 14 | + - else | |
| 15 | + %small.btn Disabled | |
| 16 | + %li.wll | |
| 17 | + %h4 | |
| 18 | + Jenkins CI | |
| 19 | + %small An extendable open source continuous integration server | |
| 20 | + .right | |
| 21 | + %small Not implemented yet | |
| 22 | + %li.wll | |
| 23 | + %h4 | |
| 24 | + Campfire | |
| 25 | + %small Web-based group chat tool | |
| 26 | + .right | |
| 27 | + %small Not implemented yet | ... | ... |