From 1cbc898223d2f9b78cb6494108d2aed00d19d00e Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 20 May 2016 18:50:16 -0500
Subject: Improve design of Pipeline view

---
 app/views/projects/ci/commits/_commit.html.haml | 31 +++++++++++++------------
 app/views/projects/commit/_ci_stage.html.haml   |  1 +
 app/views/projects/pipelines/index.html.haml    |  6 ++---
 3 files changed, 20 insertions(+), 18 deletions(-)

(limited to 'app/views/projects')

diff --git a/app/views/projects/ci/commits/_commit.html.haml b/app/views/projects/ci/commits/_commit.html.haml
index 13162b41f9b..2ea9333913c 100644
--- a/app/views/projects/ci/commits/_commit.html.haml
+++ b/app/views/projects/ci/commits/_commit.html.haml
@@ -12,10 +12,10 @@
         &middot;
       = link_to commit.short_sha, namespace_project_commit_path(@project.namespace, @project, commit.sha), class: "commit-id monospace"
       &nbsp;
-      - if commit.latest?
-        %span.label.label-success latest
       - if commit.tag?
         %span.label.label-primary tag
+      - elsif commit.latest?
+        %span.label.label-success.has-tooltip{ title: 'Latest build for this branch' } latest
       - if commit.triggered?
         %span.label.label-primary triggered
       - if commit.yaml_errors.present?
@@ -23,30 +23,33 @@
       - if commit.builds.any?(&:stuck?)
         %span.label.label-warning stuck
 
-      %p
-        %span
-          - if commit_data = commit.commit_data
-            = link_to_gfm commit_data.title, namespace_project_commit_path(@project.namespace, @project, commit_data.id), class: "commit-row-message"
-          - else
-            Cant find HEAD commit for this branch
+      %p.commit-title
+        - if commit_data = commit.commit_data
+          = link_to_gfm truncate(commit_data.title, length: 60), namespace_project_commit_path(@project.namespace, @project, commit_data.id), class: "commit-row-message"
+        - else
+          Cant find HEAD commit for this branch
 
 
     - stages_status = commit.statuses.stages_status
     - stages.each do |stage|
       %td
-        - if status = stages_status[stage]
-          - tooltip = "#{stage.titleize}: #{status}"
-          %span.has-tooltip{ title: "#{tooltip}", class: "ci-status-icon-#{status}" }
+        - status = stages_status[stage]
+        - tooltip = "#{stage.titleize}: #{status || 'not found'}"
+        - if status
+          = link_to namespace_project_pipeline_path(@project.namespace, @project, commit.id, anchor: stage), class: "has-tooltip ci-status-icon-#{status || 'skipped'}", title: tooltip do
             = ci_icon_for_status(status)
+        - else
+          .light
+            \-
 
   %td
     - if commit.started_at && commit.finished_at
-      %p
+      %p.duration
         = icon("clock-o")
         &nbsp;
         #{duration_in_words(commit.finished_at, commit.started_at)}
     - if commit.finished_at
-      %p
+      %p.finished_at
         = icon("calendar")
         &nbsp;
         #{time_ago_with_tooltip(commit.finished_at)}
@@ -67,11 +70,9 @@
                   %span #{build.name}
 
       - if can?(current_user, :update_pipeline, @project)
-        &nbsp;
         - if commit.retryable? && commit.builds.failed.any?
           = link_to retry_namespace_project_pipeline_path(@project.namespace, @project, commit.id), class: 'btn has-tooltip', title: "Retry", method: :post do
             = icon("repeat")
-        &nbsp;
         - if commit.active?
           = link_to cancel_namespace_project_pipeline_path(@project.namespace, @project, commit.id), class: 'btn btn-remove has-tooltip', title: "Cancel", method: :post do
             = icon("remove")
diff --git a/app/views/projects/commit/_ci_stage.html.haml b/app/views/projects/commit/_ci_stage.html.haml
index aaa318e1eb3..ae7bb01223e 100644
--- a/app/views/projects/commit/_ci_stage.html.haml
+++ b/app/views/projects/commit/_ci_stage.html.haml
@@ -1,6 +1,7 @@
 %tr
   %th{colspan: 10}
     %strong
+      %a{name: stage}
       - status = statuses.latest.status
       %span{class: "ci-status-link ci-status-icon-#{status}"}
         = ci_icon_for_status(status)
diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml
index 9d5b6d367c9..4e2e8190700 100644
--- a/app/views/projects/pipelines/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
@@ -44,7 +44,7 @@
   - else
     #{@scope.titleize} for this project
 
-%ul.content-list
+%ul.content-list.pipelines
   - stages = @pipelines.stages
   - if @pipelines.blank?
     %li
@@ -56,8 +56,8 @@
           %th ID
           %th Commit
           - stages.each do |stage|
-            %th
-              %span.pipeline-stage.has-tooltip{ title: "#{stage.titleize}" }
+            %th.stage
+              %span.has-tooltip{ title: "#{stage.titleize}" }
                 = stage.titleize.pluralize
           %th
           %th
-- 
cgit v1.2.1