From 6ea6ab7c8d152ce17f6321a984a213b17d7f5e7e Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sun, 2 Dec 2012 08:41:06 +0300
Subject: [PATCH] Restyled services page in order to make it more usable

---
 .../images/service-disabled-gitlab-ci.png     | Bin 2178 -> 0 bytes
 app/assets/images/service-gitlab-ci.png       | Bin 2393 -> 0 bytes
 app/views/services/_gitlab_ci.html.haml       |  21 +++++-----
 app/views/services/index.html.haml            |  36 ++++++++++++------
 4 files changed, 36 insertions(+), 21 deletions(-)
 delete mode 100644 app/assets/images/service-disabled-gitlab-ci.png
 delete mode 100644 app/assets/images/service-gitlab-ci.png

diff --git a/app/assets/images/service-disabled-gitlab-ci.png b/app/assets/images/service-disabled-gitlab-ci.png
deleted file mode 100644
index 8d1f9d0b50d01604383045d307369096fbfbda7f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2178
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

diff --git a/app/assets/images/service-gitlab-ci.png b/app/assets/images/service-gitlab-ci.png
deleted file mode 100644
index bcb30a3fb1ada06b21c05de1814b7b6bea9e7652..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2393
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
LNkvXXu0mjf{XmkB

diff --git a/app/views/services/_gitlab_ci.html.haml b/app/views/services/_gitlab_ci.html.haml
index 4c1ec5bc348..09d139c0d2c 100644
--- a/app/views/services/_gitlab_ci.html.haml
+++ b/app/views/services/_gitlab_ci.html.haml
@@ -1,16 +1,19 @@
 %h3.page_title
-  Services &rarr; GitLab CI Integration
-
+  GitLab CI
+  %small Continuous integration server from GitLab
   .right
-    .thumbnail
-      - if @service.active
-        = image_tag 'service-gitlab-ci.png', class: 'small'
-      - else
-        = image_tag 'service-disabled-gitlab-ci.png', class: 'small'
+    - if @service.active
+      %small.cgreen Enabled
+    - else
+      %small.btn Disabled
+
+
+
+.back_link
+  = link_to project_services_path(@project) do
+    &larr; to services
 
 %hr
-
-
 = form_for(@service, :as => :service, :url => project_service_path(@project, :gitlab_ci), :method => :put) do |f|
   - if @service.errors.any?
     .alert-message.block-message.error
diff --git a/app/views/services/index.html.haml b/app/views/services/index.html.haml
index 3894fcee369..65e94383da3 100644
--- a/app/views/services/index.html.haml
+++ b/app/views/services/index.html.haml
@@ -1,15 +1,27 @@
 = render "projects/project_head"
 %h3.page_title Services
-%hr
-
-.row
-  .span6
-    .padded
-      %p.slead Continuous integration server from GitLab
-      .thumbnail.left
-        = link_to edit_project_service_path(@project, :gitlab_ci) do
-          - if @gitlab_ci_service.try :active
-            = image_tag 'service-gitlab-ci.png'
-          - else
-            = image_tag 'service-disabled-gitlab-ci.png'
+%br
 
+%ul.unstyled.ui-box
+  %li.wll
+    %h4
+      = link_to edit_project_service_path(@project, :gitlab_ci) do
+        GitLab CI
+        %small Continuous integration server from GitLab
+      .right
+        - if @gitlab_ci_service.active
+          %small.cgreen Enabled
+        - else
+          %small.btn Disabled
+  %li.wll
+    %h4
+      Jenkins CI
+      %small An extendable open source continuous integration server
+      .right
+        %small Not implemented yet
+  %li.wll
+    %h4
+      Campfire
+      %small Web-based group chat tool
+      .right
+        %small Not implemented yet