Restyled services page in order to make it more usable

4 files changed, 35 insertions, 20 deletions

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 8d1f9d0b50d..00000000000
--- a/app/assets/images/service-disabled-gitlab-ci.png
+++ /dev/null
diff --git a/app/assets/images/service-gitlab-ci.png b/app/assets/images/service-gitlab-ci.png
deleted file mode 100644
index bcb30a3fb1a..00000000000
--- a/app/assets/images/service-gitlab-ci.png
+++ /dev/null
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 → 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
 
-%hr
 
 
+.back_link
+  = link_to project_services_path(@project) do
+    ← 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