From b64cf8405c551e79520e8ce4eef2dc17259c41e3 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 8 Dec 2016 17:58:32 +0000
Subject: [PATCH] Renders new icons for the pipeline graph
---
app/helpers/ci_status_helper.rb | 66 +++++++------------
app/views/ci/status/_icon_with_name.html.haml | 3 +-
.../_icon_with_name_and_action.html.haml | 2 +-
...ed.svg => _icon_status_canceled_graph.svg} | 0
...ted.svg => _icon_status_created_graph.svg} | 0
...iled.svg => _icon_status_failed_graph.svg} | 0
...nual.svg => _icon_status_manual_graph.svg} | 0
...ing.svg => _icon_status_pending_graph.svg} | 0
...ing.svg => _icon_status_running_graph.svg} | 0
...ped.svg => _icon_status_skipped_graph.svg} | 0
...ess.svg => _icon_status_success_graph.svg} | 0
...ing.svg => _icon_status_warning_graph.svg} | 0
12 files changed, 25 insertions(+), 46 deletions(-)
rename app/views/shared/icons/{_icon_graph_job_cancelled.svg => _icon_status_canceled_graph.svg} (100%)
rename app/views/shared/icons/{_icon_graph_job_created.svg => _icon_status_created_graph.svg} (100%)
rename app/views/shared/icons/{_icon_graph_job_failed.svg => _icon_status_failed_graph.svg} (100%)
rename app/views/shared/icons/{_icon_graph_job_manual.svg => _icon_status_manual_graph.svg} (100%)
rename app/views/shared/icons/{_icon_graph_job_pending.svg => _icon_status_pending_graph.svg} (100%)
rename app/views/shared/icons/{_icon_graph_job_running.svg => _icon_status_running_graph.svg} (100%)
rename app/views/shared/icons/{_icon_graph_job_skipped.svg => _icon_status_skipped_graph.svg} (100%)
rename app/views/shared/icons/{_icon_graph_job_success.svg => _icon_status_success_graph.svg} (100%)
rename app/views/shared/icons/{_icon_graph_job_warning.svg => _icon_status_warning_graph.svg} (100%)
diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb
index 7ddef2cdd5f..d9f5e01f0dc 100644
--- a/app/helpers/ci_status_helper.rb
+++ b/app/helpers/ci_status_helper.rb
@@ -25,54 +25,32 @@ module CiStatusHelper
status.humanize
end
- def ci_icon_for_status(status, graph: nil)
+ def ci_icon_for_status(status)
if detailed_status?(status)
return custom_icon(status.icon)
end
- if graph
- icon_name =
- case status
- when 'success'
- 'icon_graph_job_success'
- when 'success_with_warnings'
- 'icon_graph_job_warning'
- when 'failed'
- 'icon_graph_job_failed'
- when 'pending'
- 'icon_graph_job_pending'
- when 'running'
- 'icon_graph_job_running'
- when 'created'
- 'icon_graph_job_created'
- when 'skipped'
- 'icon_graph_job_skipped'
- else
- 'icon_graph_job_canceled'
- end
- else
- icon_name =
- case status
- when 'success'
- 'icon_status_success'
- when 'success_with_warnings'
- 'icon_status_warning'
- when 'failed'
- 'icon_status_failed'
- when 'pending'
- 'icon_status_pending'
- when 'running'
- 'icon_status_running'
- when 'play'
- 'icon_play'
- when 'created'
- 'icon_status_created'
- when 'skipped'
- 'icon_status_skipped'
- else
- 'icon_status_canceled'
- end
- end
+ icon_name =
+ case status
+ when 'success'
+ 'icon_status_success'
+ when 'success_with_warnings'
+ 'icon_status_warning'
+ when 'failed'
+ 'icon_status_failed'
+ when 'pending'
+ 'icon_status_pending'
+ when 'running'
+ 'icon_status_running'
+ when 'play'
+ 'icon_play'
+ when 'created'
+ 'icon_status_created'
+ when 'skipped'
+ 'icon_status_skipped'
+ else
+ 'icon_status_canceled'
+ end
custom_icon(icon_name)
end
diff --git a/app/views/ci/status/_icon_with_name.html.haml b/app/views/ci/status/_icon_with_name.html.haml
index 028e1fe9402..a467316ef47 100644
--- a/app/views/ci/status/_icon_with_name.html.haml
+++ b/app/views/ci/status/_icon_with_name.html.haml
@@ -1,10 +1,11 @@
- detailed_status = subject.detailed_status(current_user)
- details_path = detailed_status.details_path if detailed_status.has_details?
- klass = "ci-status-icon ci-status-icon-#{detailed_status}"
+- status_icon = graph ? "#{detailed_status.icon}_graph" : detailed_status.icon
- if details_path
= link_to details_path, class: klass, data: { toggle: 'tooltip', title: "#{subject.name} - #{detailed_status}" } do
- %span{ class: klass }= custom_icon(detailed_status.icon)
+ %span{ class: klass }= custom_icon(status_icon)
.ci-status-text= subject.name
- else
%span{ class: klass }= custom_icon(detailed_status.icon)
diff --git a/app/views/ci/status/_icon_with_name_and_action.html.haml b/app/views/ci/status/_icon_with_name_and_action.html.haml
index 76db3b7f38a..b912c212534 100644
--- a/app/views/ci/status/_icon_with_name_and_action.html.haml
+++ b/app/views/ci/status/_icon_with_name_and_action.html.haml
@@ -1,4 +1,4 @@
-= render "ci/status/icon_with_name", subject: subject
+= render "ci/status/icon_with_name", subject: subject, graph: true
- detailed_status = subject.detailed_status(current_user)
- if detailed_status.has_action?
diff --git a/app/views/shared/icons/_icon_graph_job_cancelled.svg b/app/views/shared/icons/_icon_status_canceled_graph.svg
similarity index 100%
rename from app/views/shared/icons/_icon_graph_job_cancelled.svg
rename to app/views/shared/icons/_icon_status_canceled_graph.svg
diff --git a/app/views/shared/icons/_icon_graph_job_created.svg b/app/views/shared/icons/_icon_status_created_graph.svg
similarity index 100%
rename from app/views/shared/icons/_icon_graph_job_created.svg
rename to app/views/shared/icons/_icon_status_created_graph.svg
diff --git a/app/views/shared/icons/_icon_graph_job_failed.svg b/app/views/shared/icons/_icon_status_failed_graph.svg
similarity index 100%
rename from app/views/shared/icons/_icon_graph_job_failed.svg
rename to app/views/shared/icons/_icon_status_failed_graph.svg
diff --git a/app/views/shared/icons/_icon_graph_job_manual.svg b/app/views/shared/icons/_icon_status_manual_graph.svg
similarity index 100%
rename from app/views/shared/icons/_icon_graph_job_manual.svg
rename to app/views/shared/icons/_icon_status_manual_graph.svg
diff --git a/app/views/shared/icons/_icon_graph_job_pending.svg b/app/views/shared/icons/_icon_status_pending_graph.svg
similarity index 100%
rename from app/views/shared/icons/_icon_graph_job_pending.svg
rename to app/views/shared/icons/_icon_status_pending_graph.svg
diff --git a/app/views/shared/icons/_icon_graph_job_running.svg b/app/views/shared/icons/_icon_status_running_graph.svg
similarity index 100%
rename from app/views/shared/icons/_icon_graph_job_running.svg
rename to app/views/shared/icons/_icon_status_running_graph.svg
diff --git a/app/views/shared/icons/_icon_graph_job_skipped.svg b/app/views/shared/icons/_icon_status_skipped_graph.svg
similarity index 100%
rename from app/views/shared/icons/_icon_graph_job_skipped.svg
rename to app/views/shared/icons/_icon_status_skipped_graph.svg
diff --git a/app/views/shared/icons/_icon_graph_job_success.svg b/app/views/shared/icons/_icon_status_success_graph.svg
similarity index 100%
rename from app/views/shared/icons/_icon_graph_job_success.svg
rename to app/views/shared/icons/_icon_status_success_graph.svg
diff --git a/app/views/shared/icons/_icon_graph_job_warning.svg b/app/views/shared/icons/_icon_status_warning_graph.svg
similarity index 100%
rename from app/views/shared/icons/_icon_graph_job_warning.svg
rename to app/views/shared/icons/_icon_status_warning_graph.svg
--
GitLab